--- parser3/src/main/execute.C 2016/09/29 18:49:43 1.385 +++ parser3/src/main/execute.C 2017/01/13 13:50:28 1.403 @@ -21,19 +21,19 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.385 2016/09/29 18:49:43 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 #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 @@ -247,7 +242,6 @@ void debug_dump(SAPI_Info& sapi_info, in #define DEBUG_PRINT_OPS(local_ops) #endif - // Request void Request::execute(ArrayOperation& ops) { @@ -336,7 +330,7 @@ void Request::execute(ArrayOperation& op if(opcode==OP::OP_GET_ELEMENT__SPECIAL){ stack.push(*value); } else { - write_assign_lang(*value); + write(*value); } break; } @@ -370,17 +364,16 @@ 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) \ 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) { \ - wcontext->set_in_expression(false); \ +#define DO_CONSTRUCT_EXPR(context) { \ DO_CONSTRUCT(context, &value.as_expr_result()) \ } @@ -420,15 +413,11 @@ 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: { - // 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(); @@ -440,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: @@ -463,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: @@ -478,14 +467,11 @@ void Request::execute(ArrayOperation& op case OP::OP_WRITE_VALUE: { Value& value=stack.pop().value(); - write_assign_lang(value); + write(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; @@ -499,7 +485,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(string_value) - write_no_lang(string_value); + write(string_value); break; } @@ -518,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: @@ -532,7 +518,7 @@ void Request::execute(ArrayOperation& op } Value& value=get_element(ncontext, name); stack.push(value); - break; + goto check_skip; } #endif @@ -547,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({ @@ -556,7 +542,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(value); }) #ifdef FEATURE_GET_ELEMENT4CALL case OP::OP_GET_OBJECT_ELEMENT4CALL: DO_GET_OBJECT_ELEMENT({ @@ -578,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({ @@ -587,7 +573,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(value); }) #ifdef FEATURE_GET_ELEMENT4CALL case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL: DO_GET_OBJECT_VAR_ELEMENT({ @@ -603,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 @@ -613,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 @@ -622,8 +608,8 @@ 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); - break; + write(value); + goto check_skip; } #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -636,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: @@ -647,8 +633,8 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) Value& value=get_element(*rcontext, name); - write_assign_lang(value); - break; + write(value); + goto check_skip; } case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: @@ -660,7 +646,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*method_frame, name); stack.push(value); - break; + goto check_skip; } #endif @@ -678,9 +664,9 @@ void Request::execute(ArrayOperation& op if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ stack.push(value); } else { - write_assign_lang(value); + write(value); } - break; + goto check_skip; } #endif @@ -689,8 +675,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,10 +684,10 @@ void Request::execute(ArrayOperation& op execute(local_ops); - stack.push(wcontext->result()); - flang=saved_lang; + stack.push((Value&)wcontext->result()); + wcontext=saved_wcontext; - break; + goto check_skip; } case OP::OP_STRING_POOL: @@ -723,7 +707,7 @@ void Request::execute(ArrayOperation& op stack.push(*value); wcontext=saved_wcontext; - break; + goto check_skip; } // CALL @@ -757,22 +741,18 @@ 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_PARAMS_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + if(!fskip){ \ + 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,36 +767,23 @@ 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(); - // VMethodFrame 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: @@ -831,27 +798,24 @@ 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(); 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 { @@ -860,27 +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(op_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(op_call(frame)); - write_pass_lang(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: @@ -913,20 +870,21 @@ 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(op_call(frame)); - object.enable_default_setter(); - result=&frame.result(); - // VMethodFrame 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) stack.push(*result); else - write_pass_lang(*result); + write(*result); DEBUG_PRINT_STR("<-returned") - break; + goto check_skip; } // expression ops: unary @@ -1012,9 +970,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 +986,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 +1002,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); @@ -1114,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: { @@ -1129,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: { @@ -1235,11 +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&) { @@ -1251,16 +1213,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) { @@ -1269,79 +1230,21 @@ 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()); + 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, //&frame.name(), - "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; - - 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(*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"); - - RESTORE_CONTEXT -} - -void Request::op_call_write(VMethodFrame& frame){ - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - - rcontext=&frame; - 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; - - 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; + 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) { 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 @@ -1350,85 +1253,72 @@ 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); - - size_t param_count=frame.method_params_count(); + int param_count=junction.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) - throw Exception(PARSER_RUNTIME, - 0, - "getter method must have no parameters (has %d parameters)", param_count); + 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(); } -/** @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? @@ -1438,32 +1328,26 @@ Value& Request::process(Value& input_val 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; - if(using_code_frame) { - // almost plain wwrapper about junction wcontext - + // for code in [] and () wcontext is set 0 + // using the fact in decision "which wrapper to use" + if(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 +1378,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,23 +1401,23 @@ 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; // execute it recoursion_checked_execute(*junction->code); RESTORE_CONTEXT - write_pass_lang(local.result()); + write(local.result()); } else { - // plain wwrapper + // [] or () code wrapper WWrapper local(wcontext); wcontext=&local; // execute it recoursion_checked_execute(*junction->code); RESTORE_CONTEXT - write_pass_lang(local.result()); + write(local.result()); } DEBUG_PRINT_STR("<-ja returned") @@ -1548,47 +1429,30 @@ void Request::process_write(Value& input // just return it as we do for usual objects } - write_pass_lang(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 + write(input_value); } -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); +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, { - 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 -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 +1460,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) @@ -1606,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}; @@ -1676,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;