--- parser3/src/main/execute.C 2009/05/19 13:33:14 1.335 +++ parser3/src/main/execute.C 2009/05/20 13:22:59 1.337 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/19 13:33:14 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/05/20 13:22:59 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -65,6 +65,11 @@ char *opcode_name[]={ "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + "ROOT_CONSTRUCT_EXPR", "ROOT_CONSTRUCT_VALUE", + "WRITE_CONSTRUCT_EXPR", "WRITE_CONSTRUCT_VALUE", +#endif + // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary @@ -95,7 +100,7 @@ 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 defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) if( 1==0 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT @@ -106,6 +111,12 @@ void debug_dump(SAPI_Info& sapi_info, in || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE #endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + || opcode==OP::OP_ROOT_CONSTRUCT_EXPR + || opcode==OP::OP_ROOT_CONSTRUCT_VALUE + || opcode==OP::OP_WRITE_CONSTRUCT_EXPR + || opcode==OP::OP_WRITE_CONSTRUCT_VALUE +#endif ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -130,14 +141,6 @@ 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; @@ -164,8 +167,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) { @@ -208,9 +223,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) @@ -244,17 +257,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, @@ -275,6 +288,81 @@ void Request::execute(ArrayOperation& op break; } + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_ROOT_CONSTRUCT_EXPR: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + i.next(); // skip origin + Value& expr=*i.next().value; + + DEBUG_PRINT_STRING(name) + + wcontext->set_in_expression(true); + + Value& value=expr.as_expr_result(); + put_element(*method_frame, name, &value); + break; + } + + case OP::OP_WRITE_CONSTRUCT_EXPR: + { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, + 0, + "$.name outside of $name[...]"); + + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + i.next(); // skip origin + Value& expr=*i.next().value; + + DEBUG_PRINT_STRING(name) + + wcontext->set_in_expression(true); + + Value& value=expr.as_expr_result(); + put_element(*wcontext, name, &value); + break; + } + + case OP::OP_ROOT_CONSTRUCT_VALUE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + i.next(); // skip origin + Value& value=*i.next().value; + + DEBUG_PRINT_STRING(name) + + put_element(*method_frame, name, &value); + break; + } + + case OP::OP_WRITE_CONSTRUCT_VALUE: + { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, + 0, + "$.name outside of $name[...]"); + + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + i.next(); // skip origin + Value& value=*i.next().value; + + DEBUG_PRINT_STRING(name) + + put_element(*wcontext, name, &value); + break; + } +#endif + case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION @@ -287,13 +375,13 @@ void Request::execute(ArrayOperation& op put_element(ncontext, name, &value); break; } + 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, @@ -316,10 +404,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; } @@ -343,10 +430,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; } @@ -356,9 +445,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); @@ -390,20 +478,16 @@ void Request::execute(ArrayOperation& op { debug_origin=i.next().origin; const String& context_name=*i.next().value->get_string(); debug_name=&context_name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", context_name.cstr()); -#endif - Value& object=get_element(*rcontext, context_name); -#ifndef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS - i.next(); // skip OP_VALUE -#endif + 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; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", field_name.cstr()); -#endif + + DEBUG_PRINT_STRING(field_name) + Value& value=get_element(object, field_name); i.next(); // skip last OP_GET_ELEMENT @@ -423,20 +507,16 @@ void Request::execute(ArrayOperation& op { debug_origin=i.next().origin; const String& context_name=*i.next().value->get_string(); debug_name=&context_name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", context_name.cstr()); -#endif - Value& object=get_element(*rcontext, context_name); -#ifndef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS - i.next(); // skip OP_VALUE -#endif + 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; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", var_name.cstr()); -#endif + + DEBUG_PRINT_STRING(var_name) + const String* field=get_element(*rcontext, var_name).get_string(); Value& value=get_element(object, *field); @@ -467,9 +547,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); @@ -493,9 +571,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); @@ -550,10 +626,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 @@ -593,13 +668,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(); @@ -630,9 +702,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()) { @@ -647,13 +718,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(); @@ -719,9 +787,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; @@ -1262,9 +1329,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, @@ -1304,9 +1370,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; } @@ -1356,9 +1421,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, @@ -1399,9 +1464,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; }