--- parser3/src/main/execute.C 2009/05/24 07:34:10 1.342 +++ parser3/src/main/execute.C 2009/08/10 12:04:35 1.355 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/24 07:34:10 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/08/10 12:04:35 $"; #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,51 +60,24 @@ 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", + "PREPARE_TO_CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - "ROOT_CONSTRUCT_EXPR", - "ROOT_ELEMENT_CONSTRUCT_EXPR", - "ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR", - "ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR", - - "ROOT_CONSTRUCT_VALUE", - "ROOT_ELEMENT_CONSTRUCT_VALUE", - "ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE", - "ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE", - - "WRITE_CONSTRUCT_EXPR", - "WRITE_ELEMENT_CONSTRUCT_EXPR", - "WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR", - "WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR", - - "WRITE_CONSTRUCT_VALUE", - "WRITE_ELEMENT_CONSTRUCT_VALUE", - "WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE", - "WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE", -#endif - -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - "ROOT_CALL_CONSTRUCT_EXPR", - //"ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR", - - "ROOT_CALL_CONSTRUCT_VALUE", - //"ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE", - - "WRITE_CALL_CONSTRUCT_EXPR", - //"WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR", - - "WRITE_CALL_CONSTRUCT_VALUE", - //"WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE", + "WITH_ROOT__VALUE__CONSTRUCT_EXPR", + "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 @@ -154,26 +133,6 @@ 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_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_ROOT_CONSTRUCT_VALUE - || opcode==OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_WRITE_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_ELEMENT_CONSTRUCT_VALUE -#endif -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_EXPR - || opcode==OP::OP_ROOT_CALL_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_CALL_CONSTRUCT_VALUE -#endif ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -188,6 +147,24 @@ void debug_dump(SAPI_Info& sapi_info, in } #endif if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE + ){ + 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], + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } + if( opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE #ifdef OPTIMIZE_BYTECODE_GET_CLASS @@ -197,19 +174,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_ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR - || opcode==OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE - || opcode==OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE - - || opcode==OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR - || opcode==OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR - - || opcode==OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE - || opcode==OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE + || 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; @@ -222,6 +199,7 @@ void debug_dump(SAPI_Info& sapi_info, in debug_value_to_cstr(value), value.type()); continue; } + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { @@ -229,7 +207,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: @@ -269,8 +247,6 @@ void Request::execute(ArrayOperation& op for(Array_iterator 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 @@ -354,273 +330,76 @@ void Request::execute(ArrayOperation& op } // OTHER ACTIONS BUT WITHs - case OP::OP_CONSTRUCT_VALUE: - { - Value& value=stack.pop().value(); - const String& name=stack.pop().string(); debug_name=&name; - Value& ncontext=stack.pop().value(); - put_element(ncontext, name, &value); - - break; - } #ifdef OPTIMIZE_BYTECODE_CONSTRUCT - case OP::OP_WRITE_CONSTRUCT_EXPR: - case OP::OP_WRITE_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 - } - case OP::OP_ROOT_CONSTRUCT_EXPR: - case OP::OP_ROOT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - Value& value=*i.next().value; - - if( - opcode == OP::OP_WRITE_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_CONSTRUCT_EXPR - ){ - put_element( with_root?*method_frame:*wcontext, name, &value.as_expr_result()); - } else { - put_element( with_root?*method_frame:*wcontext, name, &value); - } - break; - } - - case OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_WRITE_ELEMENT_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 - } - case OP::OP_ROOT_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - const String& source_var_name=*i.next().value->get_string(); debug_name=&source_var_name; - DEBUG_PRINT_STRING(source_var_name) - - Value& value=get_element(*rcontext, source_var_name); - - if( - opcode == OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_ELEMENT_CONSTRUCT_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; - } +#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_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: { 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 - } - case OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - DEBUG_PRINT_STRING(name) - - i.next(); // skip OP_GET_OBJECT_ELEMENT - 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) - - Value& value=get_element(object, field_name); - - if( - opcode == OP::OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_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; + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) } - case OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE: + 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_VALUE(*wcontext) } - case OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR: - case OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE: - { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - DEBUG_PRINT_STRING(name) - i.next(); // skip OP_GET_OBJECT_VAR_ELEMENT - debug_origin=i.next().origin; - const String& context_name=*i.next().value->get_string(); debug_name=&context_name; - DEBUG_PRINT_STRING(context_name) + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) - Value& object=get_element(*rcontext, context_name); + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) - debug_origin=i.next().origin; - const String& var_name=*i.next().value->get_string(); debug_name=&var_name; - DEBUG_PRINT_STRING(var_name) + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) - const String* field_name=get_element(*rcontext, var_name).get_string(); - Value& value=get_element(object, *field_name); + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) - if( - opcode == OP::OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR - || opcode == OP::OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_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 -#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT - case OP::OP_WRITE_CALL_CONSTRUCT_EXPR: - case OP::OP_WRITE_CALL_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 - } - - case OP::OP_ROOT_CALL_CONSTRUCT_EXPR: - case OP::OP_ROOT_CALL_CONSTRUCT_VALUE: + case OP::OP_CONSTRUCT_VALUE: { - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - - DEBUG_PRINT_STRING(name) - - debug_origin=i.next().origin; - const String& method_name=*i.next().value->get_string(); debug_name=&method_name; - - DEBUG_PRINT_STRING(method_name) - - bool is_expr=(opcode==OP::OP_WRITE_CALL_CONSTRUCT_EXPR || opcode==OP::OP_ROOT_CALL_CONSTRUCT_EXPR); - if(is_expr) - wcontext->set_in_expression(true); - - Value* vjunction; - if(Method* method=main_class.get_method(method_name)){ // looking operator of that name FIRST - if(!method->junction_template) - method->junction_template=new VJunction(main_class, method); - vjunction=method->junction_template; - } else { - vjunction=&get_element(*rcontext, method_name); - } - - // CALL - Operation call_op=i.next(); - ArrayOperation* local_ops=i.next().ops; - - DEBUG_PRINT_OPS(local_ops) - DEBUG_PRINT_STR("->\n") - - Junction* junction=vjunction->get_junction(); - if(!junction) { - if(vjunction->is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); - else - throw Exception(PARSER_RUNTIME, - 0, - "is '%s', not a method or junction, can not call it", - vjunction->type()); - } - - VMethodFrame frame(*junction, method_frame); - - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - - DEBUG_PRINT_STR("<-returned") - - if(call_op.code==OP::OP_CALL__WRITE){ - write_assign_lang(frame.result()); - } else { - Value& value=frame.result().as_value(); - - if(is_expr){ - wcontext->set_in_expression(false); - put_element( with_root?*method_frame:*wcontext, name, &value.as_expr_result()); - } else { - put_element( with_root?*method_frame:*wcontext, name, &value); - } - } - - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=stack.pop().value(); +#else + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#endif + put_element(ncontext, name, &value); break; } -#endif // OPTIMIZE_BYTECODE_CALL_CONSTRUCT case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& expr=stack.pop().value(); +#else Value& expr=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); +#endif Value& value=expr.as_expr_result(); put_element(ncontext, name, &value); break; @@ -643,7 +422,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(ncontext, name, &value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, &value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) throw Exception(PARSER_RUNTIME, 0, @@ -668,12 +447,11 @@ void Request::execute(ArrayOperation& op } case OP::OP_WRITE_EXPR_RESULT: { - Value& value=stack.pop().value(); - write_no_lang(value.as_expr_result()); - - // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); + + Value& value=stack.pop().value(); + wcontext->write(value.as_expr_result()); break; } case OP::OP_STRING__WRITE: @@ -740,8 +518,6 @@ void Request::execute(ArrayOperation& op 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 { @@ -771,8 +547,6 @@ void Request::execute(ArrayOperation& op 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 { @@ -791,6 +565,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: { @@ -803,28 +586,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 @@ -836,7 +639,11 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; - WWrapper local(0/*empty*/, wcontext); +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(wcontext); +#else + WWrapper local(wcontext); +#endif wcontext=&local; execute(local_ops); @@ -852,7 +659,7 @@ void Request::execute(ArrayOperation& op ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(0 /*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; execute(local_ops); @@ -892,29 +699,33 @@ void Request::execute(ArrayOperation& op rcontext, opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); -#ifdef USE_DESTRUCTORS - value.set_temporal(true); -#else +#ifndef USE_DESTRUCTORS if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) + wcontext->attach_junction(&value); #endif - wcontext->attach_junction(&value); // store param stack.push(value); break; } - case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: - { - wcontext->set_constructing(true); - break; - } - case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } +#define METHOD_FRAME_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + stack.set_top_index(first); \ + } else { \ + frame.empty_params(); \ + action; \ + } + case OP::OP_CALL: { ArrayOperation* local_ops=i.next().ops; @@ -938,18 +749,7 @@ void Request::execute(ArrayOperation& op } VMethodFrame frame(*junction, method_frame); - - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - + METHOD_FRAME_ACTION(op_call(frame, false)); stack.push(frame.result().as_value()); DEBUG_PRINT_STR("<-returned") @@ -989,7 +789,7 @@ void Request::execute(ArrayOperation& op #ifdef OPTIMIZE_CALL const Method& method=*junction->method; - if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_FRAME){ + if(method.call_optimization==Method::CO_WITHOUT_FRAME){ if(local_ops){ // store param code goes here size_t first = stack.top_index(); execute(*local_ops); @@ -1005,37 +805,15 @@ void Request::execute(ArrayOperation& op method.check_actual_numbered_params(junction->self, &method_params); method.native_code(*this, method_params); // execute it } - } else if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call_write(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call_write(frame); - } + METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - write_assign_lang(frame.result()); + METHOD_FRAME_ACTION(op_call(frame, false)); + write_pass_lang(frame.result()); } DEBUG_PRINT_STR("<-returned") @@ -1051,6 +829,53 @@ void Request::execute(ArrayOperation& op break; } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=classes().get(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); + + debug_origin=i.next().origin; + Value& vconstructor_name=*i.next().value; + const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; + + DEBUG_PRINT_STRING(constructor_name) + + Value& constructor_value=get_element(*class_value, constructor_name); + + Junction* junction=constructor_value.get_junction(); + if(!junction) + throw Exception(PARSER_RUNTIME, + &constructor_name, + "constructor must be declared in class '%s'", + class_value->get_class()->name_cstr()); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Junction casted=Junction(*class_value, junction->method); + VMethodFrame frame(casted, method_frame); + + METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); + + DEBUG_PRINT_STR("<-returned") + break; + } + // expression ops: unary case OP::OP_NEG: { @@ -1382,17 +1207,15 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; -void Request::op_call(VMethodFrame& frame){ +void Request::op_call(VMethodFrame& frame, bool constructing){ const Junction &junction=frame.junction; VStateless_class& called_class=*junction.self.get_class(); Value* new_self; - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); + if(constructing) { if(junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - HashStringValue& new_object_fields=*new HashStringValue(); - if(new_self=called_class.create_new_value(fpool, new_object_fields)) { + if(new_self=called_class.create_new_value(fpool)) { // some stateless_class creatable derivates } else throw Exception(PARSER_RUNTIME, @@ -1469,42 +1292,28 @@ void Request::op_call_write(VMethodFrame method_frame=saved_method_frame; } -/** - @bug ^superbase:method would dynamically call ^base:method if there is any -*/ Value& Request::get_element(Value& ncontext, const String& name) { - if(!wcontext->get_constructing() // not constructing - && wcontext->get_somebody_entered_some_class() ) // ^class:method - if(VStateless_class *called_class=ncontext.get_class()) - if(VStateless_class *read_class=rcontext->get_class()) - if(read_class->derived_from(*called_class)) // current derived from called - if(Value* base=get_self().base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls - Value *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - return *(value ? &process_to_value(*value) : VVoid::get()); - } + 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()) + if(read_class->derived_from(*called_class)){ // current derived from called + Value *value=called_class->get_element(get_self(), name); + return *(value ? &process_to_value(*value) : VVoid::get()); + } - Value* value=ncontext.get_element(name, ncontext, true); - - if(value && wcontext->get_constructing()) - if(Junction* junction=value->get_junction()) - if(junction->self.get_class()!=&ncontext) - throw Exception(PARSER_RUNTIME, - &name, - "constructor must be declared in class '%s'", - ncontext.get_class()->name_cstr()); + Value* value=ncontext.get_element(name); 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(ncontext, name, value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, value, false)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { // process it VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); - int param_count=frame.method_params_count(); + size_t param_count=frame.method_params_count(); if(param_count!=1) throw Exception(PARSER_RUNTIME, 0, @@ -1544,9 +1353,8 @@ StringOrValue Request::process(Value& in if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ Value *param=new VString(*junction->auto_name); @@ -1584,8 +1392,8 @@ StringOrValue Request::process(Value& in if(!junction->method_frame) throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + 0, + "junction used outside of context"); SAVE_CONTEXT @@ -1609,7 +1417,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1637,9 +1445,8 @@ void Request::process_write(Value& input if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ Value *param=new VString(*junction->auto_name); @@ -1706,7 +1513,7 @@ void Request::process_write(Value& input write_pass_lang(local.result()); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1792,7 +1599,7 @@ Request::execute_nonvirtual_method(VStat const String* Request::execute_virtual_method(Value& aself, const String& method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) + if(Value* value=aself.get_element(method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) return execute_method(aself, *method, 0/*no params*/, true);