--- parser3/src/main/execute.C	2009/06/02 10:08:40	1.344
+++ parser3/src/main/execute.C	2009/06/07 13:15:54	1.347
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_EXECUTE_C="$Date: 2009/06/02 10:08:40 $";
+static const char * const IDENT_EXECUTE_C="$Date: 2009/06/07 13:15:54 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -46,6 +46,12 @@ char *opcode_name[]={
 	"GET_ELEMENT_OR_OPERATOR",
 #endif
 	"GET_ELEMENT",
+	"GET_ELEMENT__WRITE",
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	"VALUE__GET_ELEMENT",
+	"VALUE__GET_ELEMENT__WRITE",
+	"WITH_ROOT__VALUE__GET_ELEMENT",
+#endif
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
 	"GET_OBJECT_ELEMENT",
 	"GET_OBJECT_ELEMENT__WRITE",
@@ -54,12 +60,9 @@ char *opcode_name[]={
 	"GET_OBJECT_VAR_ELEMENT",
 	"GET_OBJECT_VAR_ELEMENT__WRITE",
 #endif
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	"VALUE__GET_ELEMENT",
-#endif
-	"GET_ELEMENT__WRITE",
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	"VALUE__GET_ELEMENT__WRITE",
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+	"WITH_SELF__VALUE__GET_ELEMENT",
+	"WITH_SELF__VALUE__GET_ELEMENT__WRITE",
 #endif
 	"OBJECT_POOL",	"STRING_POOL",
 	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", 
@@ -70,6 +73,8 @@ char *opcode_name[]={
 	"WITH_ROOT__VALUE__CONSTRUCT_VALUE",
 	"WITH_WRITE__VALUE__CONSTRUCT_EXPR",
 	"WITH_WRITE__VALUE__CONSTRUCT_VALUE",
+	"WITH_SELF__VALUE__CONSTRUCT_EXPR",
+	"WITH_SELF__VALUE__CONSTRUCT_VALUE",
 #endif
 
 	// expression ops: unary
@@ -148,12 +153,19 @@ void debug_dump(SAPI_Info& sapi_info, in
 			|| opcode==OP::OP_VALUE__GET_ELEMENT
 			|| opcode==OP::OP_VALUE__GET_ELEMENT__WRITE
 			|| opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR
+			|| opcode==OP::OP_WITH_ROOT__VALUE__GET_ELEMENT
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+			|| opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT
+			|| opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE
 #endif
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
 			|| opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR
 			|| opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE
 			|| opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR
 			|| opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE
+			|| opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR
+			|| opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE
 #endif
 		) {
 			Operation::Origin origin=i.next().origin;
@@ -173,7 +185,7 @@ void debug_dump(SAPI_Info& sapi_info, in
 		case OP::OP_EXPR_CODE__STORE_PARAM:
 		case OP::OP_CURLY_CODE__CONSTRUCT:
 		case OP::OP_NESTED_CODE:
-		case OP::OP_OBJECT_POOL:  
+		case OP::OP_OBJECT_POOL:
 		case OP::OP_STRING_POOL:
 		case OP::OP_CALL:
 		case OP::OP_CALL__WRITE:
@@ -213,8 +225,6 @@ void Request::execute(ArrayOperation& op
 	for(Array_iterator<Operation> i(ops); i.has_next(); ) {
 		OP::OPCODE opcode=i.next().code;
 
-		bool with_root=true;
-
 #ifdef DEBUG_EXECUTE
 		debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]);
 #endif
@@ -300,36 +310,42 @@ void Request::execute(ArrayOperation& op
 		// OTHER ACTIONS BUT WITHs
 
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+#define DO_CONSTRUCT(context, vvalue) {                                                 \
+				debug_origin=i.next().origin;                                           \
+				const String& name=*i.next().value->get_string();  debug_name=&name;    \
+				DEBUG_PRINT_STRING(name)                                                \
+				Value& value=stack.pop().value();                                       \
+				put_element( context, name, vvalue );                                   \
+				break;                                                                  \
+		}
+#define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value)
+#define DO_CONSTRUCT_EXPR(context) {                                                    \
+				wcontext->set_in_expression(false);                                     \
+				DO_CONSTRUCT(context, &value.as_expr_result())                          \
+		}
+
 		case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR:
-		case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE:
 			{
 				if(wcontext==method_frame)
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"$.name outside of $name[...]");
-				with_root=false;
-				// don't stop here. continue in the next block
+					throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]");
+				DO_CONSTRUCT_EXPR(*wcontext)
 			}
-		case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR:
-		case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE:
+
+		case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE:
 			{
-				bool is_expr=(opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR);
-				if(is_expr)
-					wcontext->set_in_expression(false);
+				if(wcontext==method_frame)
+					throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]");
+				DO_CONSTRUCT_VALUE(*wcontext)
+			}
 
