--- parser3/src/main/execute.C	2002/09/02 14:59:48	1.263
+++ parser3/src/main/execute.C	2002/09/18 13:15:43	1.274
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/09/02 14:59:48 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/09/18 13:15:43 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -111,7 +111,7 @@ void debug_dump(Pool& pool, int level, c
 #define POP_NAME() static_cast<Value *>(stack.pop())->as_string()
 #define POP_CODE() static_cast<Array *>(stack.pop())
 
-void Request::execute(const Array& ops, bool clean_junctions) {
+void Request::execute(const Array& ops) {
 //	_asm int 3;
 #ifdef DEBUG_EXECUTE
 	debug_printf(pool(), "source----------------------------\n");
@@ -208,7 +208,7 @@ void Request::execute(const Array& ops,
 				debug_dump(pool(), 1, *local_ops);
 #endif				
 				Junction& j=*NEW Junction(pool(), 
-					*self, 0, 0,
+					*self, 0,
 					method_frame, 
 					rcontext, 
 					wcontext, 
@@ -286,7 +286,7 @@ void Request::execute(const Array& ops,
 				WContext *saved_wcontext=wcontext;
 				uchar saved_lang= flang;
 				flang=String::UL_PASS_APPENDED;
-				WWrapper local(pool(), 0 /*empty*/);
+				WWrapper local(pool(), 0 /*empty*/, wcontext);
 				wcontext=&local;
 
 				execute(*local_ops);
@@ -303,7 +303,7 @@ void Request::execute(const Array& ops,
 				const Array *local_ops=reinterpret_cast<const Array *>(i.next());
 
 				WContext *saved_wcontext=wcontext;
-				WWrapper local(pool(), 0 /*empty*/);
+				WWrapper local(pool(), 0 /*empty*/, wcontext);
 				wcontext=&local;
 
 				execute(*local_ops);
@@ -348,7 +348,7 @@ void Request::execute(const Array& ops,
 				// in .process we would test that field 
 				// in decision "which wwrapper to use"
 				Junction& j=*NEW Junction(pool(), 
-					*self, 0, 0,
+					*self, 0,
 					method_frame, 
 					rcontext, 
 					op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
@@ -628,10 +628,28 @@ void Request::execute(const Array& ops,
 				PUSH(value);
 				break;
 			}
+		case OP_BIN_SL:
+			{
+				b=POP();  a=POP();
+				value=NEW VInt(pool(), 
+					a->as_int() <<
+					b->as_int());
+				PUSH(value);
+				break;
+			}
+		case OP_BIN_SR:
+			{
+				b=POP();  a=POP();
+				value=NEW VInt(pool(), 
+					a->as_int() >>
+					b->as_int());
+				PUSH(value);
+				break;
+			}
 		case OP_BIN_AND:
 			{
 				b=POP();  a=POP();
-				value=NEW VDouble(pool(), 
+				value=NEW VInt(pool(), 
 					a->as_int() &
 					b->as_int());
 				PUSH(value);
@@ -640,7 +658,7 @@ void Request::execute(const Array& ops,
 		case OP_BIN_OR:
 			{
 				b=POP();  a=POP();
-				value=NEW VDouble(pool(), 
+				value=NEW VInt(pool(), 
 					a->as_int() |
 					b->as_int());
 				PUSH(value);
@@ -649,7 +667,7 @@ void Request::execute(const Array& ops,
 		case OP_BIN_XOR:
 			{
 				b=POP();  a=POP();
-				value=NEW VDouble(pool(), 
+				value=NEW VInt(pool(), 
 					a->as_int() ^
 					b->as_int());
 				PUSH(value);
@@ -806,7 +824,7 @@ Value *Request::get_element(const String
 		if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST
 			// as if that method were in self and we have normal dynamic method here
 			Junction& junction=*NEW Junction(pool(), 
-				*method_frame, self->get_class(), method, 0,0,0,0);
+				*method_frame, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -875,7 +893,7 @@ StringOrValue Request::process(Value& in
 		if(using_code_frame) {
 			// almost plain wwrapper about junction wcontext, 
 			// BUT intercepts string writes
-			VCodeFrame local(pool(), *junction->wcontext);  
+			VCodeFrame local(pool(), *junction->wcontext, junction->wcontext);
 			wcontext=&local;
 
 			// execute it
@@ -887,7 +905,7 @@ StringOrValue Request::process(Value& in
 			result.set_string(*wcontext->get_string());
 		} else {
 			// plain wwrapper
-			WWrapper local(pool(), 0/*empty*/);
+			WWrapper local(pool(), 0/*empty*/, wcontext);
 			wcontext=&local;
 		
 			// execute it
@@ -945,9 +963,9 @@ void Request::execute_method(Value& asel
 	// initialize contexts
 	//method_frame=rcontext=self=&aself;
 	self=&aself;	
-//	WWrapper local(pool(), &aself);
+//	WWrapper local(pool(), &aself, wcontext);
 //	wcontext=&local; 
-	Junction local_junction(pool(), *self, self->get_class(), &method, 0,0,0,0);
+	Junction local_junction(pool(), *self, &method, 0,0,0,0);
 	VMethodFrame local_frame(pool(), method.name, local_junction);
 	if(optional_param && local_frame.can_store_param()) {
 		local_frame.store_param(optional_param);