--- parser3/src/main/execute.C 2024/10/02 21:24:41 1.423 +++ parser3/src/main/execute.C 2026/01/06 16:36:39 1.428 @@ -1,7 +1,7 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://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.423 2024/10/02 21:24:41 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.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; //#define DEBUG_EXECUTE @@ -214,7 +214,7 @@ void debug_dump(SAPI_Info& sapi_info, in debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { - case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__STORE_PARAM: case OP::OP_EXPR_CODE__STORE_PARAM: case OP::OP_CURLY_CODE__CONSTRUCT: case OP::OP_NESTED_CODE: @@ -442,7 +442,7 @@ 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(ncontext.put_element(name, &value)) throw Exception(PARSER_RUNTIME, 0, "property value cannot be code, use [] or () brackets"); break; @@ -516,8 +516,7 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST - if(!method->junction_template) method->junction_template=new VJunction(main_class, method); - stack.push(*method->junction_template); + stack.push(*method->get_vjunction(main_class)); break; } Value& value=get_element(*rcontext, name); @@ -530,8 +529,7 @@ void Request::execute(ArrayOperation& op const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST - if(!method->junction_template) method->junction_template=new VJunction(main_class, method); - stack.push(*method->junction_template); + stack.push(*method->get_vjunction(main_class)); break; } Value& value=get_element(ncontext, name); @@ -877,9 +875,10 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(constructor_name) + // not get_element4call for better error reporting 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, "%s constructor not found", vclass.type()); ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) @@ -1015,8 +1014,8 @@ void Request::execute(ArrayOperation& op } case OP::OP_INTDIV: { - int b_int=stack.pop().value().as_int(); - int a_int=stack.pop().value().as_int(); + pa_wint b_int=stack.pop().value().as_wint(); + pa_wint a_int=stack.pop().value().as_wint(); if(b_int == 0) { //const String* problem_source=b.as_string(); @@ -1031,8 +1030,8 @@ void Request::execute(ArrayOperation& op { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( - a.as_int() << - b.as_int()); + a.as_wint() << + b.as_wint()); stack.push(value); break; } @@ -1040,8 +1039,8 @@ void Request::execute(ArrayOperation& op { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( - a.as_int() >> - b.as_int()); + a.as_wint() >> + b.as_wint()); stack.push(value); break; } @@ -1049,8 +1048,8 @@ void Request::execute(ArrayOperation& op { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( - a.as_int() & - b.as_int()); + a.as_wint() & + b.as_wint()); stack.push(value); break; } @@ -1058,8 +1057,8 @@ void Request::execute(ArrayOperation& op { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( - a.as_int() | - b.as_int()); + a.as_wint() | + b.as_wint()); stack.push(value); break; } @@ -1067,8 +1066,8 @@ void Request::execute(ArrayOperation& op { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( - a.as_int() ^ - b.as_int()); + a.as_wint() ^ + b.as_wint()); stack.push(value); break; } @@ -1108,7 +1107,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_LT: + case OP::OP_NUM_LT: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1116,7 +1115,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_GT: + case OP::OP_NUM_GT: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1124,7 +1123,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_LE: + case OP::OP_NUM_LE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1132,7 +1131,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_GE: + case OP::OP_NUM_GE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1140,7 +1139,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_EQ: + case OP::OP_NUM_EQ: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1148,7 +1147,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_NUM_NE: + case OP::OP_NUM_NE: { volatile double b_double=stack.pop().value().as_double(); volatile double a_double=stack.pop().value().as_double(); @@ -1156,42 +1155,42 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP::OP_STR_LT: + case OP::OP_STR_LT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() < b.as_string()); stack.push(value); break; } - case OP::OP_STR_GT: + case OP::OP_STR_GT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() > b.as_string()); stack.push(value); break; } - case OP::OP_STR_LE: + case OP::OP_STR_LE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() <= b.as_string()); stack.push(value); break; } - case OP::OP_STR_GE: + case OP::OP_STR_GE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() >= b.as_string()); stack.push(value); break; } - case OP::OP_STR_EQ: + case OP::OP_STR_EQ: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() == b.as_string()); stack.push(value); break; } - case OP::OP_STR_NE: + case OP::OP_STR_NE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=VBool::get(a.as_string() != b.as_string());