--- parser3/src/main/execute.C	2002/09/17 16:46:25	1.272
+++ parser3/src/main/execute.C	2002/10/15 08:31:56	1.282
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/09/17 16:46:25 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/15 08:31:56 $";
 
 #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",
@@ -258,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;
@@ -386,17 +392,26 @@ 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());
+				/* no check needed, code compiled the way that that's impossible
+				// 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);
+				VMethodFrame frame(pool(), *last_get_element_name, *junction, method_frame/*caller*/);
 				if(local_ops){ // store param code goes here
 					PUSH(&frame); // argument for *STORE_PARAM ops
 					execute(*local_ops);
@@ -628,10 +643,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 +673,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 +682,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);
@@ -798,18 +831,16 @@ 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;
 	if(can_call_operator) {
-		if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST
+		if(Method* method=main_class.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->native_code?
-					static_cast<Value *>(method_frame) /*for ^process*/:
-					static_cast<Value *>(main_class) /*for others*/), 
-				method, 0,0,0,0);
+				main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -829,9 +860,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;
@@ -951,7 +983,7 @@ void Request::execute_method(Value& asel
 //	WWrapper local(pool(), &aself, wcontext);
 //	wcontext=&local; 
 	Junction local_junction(pool(), *self, &method, 0,0,0,0);
-	VMethodFrame local_frame(pool(), method.name, local_junction);
+	VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/);
 	if(optional_param && local_frame.can_store_param()) {
 		local_frame.store_param(optional_param);
 		local_frame.fill_unspecified_params();