--- parser3/src/main/execute.C	2001/07/13 12:15:51	1.178
+++ parser3/src/main/execute.C	2001/07/25 09:57:33	1.183
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.178 2001/07/13 12:15:51 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.183 2001/07/25 09:57:33 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -34,11 +34,10 @@ char *opcode_name[]={
 	// actions
 	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
-	"CONSTRUCT_VALUE",  "CONSTRUCT_DOUBLE",
+	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
-	"CREATE_RWPOOL",	"REDUCE_RWPOOL",
   	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
@@ -69,7 +68,7 @@ void debug_printf(Pool& pool, const char
 }
 
 void debug_dump(Pool& pool, int level, const Array& ops) {
-	{
+/*	{
 		int size=ops.quick_size();
 		//debug_printf(pool, "size=%d\n", size);
 		for(int i=0; i<size; i++) {
@@ -77,7 +76,7 @@ void debug_dump(Pool& pool, int level, c
 			op.cast=ops.quick_get(i);
 			debug_printf(pool, "%8X\n", op.cast);
 		}
-	}
+	}*/
 
 	int size=ops.quick_size();
 	//debug_printf(pool, "size=%d\n", size);
@@ -222,6 +221,27 @@ void Request::execute(const Array& ops)
 				value->set_name(name);
 				break;
 			}
+		case OP_CURLY_CODE__CONSTRUCT:
+			{
+				const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
+#ifdef DEBUG_EXECUTE
+				debug_printf(pool(), " (%d)\n", local_ops->size());
+				debug_dump(pool(), 1, *local_ops);
+#endif				
+				Junction& j=*NEW Junction(pool(), 
+					*self, 0, 0,
+					root, 
+					rcontext, 
+					wcontext, 
+					local_ops);
+				
+				Value *value=NEW VJunction(j);
+				const String& name=POP_NAME();
+				Value *ncontext=POP();
+				ncontext->put_element(name, value);
+				value->set_name(name);
+				break;
+			}
 		case OP_WRITE_VALUE:
 			{
 				Value *value=POP();
@@ -284,28 +304,6 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-		case OP_CREATE_RWPOOL:
-			{
-				Value *ncontext=POP();
-				PUSH(rcontext);
-				PUSH(wcontext);
-				rcontext=ncontext;
-				wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/);
-				break;
-			}
-		case OP_REDUCE_RWPOOL:
-			{
-				const String *string=wcontext->get_string();
-				Value *value;
-				if(string)
-					value=NEW VString(*string);
-				else
-					value=NEW VVoid(pool());
-				wcontext=static_cast<WContext *>(POP());
-				rcontext=POP();
-				PUSH(value);
-				break;
-			}
 		case OP_CREATE_SWPOOL:
 			{
 				PUSH(wcontext);
@@ -373,10 +371,12 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext); 
 				
 				VStateless_class *called_class=frame->junction.self.get_class();
-				// not ^name.method call and
+				// not ^name.method call, name:method call; and
 				// is context object or class & is it my class or my parent's class and?
 				VStateless_class *read_class=rcontext->get_class();
-				if(!wcontext->somebody_entered_some_object() && 
+				if(
+					!(wcontext->somebody_entered_some_object() &&
+					!wcontext->somebody_entered_some_class()) && 
 					read_class && read_class->is_or_derived_from(*called_class)) // yes
 					self=rcontext; // class dynamic call
 				else // no, not me or relative of mine (total stranger)
@@ -722,14 +722,14 @@ void Request::execute(const Array& ops)
 Value *Request::get_element() {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
-	Value *value;
-	if(Method* method=OP.get_method(name)) { // operator?
-		// as if that method were in self and we have normal dynamic method here
-		Junction& junction=*NEW Junction(pool(), 
-			*self, self->get_class(), method, 0,0,0,0);
-		value=NEW VJunction(junction);
-	} else
-		value=ncontext->get_element(name);
+	Value *value=ncontext->get_element(name);
+	if(!value)
+		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(), 
+				*self, self->get_class(), method, 0,0,0,0);
+			value=NEW VJunction(junction);
+		}
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {
@@ -776,6 +776,7 @@ Value& Request::process(Value& value, co
 			frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/);
 		}
 		
+		//frame->set_name(value.name());
 		wcontext=frame;
 		self=&junction->self;
 		root=junction->root;
@@ -850,7 +851,7 @@ const String *Request::execute_nonvirtua
 												 const String& method_name, 
 												 bool return_cstr) {
 	if(const Method *method=aclass.get_method(method_name))
-		return execute_method(aself, *method, return_cstr);
+		return execute_method(aclass, *method, return_cstr);
 
 	return 0;
 }