--- parser3/src/main/execute.C 2020/12/15 17:10:34 1.412 +++ parser3/src/main/execute.C 2024/07/24 19:42:18 1.418 @@ -1,8 +1,8 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2020 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.412 2020/12/15 17:10:34 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.418 2024/07/24 19:42:18 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -245,7 +245,7 @@ void debug_dump(SAPI_Info& sapi_info, in // 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{ @@ -280,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; } @@ -297,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; } @@ -850,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; @@ -860,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) @@ -870,7 +860,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(); @@ -941,33 +931,37 @@ void Request::execute(ArrayOperation& op } // 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(); @@ -978,12 +972,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(); @@ -996,10 +988,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(); @@ -1465,6 +1455,28 @@ bool Request::execute_method_if_exists(V frame.store_params(&optional_param, 1); } else { frame.empty_params(); + } + + call(frame); + }); + return true; + } + return false; +} + +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);