--- parser3/src/main/execute.C	2002/09/02 14:31:13	1.262
+++ parser3/src/main/execute.C	2002/10/14 11:57:45	1.279
@@ -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:31:13 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/14 11:57:45 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -44,7 +44,8 @@ char *opcode_name[]={
 	"GET_CLASS",
 	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
-	"GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT",	"GET_ELEMENT__WRITE",
+	"GET_ELEMENT_OR_OPERATOR", "OP_GET_ELEMENT_OR_JUNCTION_EXPAND",
+	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"OBJECT_POOL",	"STRING_POOL",
 	"STORE_PARAM",
 	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", 
@@ -54,6 +55,7 @@ char *opcode_name[]={
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
 	// expression ops: binary
 	"SUB", "ADD", "MUL", "DIV", "MOD", "INTDIV",
+	"BIN_SL", "BIN_SR",
 	"BIN_AND", "BIN_OR", "BIN_XOR",
 	"LOG_AND", "LOG_OR", "LOG_XOR",
 	"NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE",
@@ -111,7 +113,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 +132,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
@@ -210,7 +210,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, 
@@ -260,14 +260,18 @@ void Request::execute(const Array& ops,
 			
 		case OP_GET_ELEMENT_OR_OPERATOR:
 			{
-				//_asm int 3;
 				value=get_element(last_get_element_name, true);
 				PUSH(value);
 				break;
 			}
+		case OP_GET_ELEMENT_OR_JUNCTION_EXPAND:
+			{
+				value=get_element(last_get_element_name, false, true/* the only user */);
+				PUSH(value);
+				break;
+			}
 		case OP_GET_ELEMENT:
 			{
-				//_asm int 3;
 				value=get_element(last_get_element_name, false);
 				PUSH(value);
 				break;
@@ -288,7 +292,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 +309,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);
@@ -350,7 +354,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, 
@@ -388,15 +392,22 @@ void Request::execute(const Array& ops,
 #endif
 				value=POP();
 
-				// info: 
-				//	code compiled so that this one's always method-junction, 
-				//	not a code-junction
 				Junction *junction=value->get_junction();
 				if(!junction)
 					throw Exception("parser.runtime",
 						last_get_element_name, 
 						"(%s) not a method or junction, can not call it",
 							value->type());
+				// check: 
+				//	that this is method-junction, not a code-junction
+				// [disabling these contstructions:]
+				// $junction{code}
+				//  ^junction[]
+				if(!junction->method)
+					throw Exception("parser.runtime",
+						last_get_element_name, 
+						"(%s) is code junction, can not call it",
+							value->type());
 
 				VMethodFrame frame(pool(), *last_get_element_name, *junction);
 				if(local_ops){ // store param code goes here
@@ -630,10 +641,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);
@@ -642,7 +671,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);
@@ -651,7 +680,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);
@@ -660,27 +689,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 +725,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.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.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.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.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.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.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result != 0.0);
 				PUSH(value);
 				break;
 			}
@@ -798,7 +829,8 @@ void Request::execute(const Array& ops,
 }
 
 /// @test cache|prepare junctions 
-Value *Request::get_element(const String *& remember_name, bool can_call_operator) {
+Value *Request::get_element(const String *& remember_name, 
+							bool can_call_operator, bool should_explode_junction) {
 	const String& name=POP_NAME();  remember_name=&name;
 	Value *ncontext=POP();
 	Value *value=0;
@@ -806,7 +838,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);
+				*main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -826,9 +858,10 @@ Value *Request::get_element(const String
 		value=ncontext->get_element(name, ncontext, false);
 
 _void:
-	if(value)
-		value=&process_to_value(*value); // process possible code-junction
-	else
+	if(value) {
+		if(should_explode_junction) // process $junction, but leave $junction.xxx as is
+			value=&process_to_value(*value); // process possible code-junction
+	} else
 		value=NEW VVoid(pool());
 
 	return value;
@@ -875,7 +908,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 +920,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 +978,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);