--- parser3/src/main/execute.C	2009/05/04 09:26:00	1.332
+++ parser3/src/main/execute.C	2009/05/20 09:09:20	1.336
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_EXECUTE_C="$Date: 2009/05/04 09:26:00 $";
+static const char * const IDENT_EXECUTE_C="$Date: 2009/05/20 09:09:20 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -46,6 +46,14 @@ char *opcode_name[]={
 	"GET_ELEMENT_OR_OPERATOR",
 #endif
 	"GET_ELEMENT",
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	"GET_OBJECT_ELEMENT",
+	"GET_OBJECT_ELEMENT__WRITE",
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	"GET_OBJECT_VAR_ELEMENT",
+	"GET_OBJECT_VAR_ELEMENT__WRITE",
+#endif
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
 	"VALUE__GET_ELEMENT",
 #endif
@@ -76,10 +84,10 @@ void va_debug_printf(SAPI_Info& sapi_inf
 }
 
 void debug_printf(SAPI_Info& sapi_info, const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    va_debug_printf(sapi_info, fmt, args);
-    va_end(args);
+	va_list args;
+	va_start(args, fmt);
+	va_debug_printf(sapi_info, fmt, args);
+	va_end(args);
 }
 
 void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) {
@@ -87,6 +95,30 @@ void debug_dump(SAPI_Info& sapi_info, in
 	while(i.has_next()) {
 		OP::OPCODE opcode=i.next().code;
 
+#if (defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT)) && defined(OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS)
+		if(
+			1==0
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE
+#endif
+		){
+			i.next(); // skip origin
+			Value& value1=*i.next().value;
+			i.next(); // skip origin
+			Value& value2=*i.next().value;
+			debug_printf(sapi_info, 
+				"%*s%s"
+				" \"%s\" \"%s\"", 
+				level*4, "", opcode_name[opcode],
+				value1.get_string()->cstr(), value2.get_string()->cstr());
+			continue;
+		}
+#endif
 		if(
 			opcode==OP::OP_VALUE
 			|| opcode==OP::OP_STRING__WRITE
@@ -98,6 +130,14 @@ void debug_dump(SAPI_Info& sapi_info, in
 			|| opcode==OP::OP_VALUE__GET_ELEMENT__WRITE
 			|| opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR
 #endif
+#if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) && !defined(OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS)
+			|| opcode==OP::OP_GET_OBJECT_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE
+#endif
+#if defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) && !defined(OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS)
+			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT
+			|| opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE
+#endif
 		) {
 			Operation::Origin origin=i.next().origin;
 			Value& value=*i.next().value;
@@ -124,8 +164,20 @@ void debug_dump(SAPI_Info& sapi_info, in
 		}
 	}
 }
+#define DEBUG_PRINT_STR(str) debug_printf(sapi_info, str);
+#define DEBUG_PRINT_STRING(value) debug_printf(sapi_info, " \"%s\" ", value.cstr());
+#define DEBUG_PRINT_OPS(local_ops) \
+					debug_printf(sapi_info, \
+					" (%d)\n", local_ops?local_ops->count():0); \
+					if(local_ops) debug_dump(sapi_info, 1, *local_ops);
+
+#else
+#define DEBUG_PRINT_STR(str)
+#define DEBUG_PRINT_STRING(value)
+#define DEBUG_PRINT_OPS(local_ops)
 #endif
 
+
 // Request
 
 void Request::execute(ArrayOperation& ops) {
@@ -168,9 +220,7 @@ void Request::execute(ArrayOperation& op
 				Value& value=*i.next().value;
 				const String& name=*value.get_string();
 
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " \"%s\" ", name.cstr());
-#endif
+				DEBUG_PRINT_STRING(name)
 
 				Value* class_value=classes().get(name);
 				if(!class_value)
@@ -204,17 +254,17 @@ void Request::execute(ArrayOperation& op
 				stack.push(*method_frame);
 				break;
 			}
-		case OP::OP_WITH_SELF: 
+		case OP::OP_WITH_SELF:
 			{
 				stack.push(get_self());
 				break;
 			}
-		case OP::OP_WITH_READ: 
+		case OP::OP_WITH_READ:
 			{
 				stack.push(*rcontext);
 				break;
 			}
-		case OP::OP_WITH_WRITE: 
+		case OP::OP_WITH_WRITE:
 			{
 				if(wcontext==method_frame)
 					throw Exception(PARSER_RUNTIME,
@@ -250,10 +300,9 @@ void Request::execute(ArrayOperation& op
 		case OP::OP_CURLY_CODE__CONSTRUCT:
 			{
 				ArrayOperation& local_ops=*i.next().ops;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " (%d)\n", local_ops.count());
-				debug_dump(sapi_info, 1, local_ops);
-#endif
+
+				DEBUG_PRINT_OPS((&local_ops))
+
 				VJunction& value=*new VJunction(
 					get_self(), 0,
 					method_frame, 
@@ -276,10 +325,9 @@ void Request::execute(ArrayOperation& op
 		case OP::OP_NESTED_CODE:
 			{
 				ArrayOperation& local_ops=*i.next().ops;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " (%d)\n", local_ops.count());
-				debug_dump(sapi_info, 1, local_ops);
-#endif				
+
+				DEBUG_PRINT_OPS((&local_ops))
+
 				stack.push(local_ops);
 				break;
 			}
@@ -303,10 +351,12 @@ void Request::execute(ArrayOperation& op
 			{
 				i.next(); // ignore origin
 				Value* value=i.next().value;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr());
-#endif
-				write_no_lang(*value->get_string());
+
+				const String& string_value=*value->get_string();
+
+				DEBUG_PRINT_STRING(string_value)
+
+				write_no_lang(string_value);
 				break;
 			}
 
@@ -316,9 +366,8 @@ void Request::execute(ArrayOperation& op
 				debug_origin=i.next().origin;
 				const String& name=*i.next().value->get_string();  debug_name=&name;
 
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " \"%s\" ", name.cstr());
-#endif
+				DEBUG_PRINT_STRING(name)
+
 				if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST
 					if(!method->junction_template) method->junction_template=new VJunction(main_class, method);
 					stack.push(*method->junction_template);
@@ -344,6 +393,74 @@ 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);
+
+#ifndef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
+				i.next(); // skip OP_VALUE
+#endif
+
+				debug_origin=i.next().origin;
+				const String& field_name=*i.next().value->get_string();  debug_name=&field_name;
+
+				DEBUG_PRINT_STRING(field_name)
+
+				Value& value=get_element(object, field_name);
+
+				i.next(); // skip last OP_GET_ELEMENT
+
+				if(opcode==OP::OP_GET_OBJECT_ELEMENT){
+					stack.push(value);
+				} else {
+					write_assign_lang(value);
+				}
+				break;
+			}
+#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);
+
+#ifndef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
+				i.next(); // skip OP_VALUE
+#endif
+
+				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).get_string();
+
+				Value& value=get_element(object, *field);
+
+				i.next(); // skip last OP_GET_ELEMENT
+
+				if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){
+					stack.push(value);
+				} else {
+					write_assign_lang(value);
+				}
+				break;
+			}
+#endif
+
 		case OP::OP_GET_ELEMENT:
 			{
 				const String& name=stack.pop().string();  debug_name=&name;
@@ -359,9 +476,7 @@ void Request::execute(ArrayOperation& op
 				debug_origin=i.next().origin;
 				const String& name=*i.next().value->get_string(); debug_name=&name;
 
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " \"%s\" ", name.cstr());
-#endif
+				DEBUG_PRINT_STRING(name)
 
 				Value& value=get_element(*rcontext, name);
 				stack.push(value);
@@ -385,9 +500,7 @@ void Request::execute(ArrayOperation& op
 				debug_origin=i.next().origin;
 				const String& name=*i.next().value->get_string(); debug_name=&name;
 
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " \"%s\" ", name.cstr());
-#endif
+				DEBUG_PRINT_STRING(name)
 
 				Value& value=get_element(*rcontext, name);
 				write_assign_lang(value);
@@ -442,10 +555,9 @@ void Request::execute(ArrayOperation& op
 			{
 				// code
 				ArrayOperation& local_ops=*i.next().ops;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " (%d)\n", local_ops.count());
-				debug_dump(sapi_info, 1, local_ops);
-#endif				
+
+				DEBUG_PRINT_OPS((&local_ops))
+
 				// when they evaluate expression parameter,
 				// the object expression result
 				// does not need to be written into calling frame
@@ -485,13 +597,10 @@ void Request::execute(ArrayOperation& op
 		case OP::OP_CALL:
 			{
 				ArrayOperation* local_ops=i.next().ops;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0);
-				if(local_ops)
-					debug_dump(sapi_info, 1, *local_ops);
 
-				debug_printf(sapi_info, "->\n");
-#endif
+				DEBUG_PRINT_OPS(local_ops)
+				DEBUG_PRINT_STR("->\n")
+
 				Value& value=stack.pop().value();
 
 				Junction* junction=value.get_junction();
@@ -522,9 +631,8 @@ void Request::execute(ArrayOperation& op
 
 				stack.push(frame.result().as_value());
 
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, "<-returned");
-#endif
+				DEBUG_PRINT_STR("<-returned")
+
 				if(get_skip())
 					return;
 				if(get_interrupted()) {
@@ -539,13 +647,10 @@ void Request::execute(ArrayOperation& op
 		case OP::OP_CALL__WRITE:
 			{
 				ArrayOperation* local_ops=i.next().ops;
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0);
-				if(local_ops)
-					debug_dump(sapi_info, 1, *local_ops);
 
-				debug_printf(sapi_info, "->\n");
-#endif
+				DEBUG_PRINT_OPS(local_ops)
+				DEBUG_PRINT_STR("->\n")
+
 				Value& value=stack.pop().value();
 
 				Junction* junction=value.get_junction();
@@ -611,9 +716,8 @@ void Request::execute(ArrayOperation& op
 					}
 					write_assign_lang(frame.result());
 				}
-#ifdef DEBUG_EXECUTE
-				debug_printf(sapi_info, "<-returned");
-#endif
+
+				DEBUG_PRINT_STR("<-returned")
 
 				if(get_skip())
 					return;
@@ -1009,7 +1113,7 @@ void Request::op_call(VMethodFrame& fram
 			0,
 			"is not allowed to be called %s", 
 			call_type==Method::CT_STATIC?"statically":"dynamically");
- 
+
 	RESTORE_CONTEXT
 	//return &frame;
 }
@@ -1028,9 +1132,12 @@ void Request::op_call_write(VMethodFrame
 	const Method& method=*junction.method;
 	Method::Call_type call_type=junction.self.get_class()==&junction.self ? Method::CT_STATIC : Method::CT_DYNAMIC;
 
-	if( method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type?
-		method.check_actual_numbered_params(junction.self, frame.numbered_params());
-		method.native_code(*this, *frame.numbered_params()); // execute it
+	if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type?
+		if(method.native_code) { // native code?
+			method.check_actual_numbered_params(junction.self, frame.numbered_params());
+			method.native_code(*this, *frame.numbered_params()); // execute it
+		} else // parser code, execute it
+			recoursion_checked_execute(*method.parser_code);
 	} else
 		throw Exception(PARSER_RUNTIME,
 			0,
@@ -1109,7 +1216,7 @@ void Request::put_element(Value& ncontex
 		nothing goes to wcontext.
 		used in @c (expression) params evaluation
 
-    using the fact it's either string_ or value_ result requested to speed up checkes
+	using the fact it's either string_ or value_ result requested to speed up checkes
 */
 StringOrValue Request::process(Value& input_value, bool intercept_string) {
 	Junction* junction=input_value.get_junction();
@@ -1151,9 +1258,8 @@ StringOrValue Request::process(Value& in
 		if(junction->code) { // is it a code-junction?
 			// process it
 			StringOrValue result;
-#ifdef DEBUG_EXECUTE
-			debug_printf(sapi_info, "ja->\n");
-#endif
+
+			DEBUG_PRINT_STR("ja->\n")
 
 			if(!junction->method_frame)
 				throw Exception(PARSER_RUNTIME,
@@ -1193,9 +1299,8 @@ StringOrValue Request::process(Value& in
 
 			RESTORE_CONTEXT
 
-#ifdef DEBUG_EXECUTE
-			debug_printf(sapi_info, "<-ja returned");
-#endif
+			DEBUG_PRINT_STR("<-ja returned")
+
 			return result;
 		}
 
@@ -1245,9 +1350,9 @@ void Request::process_write(Value& input
 
 		if(junction->code) { // is it a code-junction?
 							// process it
-#ifdef DEBUG_EXECUTE
-			debug_printf(sapi_info, "ja->\n");
-#endif
+
+			DEBUG_PRINT_STR("ja->\n")
+
 			if(!junction->method_frame)
 				throw Exception(PARSER_RUNTIME,
 					0,
@@ -1288,9 +1393,9 @@ void Request::process_write(Value& input
 				RESTORE_CONTEXT
 				write_pass_lang(local.result());
 			}
-#ifdef DEBUG_EXECUTE
-			debug_printf(sapi_info, "<-ja returned");
-#endif
+
+			DEBUG_PRINT_STR("<-ja returned")
+
 			return;
 		}