-				debug_origin=i.next().origin;
-				const String& name=*i.next().value->get_string();  debug_name=&name;
-				DEBUG_PRINT_STRING(name)
+		case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR:	DO_CONSTRUCT_EXPR(*method_frame)
 
-				Value& value=stack.pop().value();
+		case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE:	DO_CONSTRUCT_VALUE(*method_frame)
+
+		case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR:	DO_CONSTRUCT_EXPR(get_self())
+
+		case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE:	DO_CONSTRUCT_VALUE(get_self())
 
-				if(is_expr){
-					put_element( with_root?*method_frame:*wcontext, name, &value.as_expr_result());
-				} else {
-					put_element( with_root?*method_frame:*wcontext, name, /*value.is_void()?new VString():*/&value);
-				}
-				break;
-			}
 #endif // OPTIMIZE_BYTECODE_CONSTRUCT
 
 		case OP::OP_CONSTRUCT_VALUE:
@@ -528,6 +544,15 @@ void Request::execute(ArrayOperation& op
 				break;
 			}
 
+		case OP::OP_GET_ELEMENT__WRITE:
+			{
+				const String& name=stack.pop().string();  debug_name=&name;
+				Value& ncontext=stack.pop().value();
+				Value& value=get_element(ncontext, name);
+				write_assign_lang(value);
+				break;
+			}
+
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
 		case OP::OP_VALUE__GET_ELEMENT:
 			{
@@ -540,28 +565,48 @@ void Request::execute(ArrayOperation& op
 				stack.push(value);
 				break;
 			}
-#endif
-
 
-		case OP::OP_GET_ELEMENT__WRITE:
+		case OP::OP_VALUE__GET_ELEMENT__WRITE:
 			{
-				const String& name=stack.pop().string();  debug_name=&name;
-				Value& ncontext=stack.pop().value();
-				Value& value=get_element(ncontext, name);
+				debug_origin=i.next().origin;
+				const String& name=*i.next().value->get_string(); debug_name=&name;
+
+				DEBUG_PRINT_STRING(name)
+
+				Value& value=get_element(*rcontext, name);
 				write_assign_lang(value);
 				break;
 			}
 
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-		case OP::OP_VALUE__GET_ELEMENT__WRITE:
+		case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT:
 			{
 				debug_origin=i.next().origin;
 				const String& name=*i.next().value->get_string(); debug_name=&name;
 
 				DEBUG_PRINT_STRING(name)
 
-				Value& value=get_element(*rcontext, name);
-				write_assign_lang(value);
+				Value& value=get_element(*method_frame, name);
+				stack.push(value);
+				break;
+			}
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+		case OP::OP_WITH_SELF__VALUE__GET_ELEMENT:
+		case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE:
+			{
+				debug_origin=i.next().origin;
+				const String& name=*i.next().value->get_string(); debug_name=&name;
+
+				DEBUG_PRINT_STRING(name)
+
+				Value& value=get_element(get_self(), name);
+
+				if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){
+					stack.push(value);
+				} else {
+					write_assign_lang(value);
+				}
 				break;
 			}
 #endif
@@ -770,7 +815,7 @@ void Request::execute(ArrayOperation& op
 						frame.empty_params();
 						op_call(frame);
 					}
-					write_assign_lang(frame.result());
+					write_pass_lang(frame.result());
 				}
 
 				DEBUG_PRINT_STR("<-returned")