--- parser3/src/main/execute.C 2023/11/17 19:12:34 1.417 +++ 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 */ @@ -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.417 2023/11/17 19:12: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.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 @@ -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) @@ -214,12 +214,13 @@ 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: 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) @@ -245,7 +246,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{ @@ -254,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 @@ -441,11 +442,37 @@ 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)) - throw Exception(PARSER_RUNTIME, 0, "property value can not be code, use [] or () brackets"); + if(ncontext.put_element(name, &value)) + throw Exception(PARSER_RUNTIME, 0, "property value cannot 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; @@ -489,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); @@ -503,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); @@ -759,10 +784,10 @@ 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()); + throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, cannot call it", value.type()); } Value *result; @@ -790,10 +815,10 @@ 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()); + throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, cannot call it", value.type()); } const Method& method=*junction->method; @@ -850,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) @@ -988,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(); @@ -1004,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; } @@ -1013,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; } @@ -1022,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; } @@ -1031,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; } @@ -1040,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; } @@ -1081,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(); @@ -1089,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(); @@ -1097,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(); @@ -1105,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(); @@ -1113,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(); @@ -1121,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(); @@ -1129,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()); @@ -1224,7 +1250,7 @@ Value& Request::construct(VStateless_cla 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, method.name, "method of '%s' is static and can not be used as constructor", called_class.type()); + throw Exception(PARSER_RUNTIME, method.name, "method of '%s' is static and cannot be used as constructor", called_class.type()); } Value& Request::get_element(Value& ncontext, const String& name) { @@ -1276,7 +1302,7 @@ Value& Request::process_getter(Junction& if(junction.auto_name){ // default getter if(param_count>1) - throw Exception(PARSER_RUNTIME, 0, "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "default getter method can't have more than 1 parameter (has %d parameters)", param_count); Value *param; METHOD_FRAME_ACTION(*junction.method, method_frame/*caller*/, junction.self, { @@ -1333,7 +1359,7 @@ Value& Request::process(Value& input_val wcontext=&local; // execute it - recoursion_checked_execute(*junction->code); + recursion_checked_execute(*junction->code); result=wcontext->result(); } else { @@ -1342,7 +1368,7 @@ Value& Request::process(Value& input_val wcontext=&local; // execute it - recoursion_checked_execute(*junction->code); + recursion_checked_execute(*junction->code); result=wcontext->result(); } @@ -1354,7 +1380,7 @@ Value& Request::process(Value& input_val return result; } - // it is then method-junction, do not explode it + // then it is a method-junction, do not explode it // just return it as we do for usual objects } @@ -1385,7 +1411,7 @@ void Request::process_write(Value& input #ifdef OPTIMIZE_CALL if(wcontext==junction->wcontext){ // no wrappers for wcontext - recoursion_checked_execute(*junction->code); + recursion_checked_execute(*junction->code); RESTORE_CONTEXT } else @@ -1396,7 +1422,7 @@ void Request::process_write(Value& input wcontext=&local; // execute it - recoursion_checked_execute(*junction->code); + recursion_checked_execute(*junction->code); RESTORE_CONTEXT write(local.result()); } else { @@ -1405,7 +1431,7 @@ void Request::process_write(Value& input wcontext=&local; // execute it - recoursion_checked_execute(*junction->code); + recursion_checked_execute(*junction->code); RESTORE_CONTEXT write(local.result()); } @@ -1415,7 +1441,7 @@ void Request::process_write(Value& input return; } - // it is then method-junction, do not explode it + // then it is a method-junction, do not explode it // just return it as we do for usual objects } @@ -1496,8 +1522,7 @@ const Operation::Origin Request::get_met if(ArrayOperation* code=method->parser_code) if(code){ - 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: