--- parser3/src/main/execute.C 2016/11/01 23:10:41 1.396 +++ parser3/src/main/execute.C 2017/01/13 13:50:28 1.403 @@ -21,7 +21,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.396 2016/11/01 23:10:41 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.403 2017/01/13 13:50:28 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -242,7 +242,6 @@ void debug_dump(SAPI_Info& sapi_info, in #define DEBUG_PRINT_OPS(local_ops) #endif - // Request void Request::execute(ArrayOperation& ops) { @@ -371,7 +370,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) \ Value& value=stack.pop().value(); \ put_element( context, name, vvalue ); \ - break; \ + goto check_skip; \ } #define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) #define DO_CONSTRUCT_EXPR(context) { \ @@ -414,8 +413,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); #endif put_element(ncontext, name, &value); - - break; + goto check_skip; } case OP::OP_CONSTRUCT_EXPR: @@ -431,7 +429,7 @@ void Request::execute(ArrayOperation& op #endif Value& value=expr.as_expr_result(); put_element(ncontext, name, &value); - break; + goto check_skip; } case OP::OP_CURLY_CODE__CONSTRUCT: @@ -454,7 +452,7 @@ void Request::execute(ArrayOperation& op if(const VJunction* vjunction=ncontext.put_element(name, &value)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) throw Exception(PARSER_RUNTIME, 0, "property value can not be code, use [] or () brackets"); - + break; } case OP::OP_NESTED_CODE: @@ -506,7 +504,7 @@ void Request::execute(ArrayOperation& op } Value& value=get_element(*rcontext, name); stack.push(value); - break; + goto check_skip; } #else case OP::OP_GET_ELEMENT_OR_OPERATOR: @@ -520,7 +518,7 @@ void Request::execute(ArrayOperation& op } Value& value=get_element(ncontext, name); stack.push(value); - break; + goto check_skip; } #endif @@ -535,7 +533,7 @@ void Request::execute(ArrayOperation& op const String& field_name=*i.next().value->get_string(); debug_name=&field_name; \ DEBUG_PRINT_STRING(field_name) \ code; \ - break; \ + goto check_skip; \ } case OP::OP_GET_OBJECT_ELEMENT: DO_GET_OBJECT_ELEMENT({ @@ -566,7 +564,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(var_name) \ const String* field=&get_element(*rcontext, var_name).as_string(); \ code; \ - break; \ + goto check_skip; \ } case OP::OP_GET_OBJECT_VAR_ELEMENT: DO_GET_OBJECT_VAR_ELEMENT({ @@ -591,7 +589,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); Value& value=get_element(ncontext, name); stack.push(value); - break; + goto check_skip; } #ifdef FEATURE_GET_ELEMENT4CALL @@ -601,7 +599,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); Value& value=get_element4call(ncontext, name); stack.push(value); - break; + goto check_skip; } #endif @@ -611,7 +609,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); Value& value=get_element(ncontext, name); write(value); - break; + goto check_skip; } #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -624,7 +622,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*rcontext, name); stack.push(value); - break; + goto check_skip; } case OP::OP_VALUE__GET_ELEMENT__WRITE: @@ -636,7 +634,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*rcontext, name); write(value); - break; + goto check_skip; } case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: @@ -648,7 +646,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*method_frame, name); stack.push(value); - break; + goto check_skip; } #endif @@ -668,7 +666,7 @@ void Request::execute(ArrayOperation& op } else { write(value); } - break; + goto check_skip; } #endif @@ -686,9 +684,10 @@ void Request::execute(ArrayOperation& op execute(local_ops); - stack.push(wcontext->result()); + stack.push((Value&)wcontext->result()); + wcontext=saved_wcontext; - break; + goto check_skip; } case OP::OP_STRING_POOL: @@ -708,7 +707,7 @@ void Request::execute(ArrayOperation& op stack.push(*value); wcontext=saved_wcontext; - break; + goto check_skip; } // CALL @@ -742,12 +741,14 @@ void Request::execute(ArrayOperation& op break; } -#define METHOD_FRAME_ACTION(action) \ +#define METHOD_PARAMS_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; \ + if(!fskip){ \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + } \ stack.set_top_index(first); \ } else { \ frame.empty_params(); \ @@ -773,22 +774,16 @@ void Request::execute(ArrayOperation& op Value *result; { - VExpressionFrame frame(*junction->method, method_frame, junction->self); - METHOD_FRAME_ACTION(call(frame)); - result=&frame.result(); - // desctructor deletes junctions in stack params here + EXPRESSION_FRAME_ACTION(*junction->method, method_frame, junction->self, { + METHOD_PARAMS_ACTION(call(frame)); + result=&frame.result(); + // desctructor deletes junctions in stack params here + }); } stack.push(*result); DEBUG_PRINT_STR("<-returned") - - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", 0, "execution stopped"); - } - break; + goto check_skip; } case OP::OP_CALL__WRITE: @@ -815,10 +810,12 @@ void Request::execute(ArrayOperation& op size_t first = stack.top_index(); execute(*local_ops); - MethodParams method_params; - method_params.store_params((Value**)stack.ptr(first), stack.top_index()-first); - method.check_actual_numbered_params(junction->self, &method_params); - method.native_code(*this, method_params); // execute it + if(!fskip){ + MethodParams method_params; + method_params.store_params((Value**)stack.ptr(first), stack.top_index()-first); + method.check_actual_numbered_params(junction->self, &method_params); + method.native_code(*this, method_params); // execute it + } stack.set_top_index(first); } else { @@ -827,25 +824,20 @@ void Request::execute(ArrayOperation& op method.native_code(*this, method_params); // execute it } } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ - VMethodFrame frame(method, method_frame, junction->self); - METHOD_FRAME_ACTION(call_write(frame)); + METHOD_FRAME_ACTION(method, method_frame, junction->self, { + METHOD_PARAMS_ACTION(call_write(frame)) + }); } else #endif // OPTIMIZE_CALL { - VMethodFrame frame(method, method_frame, junction->self); - METHOD_FRAME_ACTION(call(frame)); - write(frame.result()); + METHOD_FRAME_ACTION(method, method_frame, junction->self, { + METHOD_PARAMS_ACTION(call(frame)); + write(frame.result()); + }); } DEBUG_PRINT_STR("<-returned") - - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", 0, "execution stopped"); - } - break; + goto check_skip; } case OP::OP_CONSTRUCT_OBJECT: @@ -878,11 +870,12 @@ void Request::execute(ArrayOperation& op Value *result; { Value& object=construct(*vclass, *constructor_junction->method); - VConstructorFrame frame(*constructor_junction->method, method_frame, object); - METHOD_FRAME_ACTION(call(frame)); - object.enable_default_setter(); - result=&frame.result(); - // desctructor deletes junctions in stack params here + CONSTRUCTOR_FRAME_ACTION(*constructor_junction->method, method_frame, object, { + METHOD_PARAMS_ACTION(call(frame)); + object.enable_default_setter(); + result=&frame.result(); + // desctructor deletes junctions in stack params here + }); } if(opcode==OP::OP_CONSTRUCT_OBJECT) @@ -891,7 +884,7 @@ void Request::execute(ArrayOperation& op write(*result); DEBUG_PRINT_STR("<-returned") - break; + goto check_skip; } // expression ops: unary @@ -1073,7 +1066,7 @@ void Request::execute(ArrayOperation& op result=false; Value& value=VBool::get(result); stack.push(value); - break; + goto check_skip; } case OP::OP_LOG_OR: { @@ -1088,7 +1081,7 @@ void Request::execute(ArrayOperation& op } Value& value=VBool::get(result); stack.push(value); - break; + goto check_skip; } case OP::OP_LOG_XOR: { @@ -1194,9 +1187,21 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - default: - throw Exception(0, 0, "invalid opcode %d", opcode); + { + throw Exception(0, 0, "invalid opcode %d", opcode); + } + check_skip: + { + if(fskip){ + if(fskip==Request::SKIP_INTERRUPTED){ + set_skip(Request::SKIP_NOTHING); + throw Exception("parser.interrupted", 0, "execution stopped"); + } + return; + } + break; + } } } } catch(const Exception&) { @@ -1225,49 +1230,10 @@ Value& Request::construct(VStateless_cla // some stateless_class creatable derivates return *result; } else - throw Exception(PARSER_RUNTIME, - 0, //&frame.name(), - "is not a constructor, system class '%s' can be constructed only implicitly", - called_class.type()); - } else - throw Exception(PARSER_RUNTIME, 0, "method is static and can not be used as constructor"); -} - -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; - - 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(r, *frame.numbered_params()); // execute it - } else // parser code, execute it - r.recoursion_checked_execute(*method.parser_code); + throw Exception(PARSER_RUNTIME, method.name, + "is not a constructor, system class '%s' can be constructed only implicitly", called_class.type()); } 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_write(VMethodFrame& frame){ - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - - rcontext=method_frame=&frame; - - do_call(frame, *this); - - rcontext=saved_rcontext; - method_frame=saved_method_frame; + throw Exception(PARSER_RUNTIME, method.name, "method of '%s' is static and can not be used as constructor", called_class.type()); } Value& Request::get_element(Value& ncontext, const String& name) { @@ -1287,58 +1253,65 @@ void Request::put_element(Value& ncontex if(const VJunction* vjunction=ncontext.put_element(name, value)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { const Junction& junction = vjunction->junction(); - VConstructorFrame frame(*junction.method, method_frame /*caller*/, junction.self); + int param_count=junction.method->params_count; - size_t param_count=frame.method_params_count(); - - if(junction.auto_name){ + 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); + if(param_count!=2) + 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); - Temp_disable_default_setter temp(junction.self); - execute_method(frame); - } else { + CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { + frame.store_params(params, 2); + Temp_disable_default_setter temp(junction.self); + call(frame); + }); + } else { // setter - if(param_count!=1) - throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); + if(param_count!=1) + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); - frame.store_params(&value, 1); - execute_method(frame); + CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { + frame.store_params(&value, 1); + call(frame); + }); } } } Value& Request::process_getter(Junction& junction) { - VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); - size_t param_count=frame.method_params_count(); + int param_count=junction.method->params_count; - if(junction.auto_name){ + if(junction.auto_name){ // default getter - Value *param; + if(param_count>1) + throw Exception(PARSER_RUNTIME, 0, "default getter method can't have more then 1 parameter (has %d parameters)", param_count); - 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); - param=new VString(*junction.auto_name); - frame.store_params(¶m, 1); - } // no need for else frame.empty_params() + Value *param; + METHOD_FRAME_ACTION(*junction.method, method_frame/*caller*/, junction.self, { - Temp_disable_default_getter temp(junction.self); - execute_method(frame); + if(param_count){ + param=new VString(*junction.auto_name); + frame.store_params(¶m, 1); + } // no need for else frame.empty_params() + + Temp_disable_default_getter temp(junction.self); + call(frame); + return frame.result(); + }); } else { // getter - if(param_count!=0) + if(param_count>0) 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); + METHOD_FRAME_ACTION(*junction.method, method_frame/*caller*/, junction.self, { + // no need for frame.empty_params() + call(frame); + return frame.result(); + }); } - return frame.result(); } Value& Request::process(Value& input_value) { @@ -1364,8 +1337,7 @@ Value& Request::process(Value& input_val // 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) { + if(junction->wcontext) { // {} code wrapper VCodeFrame local(*junction->wcontext); wcontext=&local; @@ -1460,35 +1432,23 @@ void Request::process_write(Value& input write(input_value); } -void Request::execute_method(VMethodFrame& aframe) { - SAVE_CONTEXT - - // initialize contexts - rcontext=wcontext=method_frame=&aframe; - - // 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) { + METHOD_FRAME_ACTION(method, method_frame/*caller*/, aself, { - VMethodFrame local_frame(method, method_frame/*caller*/, aself); - - if(optional_param && local_frame.method_params_count()>0) { - local_frame.store_params(&optional_param, 1); - } else { - local_frame.empty_params(); - } + if(optional_param && method.params_count>0) { + frame.store_params(&optional_param, 1); + } else { + frame.empty_params(); + } - // prevent non-string writes for better error reporting - if(do_return_string) - local_frame.write(local_frame); + // prevent non-string writes for better error reporting + if(do_return_string) + frame.write(frame); - execute_method(local_frame); + call(frame); - return do_return_string ? local_frame.get_string() : 0; + return do_return_string ? frame.get_string() : 0; + }); } Request::Execute_nonvirtual_method_result @@ -1509,7 +1469,7 @@ const String* Request::execute_virtual_m return 0; } -const String* Request::get_method_filename(const Method* method){ +const String* Request::get_method_filespec(const Method* method){ if(ArrayOperation* code=method->parser_code) if(code){ Operation::Origin origin={0, 0, 0}; @@ -1579,7 +1539,7 @@ const String* Request::get_method_filena default: break; } if(origin.file_no) - return get_used_filename(origin.file_no); + return get_used_filespec(origin.file_no); } } return 0;