--- parser3/src/main/execute.C 2026/01/06 16:36:39 1.428 +++ parser3/src/main/execute.C 2026/10/18 21:05:35 1.433 @@ -1,7 +1,7 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -22,7 +22,7 @@ #include "pa_varray.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.428 2026/01/06 16:36:39 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.433 2026/10/18 21:05:35 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -117,7 +117,7 @@ const char* debug_value_to_cstr(Value& v void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; - vsnprintf(buf, MAX_STRING, fmt, args); + pa_vsnprintf(buf, MAX_STRING, fmt, args); SAPI::log(sapi_info, "%s", buf); } @@ -246,6 +246,7 @@ void debug_dump(SAPI_Info& sapi_info, in // Request void Request::execute(ArrayOperation& ops) { + SINGLE_METHOD_FRAME_STORAGE; // one frame at a time, see SINGLE_METHOD_FRAME Stack& stack=this->stack; // helps a lot on MSVC: 'esi' const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; @@ -450,6 +451,8 @@ void Request::execute(ArrayOperation& op case OP::OP_CONSTRUCT_ARRAY: { + debug_name=0; + ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) @@ -460,13 +463,9 @@ void Request::execute(ArrayOperation& op 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") @@ -792,7 +791,7 @@ void Request::execute(ArrayOperation& op Value *result; { - EXPRESSION_FRAME_ACTION(*junction->method, method_frame, junction->self, { + SINGLE_EXPRESSION_FRAME_ACTION(*junction->method, method_frame, junction->self, { METHOD_PARAMS_ACTION(call(frame)); result=&frame.result(); // desctructor deletes junctions in stack params here @@ -842,13 +841,13 @@ void Request::execute(ArrayOperation& op method.native_code(*this, method_params); // execute it } } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ - METHOD_FRAME_ACTION(method, method_frame, junction->self, { + SINGLE_METHOD_FRAME_ACTION(method, method_frame, junction->self, { METHOD_PARAMS_ACTION(call_write(frame)) }); } else #endif // OPTIMIZE_CALL { - METHOD_FRAME_ACTION(method, method_frame, junction->self, { + SINGLE_METHOD_FRAME_ACTION(method, method_frame, junction->self, { METHOD_PARAMS_ACTION(call(frame)); write(frame.result()); }); @@ -887,7 +886,7 @@ void Request::execute(ArrayOperation& op Value *result; { Value& object=construct(vclass, *constructor_junction->method); - CONSTRUCTOR_FRAME_ACTION(*constructor_junction->method, method_frame, object, { + SINGLE_CONSTRUCTOR_FRAME_ACTION(*constructor_junction->method, method_frame, object, { METHOD_PARAMS_ACTION(call(frame)); object.enable_default_setter(); result=&frame.result(); @@ -944,14 +943,16 @@ void Request::execute(ArrayOperation& op case OP::OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=VBool::get(file_exist(full_disk_path(a.as_string()))); + const String* path=real_disk_path(a.as_string()); + Value& value=VBool::get(path && file_exist(*path)); stack.push(value); break; } case OP::OP_DEXISTS: { Value& a=stack.pop().value(); - Value& value=VBool::get(dir_exists(full_disk_path(a.as_string()))); + const String* path=real_disk_path(a.as_string()); + Value& value=VBool::get(path && dir_exists(*path)); stack.push(value); break; }