--- parser3/src/main/execute.C 2016/07/20 17:01:48 1.384 +++ parser3/src/main/execute.C 2016/11/01 22:53:20 1.395 @@ -21,19 +21,19 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.384 2016/07/20 17:01:48 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.395 2016/11/01 22:53:20 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE -char *opcode_name[]={ +const char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", "NESTED_CODE", // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", - "VALUE__GET_CLASS", + "VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -75,7 +75,6 @@ char *opcode_name[]={ "PREPARE_TO_CONSTRUCT_OBJECT", "CONSTRUCT_OBJECT", "CONSTRUCT_OBJECT__WRITE", - "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT @@ -110,7 +109,7 @@ const char* debug_value_to_cstr(Value& v return string->cstr(); else if(value.is_bool()) - return value.as_bool()?"":""; + return value.as_bool() ? "" : ""; else return ""; } @@ -155,11 +154,7 @@ void debug_dump(SAPI_Info& sapi_info, in 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)); + debug_printf(sapi_info, "%*s%s \"%s\" \"%s\"", level*4, "", opcode_name[opcode], debug_value_to_cstr(value1), debug_value_to_cstr(value2)); continue; } #endif @@ -336,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; } @@ -370,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) \ @@ -379,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()) \ } @@ -426,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(); @@ -478,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; @@ -556,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({ @@ -587,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({ @@ -622,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; } @@ -647,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; } @@ -678,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; } @@ -689,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 @@ -700,8 +686,7 @@ void Request::execute(ArrayOperation& op execute(local_ops); - stack.push(wcontext->result().as_value()); - flang=saved_lang; + stack.push(wcontext->result()); wcontext=saved_wcontext; break; } @@ -757,22 +742,16 @@ 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(); \ - 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; \ +#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: @@ -787,22 +766,17 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); + throw Exception(PARSER_RUNTIME, 0, "undefined method"); else - throw Exception(PARSER_RUNTIME, - 0, - "is '%s', not a method or junction, can not call it", - value.type()); + throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type()); } 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 + VExpressionFrame frame(*junction->method, method_frame, junction->self); + METHOD_FRAME_ACTION(call(frame)); + result=&frame.result(); + // desctructor deletes junctions in stack params here } stack.push(*result); @@ -812,9 +786,7 @@ void Request::execute(ArrayOperation& op return; if(get_interrupted()) { set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); + throw Exception("parser.interrupted", 0, "execution stopped"); } break; } @@ -831,18 +803,13 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); + throw Exception(PARSER_RUNTIME, 0, "undefined method"); else - throw Exception(PARSER_RUNTIME, - 0, - "is '%s', not a method or junction, can not call it", - value.type()); + 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(); @@ -861,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()); } @@ -876,9 +843,7 @@ void Request::execute(ArrayOperation& op return; if(get_interrupted()) { set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); + throw Exception("parser.interrupted", 0, "execution stopped"); } break; } @@ -914,10 +879,10 @@ 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().as_value(); - // VMethodFrame desctructor deletes junctions in stack params here + result=&frame.result(); + // desctructor deletes junctions in stack params here } if(opcode==OP::OP_CONSTRUCT_OBJECT) @@ -1012,9 +977,7 @@ void Request::execute(ArrayOperation& op if(b_double == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Division by zero"); + throw Exception("number.zerodivision", 0, "Division by zero"); } Value& value=*new VDouble(a_double / b_double); @@ -1030,9 +993,7 @@ void Request::execute(ArrayOperation& op if(b_double == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Modulus by zero"); + throw Exception("number.zerodivision", 0, "Modulus by zero"); } Value& value=*new VDouble(fmod(a_double, b_double)); @@ -1048,9 +1009,7 @@ void Request::execute(ArrayOperation& op if(b_int == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Division by zero"); + throw Exception("number.zerodivision", 0, "Division by zero"); } Value& value=*new VInt(a_int / b_int); @@ -1237,9 +1196,7 @@ void Request::execute(ArrayOperation& op } default: - throw Exception(0, - 0, - "invalid opcode %d", opcode); + throw Exception(0, 0, "invalid opcode %d", opcode); } } } catch(const Exception&) { @@ -1251,16 +1208,15 @@ void Request::execute(ArrayOperation& op } #define SAVE_CONTEXT \ - VMethodFrame *saved_method_frame=method_frame; \ - Value* saved_rcontext=rcontext; \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ WContext *saved_wcontext=wcontext; -#define RESTORE_CONTEXT \ - wcontext=saved_wcontext; \ - rcontext=saved_rcontext; \ +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + 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) { @@ -1274,19 +1230,10 @@ Value& Request::construct(VStateless_cla "is not a constructor, system class '%s' can be constructed only implicitly", called_class.type()); } else - throw Exception(PARSER_RUNTIME, - 0, //&frame.name(), - "method is static and can not be used as constructor"); + 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; @@ -1294,54 +1241,44 @@ 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"); + 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::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; } Value& Request::get_element(Value& ncontext, const String& name) { Value* value=ncontext.get_element(name); - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } #ifdef FEATURE_GET_ELEMENT4CALL Value& Request::get_element4call(Value& ncontext, const String& name) { Value* value=ncontext.get_element4call(name); - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } #endif @@ -1357,9 +1294,7 @@ void Request::put_element(Value& ncontex if(junction.auto_name){ // default setter if(param_count!=2) - throw Exception(PARSER_RUNTIME, - 0, - "default setter method must have TWO parameters (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "default setter method must have TWO parameters (has %d parameters)", param_count); Value* params[2] = { new VString(*junction.auto_name), value }; frame.store_params(params, 2); @@ -1369,9 +1304,7 @@ void Request::put_element(Value& ncontex } else { // setter if(param_count!=1) - throw Exception(PARSER_RUNTIME, - 0, - "setter method must have ONE parameter (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); frame.store_params(&value, 1); execute_method(frame); @@ -1379,7 +1312,7 @@ void Request::put_element(Value& ncontex } } -StringOrValue Request::process_getter(Junction& junction) { +Value& Request::process_getter(Junction& junction) { VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); size_t param_count=frame.method_params_count(); @@ -1389,9 +1322,7 @@ StringOrValue Request::process_getter(Ju if(param_count){ if(param_count>1) - throw Exception(PARSER_RUNTIME, - 0, - "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "default getter method can't have more then 1 parameter (has %d parameters)", param_count); param=new VString(*junction.auto_name); frame.store_params(¶m, 1); } // no need for else frame.empty_params() @@ -1401,9 +1332,7 @@ StringOrValue Request::process_getter(Ju } else { // getter if(param_count!=0) - throw Exception(PARSER_RUNTIME, - 0, - "getter method must have no parameters (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "getter method must have no parameters (has %d parameters)", param_count); // no need for frame.empty_params() execute_method(frame); @@ -1412,58 +1341,41 @@ StringOrValue Request::process_getter(Ju 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 -*/ - -StringOrValue 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).as_value(), intercept_string); + return process(process_getter(*junction)); } if(junction->code) { // is it a code-junction? // process it - StringOrValue result; + ValueRef result; DEBUG_PRINT_STR("ja->\n") if(!junction->method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); SAVE_CONTEXT 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; @@ -1494,22 +1406,19 @@ 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") if(!junction->method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); SAVE_CONTEXT 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){ @@ -1520,7 +1429,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; @@ -1529,7 +1438,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; @@ -1557,15 +1466,13 @@ void Request::execute_method(VMethodFram // initialize contexts rcontext=wcontext=method_frame=&aframe; - // execute! + // execute! recoursion_checked_execute(*aframe.method.parser_code); RESTORE_CONTEXT } -const String* Request::execute_method(Value& aself, - const Method& method, Value* optional_param, - bool do_return_string) { +const String* Request::execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string) { VMethodFrame local_frame(method, method_frame/*caller*/, aself); @@ -1585,10 +1492,7 @@ const String* Request::execute_method(Va } Request::Execute_nonvirtual_method_result -Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - VString* optional_param, - bool do_return_string) { +Request::execute_nonvirtual_method(VStateless_class& aclass, const String& method_name, VString* optional_param, bool do_return_string) { Execute_nonvirtual_method_result result; result.method=aclass.get_method(method_name); if(result.method) @@ -1596,8 +1500,7 @@ Request::execute_nonvirtual_method(VStat return result; } -const String* Request::execute_virtual_method(Value& aself, - const String& method_name) { +const String* Request::execute_virtual_method(Value& aself, const String& method_name) { if(Value* value=aself.get_element(method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method)