--- parser3/src/main/execute.C	2002/09/17 16:00:46	1.271
+++ parser3/src/main/execute.C	2002/10/14 15:22:42	1.281
@@ -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:00:46 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/14 15:22:42 $";
 
 #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",
@@ -166,10 +168,6 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WITH_SELF: 
 			{
-				if(!self)
-					throw Exception("parser.runtime",
-						0,
-						"you do not have 'self' here, use local variables");
 				PUSH(self);
 				break;
 			}
@@ -212,7 +210,7 @@ void Request::execute(const Array& ops)
 				debug_dump(pool(), 1, *local_ops);
 #endif				
 				Junction& j=*NEW Junction(pool(), 
-					self, 0,
+					*self, 0,
 					method_frame, 
 					rcontext, 
 					wcontext, 
@@ -262,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;
@@ -352,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,
+					*self, 0,
 					method_frame, 
 					rcontext, 
 					op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
@@ -390,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
@@ -412,7 +421,7 @@ void Request::execute(const Array& ops)
 				Value *saved_rcontext=rcontext;
 				WContext *saved_wcontext=wcontext;
 				
-				VStateless_class *called_class=frame.junction.self?frame.junction.self->get_class():0;
+				VStateless_class *called_class=frame.junction.self.get_class();
 				if(wcontext->get_constructing()) {
 					wcontext->set_constructing(false);
 					if(frame.junction.method->call_type!=Method::CT_STATIC) {
@@ -435,9 +444,9 @@ void Request::execute(const Array& ops)
 							&frame.name(),
 							"method is static and can not be used as constructor");
 				} else
-					self=frame.junction.self;
+					self=&frame.junction.self;
 
-				frame.set_self(self);
+				frame.set_self(*self);
 
 				// see OP_PREPARE_TO_EXPRESSION
 				frame.set_in_expression(wcontext->get_in_expression());
@@ -632,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);
@@ -644,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);
@@ -653,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);
@@ -802,15 +829,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?method_frame/*for ^process*/:0, method, 0,0,0,0);
+				main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -830,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;
@@ -868,7 +897,7 @@ StringOrValue Request::process(Value& in
 		Value *saved_rcontext=rcontext;  
 		WContext *saved_wcontext=wcontext;
 		
-		self=junction->self;
+		self=&junction->self;
 		method_frame=junction->method_frame;
 		rcontext=junction->rcontext;
 
@@ -951,13 +980,13 @@ void Request::execute_method(Value& asel
 	self=&aself;	
 //	WWrapper local(pool(), &aself, wcontext);
 //	wcontext=&local; 
-	Junction local_junction(pool(), self, &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);
 		local_frame.fill_unspecified_params();
 	}
-	local_frame.set_self(self);
+	local_frame.set_self(*self);
 	rcontext=wcontext=method_frame=&local_frame; 
 
 	// prevent non-string writes for better error reporting