--- parser3/src/main/execute.C	2002/01/24 17:18:48	1.209
+++ parser3/src/main/execute.C	2002/01/31 15:04:38	1.213
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: execute.C,v 1.209 2002/01/24 17:18:48 paf Exp $
+	$Id: execute.C,v 1.213 2002/01/31 15:04:38 paf Exp $
 */
 
 #include "pa_opcode.h"
@@ -44,6 +44,7 @@ char *opcode_name[]={
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
 	"PREPARE_TO_CONSTRUCT_OBJECT",	"CALL",
+	"PREPARE_TO_CONSTRUCT_EXPR"
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
@@ -166,7 +167,7 @@ void Request::execute(const Array& ops)
 		case OP_GET_CLASS:
 			{
 				// maybe they do ^class:method[] call, remember the fact
-				wcontext->set_somebody_entered_some_class();
+				wcontext->set_somebody_entered_some_class(true);
 
 				const String& name=POP_NAME();
 				value=static_cast<Value *>(classes().get(name));
@@ -209,6 +210,25 @@ void Request::execute(const Array& ops)
 				Value *ncontext=POP();
 				ncontext->put_element(name, value);
 				value->set_name(name);
+
+				// forget the fact they've entered some $class/object.xxx
+				// see OP_GET_ELEMENT
+				wcontext->set_somebody_entered_some_object(false);
+				wcontext->set_somebody_entered_some_class(false);
+				break;
+			}
+		case OP_PREPARE_TO_CONSTRUCT_EXPR:
+			{
+				// here, not in OP_CONSTRUCT_EXPR
+				// because then would be too late - expression already would try to evaluate 
+				// in wrong state
+				// not the case with OP_CONSTRUCT_VALUE, there we have write pool
+				// (separate wcontext with it's own state
+
+				// forget the fact they've entered some $class/object.xxx
+				// see OP_GET_ELEMENT
+				wcontext->set_somebody_entered_some_object(false);
+				wcontext->set_somebody_entered_some_class(false);
 				break;
 			}
 		case OP_CONSTRUCT_EXPR:
@@ -256,9 +276,10 @@ void Request::execute(const Array& ops)
 				value=POP();
 				write_assign_lang(*value);
 
-				// forget the fact they've entered some ^object.method[].
+				// forget the fact they've entered some ^object/class.xxx or $object/class.xxx
 				// see OP_GET_ELEMENT
 				wcontext->set_somebody_entered_some_object(false);
+				wcontext->set_somebody_entered_some_class(false);
 				break;
 			}
 		case OP_WRITE_EXPR_RESULT:
@@ -279,11 +300,14 @@ void Request::execute(const Array& ops)
 			
 		case OP_GET_ELEMENT:
 			{
+				//_asm int 3;
+				// uses entered object/class flags to plug in operators
+				value=get_element();
+
 				// maybe they do ^object.method[] call, remember the fact
+				// must be below get_element() call, it checks it
 				wcontext->set_somebody_entered_some_object(true);
 
-				//_asm int 3;
-				value=get_element();
 				PUSH(value);
 				break;
 			}
@@ -469,6 +493,11 @@ void Request::execute(const Array& ops)
 				root=POP();  
 				self=static_cast<VAliased *>(POP());
 
+				// forget the fact they've entered some ^object/class.xxx
+				// see OP_GET_ELEMENT
+				wcontext->set_somebody_entered_some_object(false);
+				wcontext->set_somebody_entered_some_class(false);
+
 				PUSH(value);
 #ifdef DEBUG_EXECUTE
 				debug_printf(pool(), "<-returned");
@@ -788,7 +817,11 @@ Value *Request::get_element() {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
 	Value *value=ncontext->get_element(name);
-	if(!value)
+	// operators can not be in form...
+	if(!value && 
+		!wcontext->get_somebody_entered_some_class () && // $class:xxx
+		!wcontext->get_somebody_entered_some_object()) // $object.xxx
+		// they can only be in form ^xxx or $xxx
 		if(Method* method=OP.get_method(name)) { // maybe operator?
 			// as if that method were in self and we have normal dynamic method here
 			Junction& junction=*NEW Junction(pool(),