--- parser3/src/main/execute.C	2001/12/21 12:47:56	1.208
+++ parser3/src/main/execute.C	2002/02/18 15:21:01	1.219
@@ -1,10 +1,10 @@
 /** @file
 	Parser: executor part of request class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: execute.C,v 1.208 2001/12/21 12:47:56 paf Exp $
+	$Id: execute.C,v 1.219 2002/02/18 15:21:01 paf Exp $
 */
 
 #include "pa_opcode.h"
@@ -31,18 +31,19 @@ const uint ANTI_ENDLESS_EXECUTE_RECOURSI
 char *opcode_name[]={
 	// literals
 	"VALUE",  "CURLY_CODE__STORE_PARAM",  "EXPR_CODE__STORE_PARAM",
+	"NESTED_CODE",
 
 	// actions
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
 	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
-	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
+	"GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
   	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"PREPARE_TO_CONSTRUCT_OBJECT",	"CALL",
+	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", "CALL",
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
@@ -89,6 +90,7 @@ void debug_dump(Pool& pool, int level, c
 		case OP_CURLY_CODE__STORE_PARAM: 
 		case OP_EXPR_CODE__STORE_PARAM:
 		case OP_CURLY_CODE__CONSTRUCT:
+		case OP_NESTED_CODE:
 			const Array *local_ops=reinterpret_cast<const Array *>(i.next());
 			debug_dump(pool, level+1, *local_ops);
 		}
@@ -99,6 +101,7 @@ void debug_dump(Pool& pool, int level, c
 #define PUSH(value) stack.push(value)
 #define POP() static_cast<Value *>(stack.pop())
 #define POP_NAME() static_cast<Value *>(stack.pop())->as_string()
+#define POP_CODE() static_cast<Array *>(stack.pop())
 
 void Request::execute(const Array& ops) {
 //	_asm int 3;
@@ -118,6 +121,7 @@ void Request::execute(const Array& ops)
 
 		Value *value;
 		Value *a; Value *b;
+		Array *b_code;
 		switch(op.code) {
 		// param in next instruction
 		case OP_VALUE:
@@ -209,6 +213,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_CONSTRUCT_EXPR:
 			{
+				// see OP_PREPARE_TO_EXPRESSION
+				wcontext->set_in_expression(false);
+
 				value=POP();
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
@@ -237,6 +244,16 @@ void Request::execute(const Array& ops)
 				value->set_name(name);
 				break;
 			}
+		case OP_NESTED_CODE:
+			{
+				Array *local_ops=static_cast<Array *>(i.next());
+#ifdef DEBUG_EXECUTE
+				debug_printf(pool(), " (%d)\n", local_ops->size());
+				debug_dump(pool(), 1, *local_ops);
+#endif				
+				PUSH(local_ops);
+				break;
+			}
 		case OP_WRITE_VALUE:
 			{
 				value=POP();
@@ -249,6 +266,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WRITE_EXPR_RESULT:
 			{
+				// see OP_PREPARE_TO_EXPRESSION
+				wcontext->set_in_expression(false);
+
 				value=POP();
 				write_expr_result(*value->as_expr_result());
 				break;
@@ -263,20 +283,30 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
+		case OP_GET_ELEMENT_OR_OPERATOR:
+			{
+				// maybe they do ^object.method[] call, remember the fact
+				wcontext->set_somebody_entered_some_object(true);
+
+				//_asm int 3;
+				value=get_element(true);
+				PUSH(value);
+				break;
+			}
 		case OP_GET_ELEMENT:
 			{
 				// maybe they do ^object.method[] call, remember the fact
 				wcontext->set_somebody_entered_some_object(true);
 
 				//_asm int 3;
-				value=get_element();
+				value=get_element(false);
 				PUSH(value);
 				break;
 			}
 
 		case OP_GET_ELEMENT__WRITE:
 			{
-				value=get_element();
+				value=get_element(false);
 				write_assign_lang(*value);
 				break;
 			}
@@ -352,6 +382,13 @@ void Request::execute(const Array& ops)
 				wcontext->set_constructing(true);
 				break;
 			}
+
+		case OP_PREPARE_TO_EXPRESSION:
+			{
+				wcontext->set_in_expression(true);
+				break;
+			}
+
 		case OP_CALL:
 			{
 #ifdef DEBUG_EXECUTE
@@ -402,6 +439,10 @@ void Request::execute(const Array& ops)
 				}
 
 				frame->set_self(*self);
+
+				// see OP_PREPARE_TO_EXPRESSION
+				frame->set_in_expression(wcontext->get_in_expression());
+				
 				rcontext=wcontext=frame;
 				{
 					// take object or class from any wrappers
@@ -635,15 +676,30 @@ void Request::execute(const Array& ops)
 			}
 		case OP_LOG_AND:
 			{
-				b=POP();  a=POP();
-				value=NEW VBool(pool(), a->as_bool() && b->as_bool());
+				b_code=POP_CODE();  a=POP();
+				bool result;
+				if(a->as_bool()) {
+					execute(*b_code);
+					b=POP();
+					result=b->as_bool();
+				} else
+					result=false;
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_OR:
 			{
-				b=POP();  a=POP();
-				value=NEW VBool(pool(), a->as_bool() || b->as_bool());
+				b_code=POP_CODE();  a=POP();
+				bool result;
+				if(a->as_bool()) 
+					result=true;
+				else {
+					execute(*b_code);
+					b=POP();
+					result=b->as_bool();
+				}
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
@@ -755,17 +811,19 @@ void Request::execute(const Array& ops)
 	}
 }
 
-Value *Request::get_element() {
+Value *Request::get_element(bool can_call_operator) {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
-	Value *value=ncontext->get_element(name);
-	if(!value)
-		if(Method* method=OP.get_method(name)) { // maybe operator?
+	Value *value=0;
+	if(can_call_operator)
+		if(Method* method=OP.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(), 
 				*root, self->get_class(), method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
+	if(!value)
+		value=ncontext->get_element(name);
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {