--- parser3/src/main/execute.C	2012/03/16 09:24:12	1.368
+++ parser3/src/main/execute.C	2016/05/24 16:38:40	1.382
@@ -1,7 +1,7 @@
 /** @file
 	Parser: executor part of request class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -21,7 +21,7 @@
 #include "pa_vimage.h"
 #include "pa_wwrapper.h"
 
-volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.368 2012/03/16 09:24:12 moko Exp $" IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H;
+volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.382 2016/05/24 16:38:40 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H;
 
 //#define DEBUG_EXECUTE
 
@@ -60,6 +60,17 @@ char *opcode_name[]={
 	"WITH_SELF__VALUE__GET_ELEMENT",
 	"WITH_SELF__VALUE__GET_ELEMENT__WRITE",
 #endif
+
+#ifdef FEATURE_GET_ELEMENT4CALL
+	"GET_ELEMENT4CALL",
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	"GET_OBJECT_ELEMENT4CALL",
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	"GET_OBJECT_VAR_ELEMENT4CALL",
+#endif
+#endif // FEATURE_GET_ELEMENT4CALL
+
 	"OBJECT_POOL",	"STRING_POOL",
 	"PREPARE_TO_CONSTRUCT_OBJECT",
 	"CONSTRUCT_OBJECT",
@@ -76,6 +87,10 @@ char *opcode_name[]={
 	"WITH_SELF__VALUE__CONSTRUCT_VALUE",
 #endif
 
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+	"GET_ELEMENT__SPECIAL",
+	"GET_ELEMENT__SPECIAL__WRITE",
+#endif
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
 	// expression ops: binary
@@ -124,10 +139,16 @@ void debug_dump(SAPI_Info& sapi_info, in
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
 			|| opcode==OP::OP_GET_OBJECT_ELEMENT
 			|| opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE
+#ifdef FEATURE_GET_ELEMENT4CALL
+			|| opcode==OP::OP_GET_OBJECT_ELEMENT4CALL
+#endif
 #endif
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
 			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT
 			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE
+#ifdef FEATURE_GET_ELEMENT4CALL
+			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT4CALL
+#endif
 #endif
 		){
 			i.next(); // skip origin
@@ -263,8 +284,7 @@ void Request::execute(ArrayOperation& op
 				wcontext->set_somebody_entered_some_class();
 
 				debug_origin=i.next().origin;
-				Value& value=*i.next().value;
-				const String& name=*value.get_string(); debug_name=&name;
+				const String& name=*i.next().value->get_string(); debug_name=&name;
 
 				DEBUG_PRINT_STRING(name)
 
@@ -277,6 +297,38 @@ void Request::execute(ArrayOperation& op
 				stack.push(*class_value);
 				break;
 			}
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+		case OP::OP_GET_ELEMENT__SPECIAL:
+		case OP::OP_GET_ELEMENT__SPECIAL__WRITE:
+			{
+				const String& name=stack.pop().string();  debug_name=&name;
+				Value& ncontext=stack.pop().value();
+
+				Value* value=0;
+				if(VStateless_class* vclass=ncontext.get_class()){
+					if(SYMBOLS_EQ(name,CLASS_SYMBOL)){
+						value=vclass;
+					} else if(SYMBOLS_EQ(name,CLASS_NAME_SYMBOL)){
+						value=new VString(*new String(vclass->type()));
+					}
+				} else {
+					// VJunction is without class, returning self
+					if(SYMBOLS_EQ(name,CLASS_SYMBOL)){
+						value=&ncontext;
+					} else if(SYMBOLS_EQ(name,CLASS_NAME_SYMBOL)){
+						value=new VString(*new String(ncontext.type()));
+					}
+				}
+				if(opcode==OP::OP_GET_ELEMENT__SPECIAL){
+					stack.push(*value);
+				} else {
+					write_assign_lang(*value);
+				}
+				break;
+			}
+#endif
+
 		// OP_WITH
 		case OP::OP_WITH_ROOT:
 			{
@@ -397,7 +449,7 @@ void Request::execute(ArrayOperation& op
 
 				const String& name=stack.pop().string();  debug_name=&name;
 				Value& ncontext=stack.pop().value();
-				if(const VJunction* vjunction=ncontext.put_element(name, &value, false))
+				if(const VJunction* vjunction=ncontext.put_element(name, &value))
 					if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT)
 						throw Exception(PARSER_RUNTIME,
 							0,
@@ -476,59 +528,64 @@ void Request::execute(ArrayOperation& op
 #endif
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
-		case OP::OP_GET_OBJECT_ELEMENT:
-		case OP::OP_GET_OBJECT_ELEMENT__WRITE:
-			{
-				debug_origin=i.next().origin;
-				const String& context_name=*i.next().value->get_string();  debug_name=&context_name;
-
-				DEBUG_PRINT_STRING(context_name)
-
-				Value& object=get_element(*rcontext, context_name);
-
-				debug_origin=i.next().origin;
-				const String& field_name=*i.next().value->get_string();  debug_name=&field_name;
 
-				DEBUG_PRINT_STRING(field_name)
+#define DO_GET_OBJECT_ELEMENT(code) {\
+				debug_origin=i.next().origin;								\
+				const String& context_name=*i.next().value->get_string();  debug_name=&context_name;	\
+				DEBUG_PRINT_STRING(context_name)							\
+				Value& object=get_element(*rcontext, context_name);					\
+				debug_origin=i.next().origin;								\
+				const String& field_name=*i.next().value->get_string();  debug_name=&field_name;	\
+				DEBUG_PRINT_STRING(field_name) 								\
+				code;											\
+				break;											\
+			}
 
+		case OP::OP_GET_OBJECT_ELEMENT: DO_GET_OBJECT_ELEMENT({
 				Value& value=get_element(object, field_name);
-
-				if(opcode==OP::OP_GET_OBJECT_ELEMENT){
-					stack.push(value);
-				} else {
-					write_assign_lang(value);
-				}
-				break;
-			}
+				stack.push(value);
+			})
+		case OP::OP_GET_OBJECT_ELEMENT__WRITE: DO_GET_OBJECT_ELEMENT({
+				Value& value=get_element(object, field_name);
+				write_assign_lang(value);
+			})
+#ifdef FEATURE_GET_ELEMENT4CALL
+		case OP::OP_GET_OBJECT_ELEMENT4CALL: DO_GET_OBJECT_ELEMENT({
+				Value& value=get_element4call(object, field_name);
+				stack.push(value);
+			})
+#endif
 #endif
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
-		case OP::OP_GET_OBJECT_VAR_ELEMENT:
-		case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE:
-			{
-				debug_origin=i.next().origin;
-				const String& context_name=*i.next().value->get_string();  debug_name=&context_name;
-
-				DEBUG_PRINT_STRING(context_name)
-
-				Value& object=get_element(*rcontext, context_name);
 
-				debug_origin=i.next().origin;
-				const String& var_name=*i.next().value->get_string();  debug_name=&var_name;
-
-				DEBUG_PRINT_STRING(var_name)
-
-				const String* field=&get_element(*rcontext, var_name).as_string();
+#define DO_GET_OBJECT_VAR_ELEMENT(code) {\
+				debug_origin=i.next().origin;								\
+				const String& context_name=*i.next().value->get_string();  debug_name=&context_name;	\
+				DEBUG_PRINT_STRING(context_name)							\
+				Value& object=get_element(*rcontext, context_name);					\
+				debug_origin=i.next().origin;								\
+				const String& var_name=*i.next().value->get_string();  debug_name=&var_name;		\
+				DEBUG_PRINT_STRING(var_name)								\
+				const String* field=&get_element(*rcontext, var_name).as_string();			\
+				code;											\
+				break;											\
+			}
 
+		case OP::OP_GET_OBJECT_VAR_ELEMENT: DO_GET_OBJECT_VAR_ELEMENT({
 				Value& value=get_element(object, *field);
-
-				if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){
-					stack.push(value);
-				} else {
-					write_assign_lang(value);
-				}
-				break;
-			}
+				stack.push(value);
+			})
+		case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: DO_GET_OBJECT_VAR_ELEMENT({
+				Value& value=get_element(object, *field);
+				write_assign_lang(value);
+			})
+#ifdef FEATURE_GET_ELEMENT4CALL
+		case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL: DO_GET_OBJECT_VAR_ELEMENT({
+				Value& value=get_element4call(object, *field);
+				stack.push(value);
+			})
+#endif
 #endif
 
 		case OP::OP_GET_ELEMENT:
@@ -540,6 +597,17 @@ void Request::execute(ArrayOperation& op
 				break;
 			}
 
+#ifdef FEATURE_GET_ELEMENT4CALL
+		case OP::OP_GET_ELEMENT4CALL:
+			{
+				const String& name=stack.pop().string();  debug_name=&name;
+				Value& ncontext=stack.pop().value();
+				Value& value=get_element4call(ncontext, name);
+				stack.push(value);
+				break;
+			}
+#endif
+
 		case OP::OP_GET_ELEMENT__WRITE:
 			{
 				const String& name=stack.pop().string();  debug_name=&name;
@@ -720,9 +788,14 @@ void Request::execute(ArrayOperation& op
 								value.type());
 				}
 
-				VMethodFrame frame(*junction->method, method_frame, junction->self);
-				METHOD_FRAME_ACTION(op_call(frame));
-				stack.push(frame.result().as_value());
+				Value *result;
+				{
+					VMethodFrame frame(*junction->method, method_frame, junction->self);
+					METHOD_FRAME_ACTION(op_call(frame));
+					result=&frame.result().as_value();
+					// VMethodFrame desctructor deletes junctions in stack params here
+				}
+				stack.push(*result);
 
 				DEBUG_PRINT_STR("<-returned")
 
@@ -827,21 +900,26 @@ void Request::execute(ArrayOperation& op
 					throw Exception(PARSER_RUNTIME,
 						&constructor_name,
 						"constructor must be declared in class '%s'", 
-						class_value->get_class()->name_cstr());
+						class_value->type());
 
 				ArrayOperation* local_ops=i.next().ops;
 				DEBUG_PRINT_OPS(local_ops)
 				DEBUG_PRINT_STR("->\n")
 
-				Value &object=construct(*class_value, *constructor_junction->method);
-				VConstructorFrame frame(*constructor_junction->method, method_frame, object);
-				METHOD_FRAME_ACTION(op_call(frame));
-				object.enable_default_setter();
+				Value *result;
+				{
+					Value& object=construct(*class_value, *constructor_junction->method);
+					VConstructorFrame frame(*constructor_junction->method, method_frame, object);
+					METHOD_FRAME_ACTION(op_call(frame));
+					object.enable_default_setter();
+					result=&frame.result().as_value();
+					// VMethodFrame desctructor deletes junctions in stack params here
+				}
 
 				if(opcode==OP::OP_CONSTRUCT_OBJECT)
-					stack.push(frame.result().as_value());
+					stack.push(*result);
 				else
-					write_pass_lang(frame.result());
+					write_pass_lang(*result);
 
 				DEBUG_PRINT_STR("<-returned")
 				break;
@@ -1191,7 +1269,7 @@ Value& Request::construct(Value &class_v
 			throw Exception(PARSER_RUNTIME,
 				0, //&frame.name(),
 				"is not a constructor, system class '%s' can be constructed only implicitly", 
-					called_class.name().cstr());
+					called_class.type());
 	} else
 		throw Exception(PARSER_RUNTIME,
 			0, //&frame.name(),
@@ -1253,6 +1331,13 @@ void Request::op_call_write(VMethodFrame
 }
 
 Value& Request::get_element(Value& ncontext, const String& name) {
+#ifdef FEATURE_GET_ELEMENT4CALL
+	Value* value=ncontext.get_element(name);
+	return *(value ? &process_to_value(*value) : VVoid::get());
+}
+
+Value& Request::get_element4call(Value& ncontext, const String& name) {
+#endif
 	if(wcontext->get_somebody_entered_some_class()) // ^class:method
 		if(VStateless_class *called_class=ncontext.get_class())
 			if(VStateless_class *read_class=rcontext->get_class())
@@ -1261,14 +1346,17 @@ Value& Request::get_element(Value& ncont
 					return *(value ? &process_to_value(*value) : VVoid::get());
 				}
 
+#ifdef FEATURE_GET_ELEMENT4CALL
+	Value* value=ncontext.get_element4call(name);
+#else
 	Value* value=ncontext.get_element(name);
-
+#endif
 	return *(value ? &process_to_value(*value) : VVoid::get());
 }
 
 void Request::put_element(Value& ncontext, const String& name, Value* value) {
 	// put_element can return property-setting-junction
-	if(const VJunction* vjunction=ncontext.put_element(name, value, false))
+	if(const VJunction* vjunction=ncontext.put_element(name, value))
 		if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) {
 			const Junction& junction = vjunction->junction();
 			VConstructorFrame frame(*junction.method, method_frame /*caller*/, junction.self);
