--- parser3/src/main/execute.C 2023/10/06 20:02:50 1.415 +++ parser3/src/main/execute.C 2024/09/18 22:24:17 1.421 @@ -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.415 2023/10/06 20:02:50 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) @@ -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 @@ -446,6 +447,32 @@ void Request::execute(ArrayOperation& op 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; @@ -759,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()); @@ -790,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()); @@ -933,10 +960,8 @@ void Request::execute(ArrayOperation& op // expression ops: binary case OP::OP_SUB: { - 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(); Value& value=*new VDouble(a_double - b_double); stack.push(value); @@ -944,10 +969,8 @@ void Request::execute(ArrayOperation& op } case OP::OP_ADD: { - 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(); Value& value=*new VDouble(a_double + b_double); stack.push(value); @@ -955,10 +978,8 @@ void Request::execute(ArrayOperation& op } case OP::OP_MUL: { - 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(); Value& value=*new VDouble(a_double * b_double); stack.push(value); @@ -966,10 +987,8 @@ void Request::execute(ArrayOperation& op } 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(); @@ -982,10 +1001,8 @@ void Request::execute(ArrayOperation& op } 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(); @@ -998,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(); @@ -1476,6 +1491,28 @@ bool Request::execute_method_if_exists(V 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); + }); + return true; + } + return false; +} + 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; @@ -1486,8 +1523,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: