--- parser3/src/main/execute.C	2002/10/16 08:24:55	1.286
+++ parser3/src/main/execute.C	2002/10/31 15:01:54	1.290
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/10/16 08:24:55 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/10/31 15:01:54 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -177,6 +177,11 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WITH_WRITE: 
 			{
+				if(wcontext==method_frame)
+					throw Exception("parser.runtime",
+						0,
+						"$.name outside of $name[...]");
+
 				PUSH(wcontext);
 				break;
 			}
@@ -819,7 +824,7 @@ void Request::execute(const Array& ops)
 	}
 }
 
-/// @test cache|prepare junctions 
+/// @todo cache|prepare junctions 
 Value *Request::get_element(const String *& remember_name, bool can_call_operator) {
 	const String& name=POP_NAME();  remember_name=&name;
 	Value *ncontext=POP();
@@ -838,16 +843,16 @@ 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=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;
+						if(Value *base=get_self()->base()) { // doing DYNAMIC call
+							Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls
+							value=base->get_element(name, *base, false); // virtual-up lookup starting from parent
+							goto value_ready;
 						}
 	}
 	if(!value)
-		value=ncontext->get_element(name, ncontext, false);
+		value=ncontext->get_element(name, *ncontext, false);
 
-_void:
+value_ready:
 	if(value)
 			value=&process_to_value(*value); // process possible code-junction
 	else
@@ -1001,7 +1006,7 @@ void Request::execute_nonvirtual_method(
 
 const String *Request::execute_virtual_method(Value& aself, 
 											  const String& method_name) {
-	if(Value *value=aself.get_element(method_name, &aself, false))
+	if(Value *value=aself.get_element(method_name, aself, false))
 		if(Junction *junction=value->get_junction())
 			if(const Method *method=junction->method) {
 				const String *result;