--- parser3/src/main/execute.C	2001/03/27 13:47:31	1.127
+++ parser3/src/main/execute.C	2001/03/27 18:24:38	1.131
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.127 2001/03/27 13:47:31 paf Exp $
+	$Id: execute.C,v 1.131 2001/03/27 18:24:38 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -93,7 +93,7 @@ void dump(Pool& pool, int level, const A
 			Value *value=static_cast<Value *>(ops.quick_get(++i));
 			log_printf(pool, " \"%s\" %s", value->get_string()->cstr(), value->type());
 		}
-		log_printf(pool, "\n");
+		//\log_printf(pool, "\n");
 
 		if(op.code==OP_CURLY_CODE__STORE_PARAM || op.code==OP_EXPR_CODE__STORE_PARAM) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
@@ -134,16 +134,27 @@ void Request::execute(const Array& ops)
 				log_printf(pool(), " (%d)\n", local_ops->size());
 				dump(pool(), 1, *local_ops);
 				
+				// when called method of some object, specifying object literally,
+				// e.g ^t.menu, code of curly params must be executed 
+				// in r/w context of that object.
+				// otherwise in current r/w context.
+				//
 				// when they evaluate expression parameter,
 				// the object expression result
 				// does not need to be written into calling frame
 				// it must go into any expressions using that parameter
 				// hence, zeroing junction.wcontext being created
-				// later, in .process would test that field 
+				// later, in .process we would test that field 
 				// in decision "which wwrapper to use"
 				Junction& j=*NEW Junction(pool(), 
 					*self, 0, 0,
-					root, frame, op.code==OP_EXPR_CODE__STORE_PARAM?0:frame, local_ops);
+					root, 
+					wcontext->somebody_entered_some_object()>1?
+						&frame->junction.self /* ^t.menu{} */:rcontext/* ^if() */, 
+					op.code==OP_EXPR_CODE__STORE_PARAM?
+						0:wcontext->somebody_entered_some_object()>1?
+							frame/* ^t.menu{} */:wcontext/* ^if() */, 
+					local_ops);
 				
 				Value *value=NEW VJunction(j);
 
@@ -153,7 +164,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_CLASS:
 			{
-				// maybe the do ^class:method[] call, remember the fact
+				// maybe they do ^class:method[] call, remember the fact
 				wcontext->set_somebody_entered_some_class();
 
 				const String& name=POP_NAME();
@@ -204,7 +215,7 @@ void Request::execute(const Array& ops)
 				Value *value=POP();
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
-				ncontext->put_element(name, value->get_expr_result());
+				ncontext->put_element(name, value->as_expr_result());
 				value->set_name(name);
 				break;
 			}
@@ -217,7 +228,7 @@ void Request::execute(const Array& ops)
 		case OP_WRITE_EXPR_RESULT:
 			{
 				Value *value=POP();
-				write_expr_result(*value->get_expr_result());
+				write_expr_result(*value->as_expr_result());
 				break;
 			}
 		case OP_STRING__WRITE:
@@ -230,6 +241,9 @@ void Request::execute(const Array& ops)
 			
 		case OP_GET_ELEMENT:
 			{
+				// maybe they do ^object.method[] call, remember the fact
+				wcontext->inc_somebody_entered_some_object();
+
 				Value *value=get_element();
 				PUSH(value);
 				break;
@@ -392,28 +406,28 @@ void Request::execute(const Array& ops)
 		case OP_NEG:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), -operand->get_double());
+				Value *value=NEW VDouble(pool(), -operand->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), ~(int)operand->get_double());
+				Value *value=NEW VDouble(pool(), ~(int)operand->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NOT:
 			{
 				Value *operand=POP();
-				Value *value=NEW VBool(pool(), !operand->get_bool());
+				Value *value=NEW VBool(pool(), !operand->as_bool());
 				PUSH(value);
 				break;
 			}
 		case OP_DEF:
 			{
 				Value *operand=POP();
-				Value *value=NEW VBool(pool(), operand->get_defined());
+				Value *value=NEW VBool(pool(), operand->is_defined());
 				PUSH(value);
 				break;
 			}
@@ -438,28 +452,28 @@ void Request::execute(const Array& ops)
 		case OP_SUB: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), a->get_double() - b->get_double());
+				Value *value=NEW VDouble(pool(), a->as_double() - b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_ADD: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), a->get_double() + b->get_double());
+				Value *value=NEW VDouble(pool(), a->as_double() + b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_MUL: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), a->get_double() * b->get_double());
+				Value *value=NEW VDouble(pool(), a->as_double() * b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_DIV: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), a->get_double() / b->get_double());
+				Value *value=NEW VDouble(pool(), a->as_double() / b->as_double());
 				PUSH(value);
 				break;
 			}
@@ -467,8 +481,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->get_double() %
-					(int)b->get_double());
+					(int)a->as_double() %
+					(int)b->as_double());
 				PUSH(value);
 				break;
 			}
@@ -476,8 +490,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->get_double() &
-					(int)b->get_double());
+					(int)a->as_double() &
+					(int)b->as_double());
 				PUSH(value);
 				break;
 			}
@@ -485,8 +499,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->get_double() |
-					(int)b->get_double());
+					(int)a->as_double() |
+					(int)b->as_double());
 				PUSH(value);
 				break;
 			}
@@ -494,71 +508,71 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->get_double() ^
-					(int)b->get_double());
+					(int)a->as_double() ^
+					(int)b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_AND:
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_bool() && b->get_bool());
+				Value *value=NEW VBool(pool(), a->as_bool() && b->as_bool());
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_OR:
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_bool() || b->get_bool());
+				Value *value=NEW VBool(pool(), a->as_bool() || b->as_bool());
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_XOR:
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_bool() ^ b->get_bool());
+				Value *value=NEW VBool(pool(), a->as_bool() ^ b->as_bool());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_LT: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() < b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() < b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GT: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() > b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() > b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_LE: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() <= b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() <= b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GE: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() >= b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() >= b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_EQ: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() == b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() == b->as_double());
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_NE: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VBool(pool(), a->get_double() != b->get_double());
+				Value *value=NEW VBool(pool(), a->as_double() != b->as_double());
 				PUSH(value);
 				break;
 			}
@@ -617,7 +631,7 @@ void Request::execute(const Array& ops)
 				0,
 				"unhandled '%s' opcode", opcode_name[op.code]); 
 		}
-		log_printf(pool(), "\n");
+		//\log_printf(pool(), "\n");
 	}
 }
 
@@ -655,7 +669,7 @@ Value& Request::process(Value& value, co
 		PUSH(self);  
 		PUSH(root);  
 		PUSH(rcontext);  
-			PUSH(wcontext);
+		PUSH(wcontext);
 		
 		WContext *frame;
 		// for expression method params