--- parser3/src/main/execute.C	2002/09/02 14:27:54	1.261
+++ parser3/src/main/execute.C	2002/09/10 12:14:40	1.267
@@ -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:27:54 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/09/10 12:14:40 $";
 
 #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");
@@ -130,8 +130,6 @@ void Request::execute(const Array& ops,
 
 		Value *value;
 		Value *a; Value *b;
-		bool bool_result;
-		double double_result;
 		Array *b_code;
 		switch(op.code) {
 		// param in next instruction
@@ -288,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);
@@ -305,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);
@@ -660,27 +658,29 @@ void Request::execute(const Array& ops,
 		case OP_LOG_AND:
 			{
 				b_code=POP_CODE();  a=POP();
+				bool result;
 				if(a->as_bool()) {
 					execute(*b_code);
 					b=POP();
-					bool_result=b->as_bool();
+					result=b->as_bool();
 				} else
-					bool_result=false;
-				value=NEW VBool(pool(), bool_result);
+					result=false;
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_OR:
 			{
 				b_code=POP_CODE();  a=POP();
+				bool result;
 				if(a->as_bool()) 
-					bool_result=true;
+					result=true;
 				else {
 					execute(*b_code);
 					b=POP();
-					bool_result=b->as_bool();
+					result=b->as_bool();
 				}
-				value=NEW VBool(pool(), bool_result);
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
@@ -694,48 +694,48 @@ void Request::execute(const Array& ops,
 		case OP_NUM_LT: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result < 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result < 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GT: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result > 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result > 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_LE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result <= 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result <= 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result >= 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result >= 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_EQ: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result== 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result == 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_NE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result != 0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result != 0.0);
 				PUSH(value);
 				break;
 			}
@@ -875,7 +875,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, wcontext/*parent*/);
 			wcontext=&local;
 
 			// execute it
@@ -887,7 +887,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,7 +945,7 @@ 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);
 	VMethodFrame local_frame(pool(), method.name, local_junction);