@@ -1349,7 +1437,7 @@ StringOrValue Request::process(Value& in
 	Junction* junction=input_value.get_junction();
 	if(junction) {
 		if(junction->is_getter) { // is it a getter-junction?
-			return process_getter(*junction);
+			return process(process_getter(*junction).as_value(), intercept_string);
 		}
 
 		if(junction->code) { // is it a code-junction?
@@ -1411,10 +1499,8 @@ StringOrValue Request::process(Value& in
 void Request::process_write(Value& input_value) {
 	Junction* junction=input_value.get_junction();
 	if(junction) {
-		if(junction->is_getter) { // is it a getter-junction?
-			write_pass_lang(process_getter(*junction));
-			return;
-		}
+		// no getter-junction check as process_write is called
+		// to process method arguments, not from get_element
 
 		if(junction->code) { // is it a code-junction?
 							// process it
@@ -1572,6 +1658,17 @@ const String* Request::get_method_filena
 					case OP::OP_WITH_SELF__VALUE__GET_ELEMENT:
 					case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE:
 #endif
+
+#ifdef FEATURE_GET_ELEMENT4CALL
+					case OP::OP_GET_ELEMENT4CALL:
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+					case OP::OP_GET_OBJECT_ELEMENT4CALL:
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+					case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL:
+#endif
+#endif // FEATURE_GET_ELEMENT4CALL
+
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
 					case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR:
 					case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE:
@@ -1584,6 +1681,7 @@ const String* Request::get_method_filena
 							origin=i.next().origin;
 							break;
 						}
+					default: break;
 				}
 				if(origin.file_no)
 					return get_used_filename(origin.file_no);