--- parser3/src/main/execute.C 2016/11/03 16:17:37 1.397 +++ parser3/src/main/execute.C 2024/09/18 22:24:17 1.421 @@ -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" @@ -19,9 +19,10 @@ #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_vimage.h" +#include "pa_varray.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.397 2016/11/03 16:17:37 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.421 2024/09/18 22:24:17 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -34,7 +35,7 @@ const char *opcode_name[]={ // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS", - "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", + "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "CONSTRUCT_ARRAY", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT "VALUE__GET_ELEMENT_OR_OPERATOR", @@ -128,8 +129,7 @@ void debug_printf(SAPI_Info& sapi_info, } void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { - Array_iterator i(ops); - while(i.has_next()) { + for(Array_iterator i(ops); i;) { OP::OPCODE opcode=i.next().code; #if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) @@ -220,6 +220,7 @@ void debug_dump(SAPI_Info& sapi_info, in case OP::OP_NESTED_CODE: case OP::OP_OBJECT_POOL: case OP::OP_STRING_POOL: + case OP::OP_CONSTRUCT_ARRAY: case OP::OP_CALL: case OP::OP_CALL__WRITE: if(ArrayOperation* local_ops=i.next().ops) @@ -242,11 +243,10 @@ void debug_dump(SAPI_Info& sapi_info, in #define DEBUG_PRINT_OPS(local_ops) #endif - // Request void Request::execute(ArrayOperation& ops) { - register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' + Stack& stack=this->stack; // helps a lot on MSVC: 'esi' const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; try{ @@ -255,7 +255,7 @@ void Request::execute(ArrayOperation& op debug_dump(sapi_info, 0, ops); debug_printf(sapi_info, "execution-------------------------\n"); #endif - for(Array_iterator i(ops); i.has_next(); ) { + for(Array_iterator i(ops); i; ) { OP::OPCODE opcode=i.next().code; #ifdef DEBUG_EXECUTE @@ -281,11 +281,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; } @@ -298,11 +294,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; } @@ -371,7 +363,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 +406,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 +422,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: @@ -452,11 +443,36 @@ 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_CONSTRUCT_ARRAY: + { + ArrayOperation* local_ops=i.next().ops; + + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + size_t first = stack.top_index(); + execute(*local_ops); + Value *value=new VArray(stack.top_index()-first, (Value**)stack.ptr(first)); + stack.set_top_index(first); + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#else + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#endif + put_element(ncontext, name, value); + + DEBUG_PRINT_STR("<-returned") + goto check_skip; + } + case OP::OP_NESTED_CODE: { ArrayOperation& local_ops=*i.next().ops; @@ -506,7 +522,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 +536,7 @@ void Request::execute(ArrayOperation& op } Value& value=get_element(ncontext, name); stack.push(value); - break; + goto check_skip; } #endif @@ -535,7 +551,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 +582,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 +607,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 +617,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 +627,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 +640,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 +652,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 +664,7 @@ void Request::execute(ArrayOperation& op Value& value=get_element(*method_frame, name); stack.push(value); - break; + goto check_skip; } #endif @@ -668,12 +684,14 @@ void Request::execute(ArrayOperation& op } else { 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; @@ -686,9 +704,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 +727,7 @@ void Request::execute(ArrayOperation& op stack.push(*value); wcontext=saved_wcontext; - break; + goto check_skip; } // CALL @@ -746,8 +765,10 @@ void Request::execute(ArrayOperation& op 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(); \ @@ -765,7 +786,7 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { - if(value.is("void")) + if(dynamic_cast(&value)) 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()); @@ -782,14 +803,7 @@ void Request::execute(ArrayOperation& op 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: @@ -803,7 +817,7 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { - if(value.is("void")) + if(dynamic_cast(&value)) 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()); @@ -816,10 +830,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 { @@ -841,14 +857,7 @@ void Request::execute(ArrayOperation& op } 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: @@ -860,9 +869,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; @@ -870,9 +877,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) @@ -880,7 +887,7 @@ void Request::execute(ArrayOperation& op Value *result; { - Value& object=construct(*vclass, *constructor_junction->method); + 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(); @@ -895,7 +902,7 @@ void Request::execute(ArrayOperation& op write(*result); DEBUG_PRINT_STR("<-returned") - break; + goto check_skip; } // expression ops: unary @@ -938,46 +945,50 @@ 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()); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().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()); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().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()); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().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(); - - double a_double=a.as_double(); - double b_double=b.as_double(); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); if(b_double == 0) { //const String* problem_source=b.as_string(); @@ -988,12 +999,10 @@ 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(); - - double a_double=a.as_double(); - double b_double=b.as_double(); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); if(b_double == 0) { //const String* problem_source=b.as_string(); @@ -1006,10 +1015,8 @@ void Request::execute(ArrayOperation& op } case OP::OP_INTDIV: { - Value& b=stack.pop().value(); Value& a=stack.pop().value(); - - int a_int=a.as_int(); - int b_int=b.as_int(); + int b_int=stack.pop().value().as_int(); + int a_int=stack.pop().value().as_int(); if(b_int == 0) { //const String* problem_source=b.as_string(); @@ -1077,7 +1084,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: { @@ -1092,7 +1099,7 @@ void Request::execute(ArrayOperation& op } Value& value=VBool::get(result); stack.push(value); - break; + goto check_skip; } case OP::OP_LOG_XOR: { @@ -1198,9 +1205,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&) { @@ -1229,12 +1248,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()); + 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, "method is static and can not be used as constructor"); + 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) { @@ -1251,34 +1268,33 @@ 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(); - 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 }; - - 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); - - CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { - frame.store_params(&value, 1); - call(frame); - }); - } + 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 }; + + 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); + + CONSTRUCTOR_FRAME_ACTION(*junction.method, method_frame /*caller*/, junction.self, { + frame.store_params(&value, 1); + call(frame); + }); } + } } Value& Request::process_getter(Junction& junction) { @@ -1338,8 +1354,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; @@ -1434,49 +1449,81 @@ void Request::process_write(Value& input write(input_value); } -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, { +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(); - } + 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) + // prevent non-string writes for better error reporting frame.write(frame); + + call(frame); - call(frame); - - return do_return_string ? frame.get_string() : 0; - }); + 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; +} + +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, { + + if(optional_param && method->params_count>0) { + frame.store_params(&optional_param, 1); + } else { + frame.empty_params(); + } + + call(frame); + }); + return true; + } + 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; +bool Request::execute_auto_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, { + Value* two_params[2]; + + if (optional_param && method->params_count>1) { + two_params[0] = optional_param; + two_params[1] = new VString(*new String(aclass.type())); + frame.store_params(two_params, 2); + } else if (optional_param && method->params_count>0) { + frame.store_params(&optional_param, 1); + } else { + frame.empty_params(); + } + + call(frame); + }); + return true; + } + return false; } -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 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::get_method_filename(const Method* method){ +const Operation::Origin Request::get_method_origin(const Method* method){ + Operation::Origin origin={0, 0, 0}; + if(ArrayOperation* code=method->parser_code) if(code){ - Operation::Origin origin={0, 0, 0}; - Array_iterator i(*code); - while( i.has_next() ){ + for(Array_iterator i(*code); i; ){ switch( i.next().code ){ case OP::OP_CURLY_CODE__STORE_PARAM: case OP::OP_EXPR_CODE__STORE_PARAM: @@ -1541,9 +1588,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; }