--- parser3/src/main/execute.C	2002/09/20 14:21:29	1.276
+++ parser3/src/main/execute.C	2002/10/16 08:22:14	1.285
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/09/20 14:21:29 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/16 08:22:14 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -44,8 +44,7 @@ char *opcode_name[]={
 	"GET_CLASS",
 	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
-	"GET_ELEMENT_OR_OPERATOR", "OP_GET_ELEMENT_OR_JUNCTION_EXPAND",
-	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
+	"GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"OBJECT_POOL",	"STRING_POOL",
 	"STORE_PARAM",
 	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", 
@@ -168,7 +167,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WITH_SELF: 
 			{
-				PUSH(self);
+				PUSH(get_self());
 				break;
 			}
 		case OP_WITH_READ: 
@@ -210,7 +209,7 @@ void Request::execute(const Array& ops)
 				debug_dump(pool(), 1, *local_ops);
 #endif				
 				Junction& j=*NEW Junction(pool(), 
-					*self, 0,
+					*get_self(), 0,
 					method_frame, 
 					rcontext, 
 					wcontext, 
@@ -264,12 +263,6 @@ void Request::execute(const Array& ops)
 				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:
 			{
 				value=get_element(last_get_element_name, false);
@@ -354,7 +347,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,
+					*get_self(), 0,
 					method_frame, 
 					rcontext, 
 					op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
@@ -398,27 +391,32 @@ void Request::execute(const Array& ops)
 						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);
 					POP();
 				}
 				frame.fill_unspecified_params();
-				Value *saved_self=self; 
 				VMethodFrame *saved_method_frame=method_frame;
 				Value *saved_rcontext=rcontext;
 				WContext *saved_wcontext=wcontext;
 				
 				VStateless_class *called_class=frame.junction.self.get_class();
+				Value *new_self=get_self();
 				if(wcontext->get_constructing()) {
 					wcontext->set_constructing(false);
 					if(frame.junction.method->call_type!=Method::CT_STATIC) {
@@ -426,14 +424,14 @@ void Request::execute(const Array& ops)
 
 						if(Value *value=called_class->create_new_value(pool())) {
 							// some stateless_class creatable derivates
-							self=value;
+							new_self=value;
 						} else 
 							throw Exception("parser.runtime",
 								&frame.name(),
 								"is not a constructor, system class '%s' can be constructed only implicitly", 
 								called_class->name().cstr());
 
-						frame.write(*self, 
+						frame.write(*new_self, 
 							String::UL_CLEAN  // not used, always an object, not string
 						);
 					} else
@@ -441,9 +439,9 @@ void Request::execute(const Array& ops)
 							&frame.name(),
 							"method is static and can not be used as constructor");
 				} else
-					self=&frame.junction.self;
+					new_self=&frame.junction.self;
 
-				frame.set_self(*self);
+				frame.set_self(*new_self);
 
 				// see OP_PREPARE_TO_EXPRESSION
 				frame.set_in_expression(wcontext->get_in_expression());
@@ -452,24 +450,21 @@ void Request::execute(const Array& ops)
 				{
 					const Method& method=*frame.junction.method;
 					Method::Call_type call_type=
-						called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC;
+						called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC;
 					if(
 						method.call_type==Method::CT_ANY ||
 						method.call_type==call_type) { // allowed call type?
 						try {
+							method_frame=&frame;
 							if(method.native_code) { // native code?
-								// method_frame unchanged, so that ^for ^foreach & co may write to locals
 								method.check_actual_numbered_params(
 									frame.junction.self, 
 									frame.name(), frame.numbered_params());
 								method.native_code(
 									*this, 
 									frame.name(), frame.numbered_params()); // execute it
-							} else { // parser code
-								method_frame=&frame;
-								// execute it
+							} else // parser code, execute it
 								recoursion_checked_execute(&frame.name(), *method.parser_code);
-							}
 						} catch(...) {
 							// record it to stack trace
 							exception_trace.push((void *)&frame.name());
@@ -487,7 +482,6 @@ void Request::execute(const Array& ops)
 				wcontext=saved_wcontext;
 				rcontext=saved_rcontext;
 				method_frame=saved_method_frame;
-				self=saved_self;
 
 #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
 				if(const String *s=value->get_string())
@@ -826,16 +820,15 @@ void Request::execute(const Array& ops)
 }
 
 /// @test cache|prepare junctions 
-Value *Request::get_element(const String *& remember_name, 
-							bool can_call_operator, bool sould_explode_junction) {
+Value *Request::get_element(const String *& remember_name, bool can_call_operator) {
 	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_frame, method, 0,0,0,0);
+				main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -845,7 +838,7 @@ Value *Request::get_element(const String
 			if(VStateless_class *called_class=ncontext->get_class())
 				if(VStateless_class *read_class=rcontext->get_class())
 					if(read_class->derived_from(*called_class)) // current derived from called
-						if(Value *base_object=self->base_object()) { // doing DYNAMIC call
+						if(Value *base_object=get_self()->base_object()) { // doing DYNAMIC call
 							Temp_derived temp_derived(*base_object, 0); // temporarily prevent go-back-down virtual calls
 							value=base_object->get_element(name, base_object, false); // virtual-up lookup starting from parent
 							goto _void;
@@ -855,10 +848,9 @@ Value *Request::get_element(const String
 		value=ncontext->get_element(name, ncontext, false);
 
 _void:
-	if(value) {
-		if(sould_explode_junction) // process $junction, but leave $junction.xxx as is
+	if(value)
 			value=&process_to_value(*value); // process possible code-junction
-	} else
+	else
 		value=NEW VVoid(pool());
 
 	return value;
@@ -889,12 +881,11 @@ StringOrValue Request::process(Value& in
 				0,
 				"junction used outside of context");
 
-		Value *saved_self=self; 
 		VMethodFrame *saved_method_frame=method_frame;  
 		Value *saved_rcontext=rcontext;  
 		WContext *saved_wcontext=wcontext;
 		
-		self=&junction->self;
+////		self=&junction->self;
 		method_frame=junction->method_frame;
 		rcontext=junction->rcontext;
 
@@ -929,7 +920,6 @@ StringOrValue Request::process(Value& in
 		wcontext=saved_wcontext;
 		rcontext=saved_rcontext;
 		method_frame=saved_method_frame;
-		self=saved_self;
 		
 #ifdef DEBUG_EXECUTE
 		debug_printf(pool(), "<-ja returned");
@@ -941,13 +931,12 @@ StringOrValue Request::process(Value& in
 }
 
 const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) {
-	Value *saved_self=self; 
 	VMethodFrame *saved_method_frame=method_frame;  
 	Value *saved_rcontext=rcontext;  
 	WContext *saved_wcontext=wcontext;
 	
 	// initialize contexts
-	self=rcontext=wcontext=method_frame=&amethod_frame;
+	/****self=*/rcontext=wcontext=method_frame=&amethod_frame;
 	
 	// execute!	
 	execute(*method.parser_code);
@@ -958,7 +947,6 @@ const String& Request::execute_method(VM
 	wcontext=saved_wcontext;
 	rcontext=saved_rcontext;
 	method_frame=saved_method_frame;
-	self=saved_self;
 	
 	// return
 	return result;
@@ -967,23 +955,17 @@ const String& Request::execute_method(VM
 void Request::execute_method(Value& aself, 
 							 const Method& method, VString *optional_param,
 							 const String **return_string) {
-	Value *saved_self=self; 
 	VMethodFrame *saved_method_frame=method_frame;  
 	Value *saved_rcontext=rcontext;  
 	WContext *saved_wcontext=wcontext;
 	
-	// initialize contexts
-	//method_frame=rcontext=self=&aself;
-	self=&aself;	
-//	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);
+	Junction local_junction(pool(), aself, &method, 0,0,0,0);
+	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();
 	}
-	local_frame.set_self(*self);
+	local_frame.set_self(aself);
 	rcontext=wcontext=method_frame=&local_frame; 
 
 	// prevent non-string writes for better error reporting
@@ -1001,7 +983,6 @@ void Request::execute_method(Value& asel
 	wcontext=saved_wcontext;
 	rcontext=saved_rcontext;
 	method_frame=saved_method_frame;
-	self=saved_self;
 }
 
 void Request::execute_nonvirtual_method(VStateless_class& aclass,