--- parser3/src/main/execute.C	2002/09/20 14:21:29	1.276
+++ 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/20 14:21:29 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/15 08:31:56 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -398,15 +398,20 @@ 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);
@@ -827,15 +832,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) {
+							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_frame, method, 0,0,0,0);
+				main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
 	}
@@ -856,7 +861,7 @@ Value *Request::get_element(const String
 
 _void:
 	if(value) {
-		if(sould_explode_junction) // process $junction, but leave $junction.xxx as is
+		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());
@@ -978,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();