--- parser3/src/main/execute.C 2016/10/04 13:23:46 1.388 +++ parser3/src/main/execute.C 2023/10/06 20:02:50 1.415 @@ -1,8 +1,8 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_opcode.h" @@ -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.415 2023/10/06 20:02:50 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 @@ -243,7 +242,6 @@ void debug_dump(SAPI_Info& sapi_info, in #define DEBUG_PRINT_OPS(local_ops) #endif - // Request void Request::execute(ArrayOperation& ops) { @@ -282,11 +280,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) - VStateless_class* vclass=get_class(name); - if(!vclass) - throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - - stack.push(*vclass); + stack.push(get_class_ref(name)); break; } @@ -299,11 +293,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) - VStateless_class* vclass=get_class(name); - if(!vclass) - throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - - stack.push(*new VBaseClassWrapper(*vclass, get_self())); + stack.push(*new VBaseClassWrapper(get_class_ref(name), get_self())); break; } @@ -332,7 +322,7 @@ void Request::execute(ArrayOperation& op if(opcode==OP::OP_GET_ELEMENT__SPECIAL){ stack.push(*value); } else { - write_assign_lang(*value); + write(*value); } break; } @@ -366,17 +356,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()) \ } @@ -416,15 +405,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(); @@ -436,7 +421,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: @@ -457,9 +442,8 @@ 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(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: @@ -474,14 +458,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; @@ -495,7 +476,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(string_value) - write_no_lang(string_value); + write(string_value); break; } @@ -514,7 +495,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: @@ -528,7 +509,7 @@ void Request::execute(ArrayOperation& op } Value& value=get_element(ncontext, name); stack.push(value); - break; + goto check_skip; } #endif @@ -543,7 +524,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({ @@ -552,7 +533,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({ @@ -574,7 +555,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({ @@ -583,7 +564,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({ @@ -599,7 +580,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 @@ -609,7 +590,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 @@ -618,8 +599,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 @@ -632,7 +613,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: @@ -643,8 +624,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: @@ -656,7 +637,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*method_frame, name); stack.push(value); - break; + goto check_skip; } #endif @@ -674,19 +655,19 @@ 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 case OP::OP_OBJECT_POOL: { + debug_name=0; + 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 @@ -696,10 +677,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: @@ -719,7 +700,7 @@ void Request::execute(ArrayOperation& op stack.push(*value); wcontext=saved_wcontext; - break; + goto check_skip; } // CALL @@ -753,18 +734,14 @@ void Request::execute(ArrayOperation& op break; } - case OP::OP_PREPARE_TO_EXPRESSION: - { - wcontext->set_in_expression(true); - 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(); \ @@ -790,22 +767,16 @@ void Request::execute(ArrayOperation& op 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: @@ -825,17 +796,19 @@ 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(); 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 { @@ -844,25 +817,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: @@ -874,9 +842,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(class_name) - VStateless_class* vclass=get_class(class_name); - if(!vclass) - throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); + VStateless_class& vclass=get_class_ref(class_name); debug_origin=i.next().origin; Value& vconstructor_name=*i.next().value; @@ -884,9 +850,9 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(constructor_name) - Junction* constructor_junction=get_element(*vclass, constructor_name).get_junction(); + Junction* constructor_junction=get_element(vclass, constructor_name).get_junction(); if(!constructor_junction) - throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", vclass->type()); + throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", vclass.type()); ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) @@ -894,21 +860,22 @@ 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 + Value& object=construct(vclass, *constructor_junction->method); + 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 @@ -951,41 +918,53 @@ void Request::execute(ArrayOperation& op case OP::OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=VBool::get(file_exist(absolute(a.as_string()))); + Value& value=VBool::get(file_exist(full_disk_path(a.as_string()))); stack.push(value); break; } case OP::OP_DEXISTS: { Value& a=stack.pop().value(); - Value& value=VBool::get(dir_exists(absolute(a.as_string()))); + Value& value=VBool::get(dir_exists(full_disk_path(a.as_string()))); stack.push(value); break; } // expression ops: binary - case OP::OP_SUB: + case OP::OP_SUB: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VDouble(a.as_double() - b.as_double()); + + double a_double=a.as_double(); + double b_double=b.as_double(); + + Value& value=*new VDouble(a_double - b_double); stack.push(value); break; } - case OP::OP_ADD: + case OP::OP_ADD: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VDouble(a.as_double() + b.as_double()); + + double a_double=a.as_double(); + double b_double=b.as_double(); + + Value& value=*new VDouble(a_double + b_double); stack.push(value); break; } - case OP::OP_MUL: + case OP::OP_MUL: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VDouble(a.as_double() * b.as_double()); + + double a_double=a.as_double(); + double b_double=b.as_double(); + + Value& value=*new VDouble(a_double * b_double); stack.push(value); break; } - case OP::OP_DIV: + case OP::OP_DIV: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -1001,7 +980,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_MOD: + case OP::OP_MOD: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -1090,7 +1069,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: { @@ -1105,7 +1084,7 @@ void Request::execute(ArrayOperation& op } Value& value=VBool::get(result); stack.push(value); - break; + goto check_skip; } case OP::OP_LOG_XOR: { @@ -1211,9 +1190,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&) { @@ -1234,7 +1225,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) { @@ -1243,60 +1233,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"); -} - -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); + 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"); - - 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) { @@ -1313,80 +1253,74 @@ Value& Request::get_element4call(Value& 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(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(); - - 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(const VJunction* vjunction=ncontext.put_element(name, value)) { + const Junction& junction = vjunction->junction(); + int param_count=junction.method->params_count; + + 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); - Value* params[2] = { new VString(*junction.auto_name), value }; - frame.store_params(params, 2); + Value* params[2] = { new VString(*junction.auto_name), value }; + CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { + frame.store_params(params, 2); Temp_disable_default_setter temp(junction.self); - execute_method(frame); - } else { - // setter - if(param_count!=1) - throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); + call(frame); + }); + } else { + // setter + if(param_count!=1) + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); + CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { frame.store_params(&value, 1); - execute_method(frame); - } + 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(); } -/** @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 +1337,19 @@ 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; - 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; @@ -1450,7 +1380,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 +1392,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,23 +1403,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") @@ -1502,62 +1431,61 @@ void Request::process_write(Value& input // just return it as we do for usual objects } - write_pass_lang(input_value); + 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); +const String* Request::execute_method(VStateless_class& aclass, const String& method_name, Value* optional_param) { + if(const Method *method=aclass.get_method(method_name)){ + METHOD_FRAME_ACTION(*method, method_frame/*caller*/, aclass, { + + 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 + frame.write(frame); + + call(frame); - RESTORE_CONTEXT + Value &result=frame.result(); + if(const String* sresult=result.get_string()){ + return sresult; + } + result.bark("is '%s', it has no string representation", &method_name); + }); + } + return 0; } -const String* Request::execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string) { +bool Request::execute_method_if_exists(VStateless_class& aclass, const String& method_name, Value* optional_param) { + if(const Method *method=aclass.get_method(method_name)){ + METHOD_FRAME_ACTION(*method, method_frame/*caller*/, aclass, { - VMethodFrame local_frame(method, method_frame/*caller*/, aself); + if(optional_param && method->params_count>0) { + frame.store_params(&optional_param, 1); + } else { + frame.empty_params(); + } - if(optional_param && local_frame.method_params_count()>0) { - local_frame.store_params(&optional_param, 1); - } else { - local_frame.empty_params(); + call(frame); + }); + return true; } - - // prevent non-string writes for better error reporting - if(do_return_string) - local_frame.write(local_frame); - - execute_method(local_frame); - - return do_return_string ? local_frame.get_string() : 0; + return false; } -Request::Execute_nonvirtual_method_result -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) - result.string=execute_method(aclass, *result.method, optional_param, do_return_string); - return result; +const String* Request::get_method_filespec(const Method* method){ + Operation::Origin origin=get_method_origin(method); + return origin.file_no ? get_used_filespec(origin.file_no) : NULL; } -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) - return execute_method(aself, *method, 0/*no params*/, true); - - return 0; -} +const Operation::Origin Request::get_method_origin(const Method* method){ + Operation::Origin origin={0, 0, 0}; -const String* Request::get_method_filename(const Method* method){ if(ArrayOperation* code=method->parser_code) if(code){ - Operation::Origin origin={0, 0, 0}; Array_iterator i(*code); while( i.has_next() ){ switch( i.next().code ){ @@ -1624,9 +1552,9 @@ const String* Request::get_method_filena default: break; } if(origin.file_no) - return get_used_filename(origin.file_no); + return origin; } } - return 0; + return origin; }