--- parser3/src/main/execute.C 2016/10/04 13:23:46 1.388 +++ parser3/src/main/execute.C 2016/11/01 22:39:00 1.394 @@ -21,7 +21,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.388 2016/10/04 13:23:46 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; +volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.394 2016/11/01 22:39:00 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -75,7 +75,6 @@ const char *opcode_name[]={ "PREPARE_TO_CONSTRUCT_OBJECT", "CONSTRUCT_OBJECT", "CONSTRUCT_OBJECT__WRITE", - "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT @@ -332,7 +331,7 @@ void Request::execute(ArrayOperation& op if(opcode==OP::OP_GET_ELEMENT__SPECIAL){ stack.push(*value); } else { - write_assign_lang(*value); + write_pass_lang(*value); } break; } @@ -366,7 +365,7 @@ void Request::execute(ArrayOperation& op // OTHER ACTIONS BUT WITHs #ifdef OPTIMIZE_BYTECODE_CONSTRUCT -#define DO_CONSTRUCT(context, vvalue) { \ +#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) \ @@ -375,8 +374,7 @@ void Request::execute(ArrayOperation& op break; \ } #define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) -#define DO_CONSTRUCT_EXPR(context) { \ - wcontext->set_in_expression(false); \ +#define DO_CONSTRUCT_EXPR(context) { \ DO_CONSTRUCT(context, &value.as_expr_result()) \ } @@ -422,9 +420,6 @@ void Request::execute(ArrayOperation& op 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(); @@ -474,14 +469,11 @@ void Request::execute(ArrayOperation& op case OP::OP_WRITE_VALUE: { Value& value=stack.pop().value(); - write_assign_lang(value); + write_pass_lang(value); break; } case OP::OP_WRITE_EXPR_RESULT: { - // see OP_PREPARE_TO_EXPRESSION - wcontext->set_in_expression(false); - Value& value=stack.pop().value(); wcontext->write(value.as_expr_result()); break; @@ -552,7 +544,7 @@ void Request::execute(ArrayOperation& op }) case OP::OP_GET_OBJECT_ELEMENT__WRITE: DO_GET_OBJECT_ELEMENT({ Value& value=get_element(object, field_name); - write_assign_lang(value); + write_pass_lang(value); }) #ifdef FEATURE_GET_ELEMENT4CALL case OP::OP_GET_OBJECT_ELEMENT4CALL: DO_GET_OBJECT_ELEMENT({ @@ -583,7 +575,7 @@ void Request::execute(ArrayOperation& op }) case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: DO_GET_OBJECT_VAR_ELEMENT({ Value& value=get_element(object, *field); - write_assign_lang(value); + write_pass_lang(value); }) #ifdef FEATURE_GET_ELEMENT4CALL case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL: DO_GET_OBJECT_VAR_ELEMENT({ @@ -618,7 +610,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); Value& value=get_element(ncontext, name); - write_assign_lang(value); + write_pass_lang(value); break; } @@ -643,7 +635,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) Value& value=get_element(*rcontext, name); - write_assign_lang(value); + write_pass_lang(value); break; } @@ -674,7 +666,7 @@ void Request::execute(ArrayOperation& op if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ stack.push(value); } else { - write_assign_lang(value); + write_pass_lang(value); } break; } @@ -685,8 +677,6 @@ void Request::execute(ArrayOperation& op ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - String::Language saved_lang=flang; - flang=String::L_PASS_APPENDED; #ifdef OPTIMIZE_SINGLE_STRING_WRITE WObjectPoolWrapper local(wcontext); #else @@ -697,7 +687,6 @@ void Request::execute(ArrayOperation& op execute(local_ops); stack.push(wcontext->result()); - flang=saved_lang; wcontext=saved_wcontext; break; } @@ -753,12 +742,6 @@ void Request::execute(ArrayOperation& op 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(); \ @@ -790,8 +773,8 @@ void Request::execute(ArrayOperation& op Value *result; { - VMethodFrame frame(*junction->method, method_frame, junction->self); - METHOD_FRAME_ACTION(op_call(frame)); + VExpressionFrame frame(*junction->method, method_frame, junction->self); + METHOD_FRAME_ACTION(call_expression(frame)); result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here } @@ -825,8 +808,8 @@ void Request::execute(ArrayOperation& op throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type()); } -#ifdef OPTIMIZE_CALL const Method& method=*junction->method; +#ifdef OPTIMIZE_CALL if(method.call_optimization==Method::CO_WITHOUT_FRAME){ if(local_ops){ // store param code goes here size_t first = stack.top_index(); @@ -845,12 +828,12 @@ void Request::execute(ArrayOperation& op } } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ VMethodFrame frame(method, method_frame, junction->self); - METHOD_FRAME_ACTION(op_call_write(frame)); + METHOD_FRAME_ACTION(call_write(frame)); } else #endif // OPTIMIZE_CALL { VMethodFrame frame(method, method_frame, junction->self); - METHOD_FRAME_ACTION(op_call(frame)); + METHOD_FRAME_ACTION(call(frame)); write_pass_lang(frame.result()); } @@ -896,7 +879,7 @@ void Request::execute(ArrayOperation& op { Value& object=construct(*vclass, *constructor_junction->method); VConstructorFrame frame(*constructor_junction->method, method_frame, object); - METHOD_FRAME_ACTION(op_call(frame)); + METHOD_FRAME_ACTION(call(frame)); object.enable_default_setter(); result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here @@ -1234,7 +1217,6 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; - Value& Request::construct(VStateless_class &called_class, const Method &method){ if(method.call_type!=Method::CT_STATIC) { @@ -1251,14 +1233,7 @@ Value& Request::construct(VStateless_cla throw Exception(PARSER_RUNTIME, 0, "method is static and can not be used as constructor"); } -void Request::op_call(VMethodFrame& frame){ - // see OP_PREPARE_TO_EXPRESSION - frame.set_in_expression(wcontext->get_in_expression()); - - SAVE_CONTEXT - - rcontext=wcontext=method_frame=&frame; - +inline void do_call(VMethodFrame& frame, Request &r){ Value& self=frame.self(); const Method& method=frame.method; Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; @@ -1266,35 +1241,41 @@ void Request::op_call(VMethodFrame& fram 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(self, frame.numbered_params()); - method.native_code(*this, *frame.numbered_params()); // execute it + method.native_code(r, *frame.numbered_params()); // execute it } else // parser code, execute it - recoursion_checked_execute(*method.parser_code); + r.recoursion_checked_execute(*method.parser_code); } else throw Exception(PARSER_RUNTIME, 0, "is not allowed to be called %s", call_type==Method::CT_STATIC ? "statically" : "dynamically"); +} + +void Request::call(VMethodFrame& frame){ + SAVE_CONTEXT + + rcontext=wcontext=method_frame=&frame; + + do_call(frame, *this); + + RESTORE_CONTEXT +} + +void Request::call_expression(VMethodFrame& frame){ + SAVE_CONTEXT + + rcontext=wcontext=method_frame=&frame; + + do_call(frame, *this); RESTORE_CONTEXT } -void Request::op_call_write(VMethodFrame& frame){ +void Request::call_write(VMethodFrame& frame){ VMethodFrame *saved_method_frame=method_frame; Value* saved_rcontext=rcontext; - rcontext=&frame; - method_frame=&frame; + rcontext=method_frame=&frame; - Value& self=frame.self(); - const Method& method=frame.method; - Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; + do_call(frame, *this); - 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(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, "is not allowed to be called %s", call_type==Method::CT_STATIC ? "statically" : "dynamically"); - rcontext=saved_rcontext; method_frame=saved_method_frame; } @@ -1370,23 +1351,11 @@ Value& Request::process_getter(Junction& return frame.result(); } -/** @param intercept_string - - true: - they want result=string value, - possible object result goes to wcontext - - false: - they want any result[string|object] - 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 -*/ - -Value& Request::process(Value& input_value, bool intercept_string) { +Value& Request::process(Value& input_value) { Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - return process(process_getter(*junction), intercept_string); + return process(process_getter(*junction)); } if(junction->code) { // is it a code-junction? @@ -1403,23 +1372,20 @@ Value& Request::process(Value& input_val method_frame=junction->method_frame; rcontext=junction->rcontext; - // for expression method params - // wcontext is set 0 - // using the fact in decision "which wwrapper to use" - bool using_code_frame=intercept_string && junction->wcontext; + // for code in [] and () wcontext is set 0 + // using the fact in decision "which wrapper to use" + bool using_code_frame=junction->wcontext; if(using_code_frame) { - // almost plain wwrapper about junction wcontext - + // {} code wrapper VCodeFrame local(*junction->wcontext); wcontext=&local; // execute it recoursion_checked_execute(*junction->code); - // CodeFrame soul: result=wcontext->result(); } else { - // plain wwrapper + // [] or () code wrapper WWrapper local(wcontext); wcontext=&local; @@ -1450,7 +1416,7 @@ void Request::process_write(Value& input // to process method arguments, not from get_element if(junction->code) { // is it a code-junction? - // process it + // process it DEBUG_PRINT_STR("ja->\n") @@ -1462,8 +1428,7 @@ void Request::process_write(Value& input method_frame=junction->method_frame; rcontext=junction->rcontext; - // for expression method params - // wcontext is set 0 + // for code in [] and () wcontext is set 0 // using the fact in decision "which wwrapper to use" #ifdef OPTIMIZE_CALL if(wcontext==junction->wcontext){ @@ -1474,7 +1439,7 @@ void Request::process_write(Value& input } else #endif if(junction->wcontext) { - // almost plain wwrapper about junction wcontext + // {} code wrapper VCodeFrame local(*junction->wcontext); wcontext=&local; @@ -1483,7 +1448,7 @@ void Request::process_write(Value& input RESTORE_CONTEXT write_pass_lang(local.result()); } else { - // plain wwrapper + // [] or () code wrapper WWrapper local(wcontext); wcontext=&local;