--- parser3/src/main/execute.C 2015/10/21 23:48:45 1.377 +++ parser3/src/main/execute.C 2016/10/04 13:23:46 1.388 @@ -1,7 +1,7 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -21,19 +21,19 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.377 2015/10/21 23:48:45 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.388 2016/10/04 13:23:46 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE -char *opcode_name[]={ +const char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", "NESTED_CODE", // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", - "VALUE__GET_CLASS", + "VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -110,7 +110,7 @@ const char* debug_value_to_cstr(Value& v return string->cstr(); else if(value.is_bool()) - return value.as_bool()?"":""; + return value.as_bool() ? "" : ""; else return ""; } @@ -155,11 +155,7 @@ void debug_dump(SAPI_Info& sapi_info, in Value& value1=*i.next().value; i.next(); // skip origin Value& value2=*i.next().value; - debug_printf(sapi_info, - "%*s%s" - " \"%s\" \"%s\"", - level*4, "", opcode_name[opcode], - debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + debug_printf(sapi_info, "%*s%s \"%s\" \"%s\"", level*4, "", opcode_name[opcode], debug_value_to_cstr(value1), debug_value_to_cstr(value2)); continue; } #endif @@ -185,6 +181,7 @@ void debug_dump(SAPI_Info& sapi_info, in opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE || opcode==OP::OP_VALUE__GET_CLASS + || opcode==OP::OP_VALUE__GET_BASE_CLASS #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE @@ -280,21 +277,33 @@ void Request::execute(ArrayOperation& op } case OP::OP_VALUE__GET_CLASS: { - // maybe they do ^class:method[] call, remember the fact - wcontext->set_somebody_entered_some_class(); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + VStateless_class* vclass=get_class(name); + if(!vclass) + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); + + stack.push(*vclass); + break; + } + + case OP::OP_VALUE__GET_BASE_CLASS: + { + // ^class:method[] call debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; DEBUG_PRINT_STRING(name) - Value* class_value=get_class(name); - if(!class_value) - throw Exception(PARSER_RUNTIME, - &name, - "class is undefined"); + VStateless_class* vclass=get_class(name); + if(!vclass) + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - stack.push(*class_value); + stack.push(*new VBaseClassWrapper(*vclass, get_self())); break; } @@ -307,19 +316,19 @@ void Request::execute(ArrayOperation& op Value* value=0; if(VStateless_class* vclass=ncontext.get_class()){ - if(name==class_element_name){ + if(SYMBOLS_EQ(name,CLASS_SYMBOL)){ value=vclass; - } else if(name==class_name_element_name){ - value=new VString(vclass->name()); + } else if(SYMBOLS_EQ(name,CLASS_NAME_SYMBOL)){ + value=new VString(*new String(vclass->type())); } } else { - // Value - if(name==class_element_name){ + // VJunction is without class, returning self + if(SYMBOLS_EQ(name,CLASS_SYMBOL)){ value=&ncontext; - }else if(name==class_name_element_name){ + } else if(SYMBOLS_EQ(name,CLASS_NAME_SYMBOL)){ value=new VString(*new String(ncontext.type())); } - }; + } if(opcode==OP::OP_GET_ELEMENT__SPECIAL){ stack.push(*value); } else { @@ -348,9 +357,7 @@ void Request::execute(ArrayOperation& op case OP::OP_WITH_WRITE: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); stack.push(*wcontext); break; @@ -451,9 +458,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); if(const VJunction* vjunction=ncontext.put_element(name, &value)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) - throw Exception(PARSER_RUNTIME, - 0, - "property value can not be code, use [] or () brackets"); + throw Exception(PARSER_RUNTIME, 0, "property value can not be code, use [] or () brackets"); break; } @@ -691,7 +696,7 @@ void Request::execute(ArrayOperation& op execute(local_ops); - stack.push(wcontext->result().as_value()); + stack.push(wcontext->result()); flang=saved_lang; wcontext=saved_wcontext; break; @@ -754,16 +759,16 @@ void Request::execute(ArrayOperation& op break; } -#define METHOD_FRAME_ACTION(action) \ - if(local_ops){ \ - size_t first = stack.top_index(); \ - execute(*local_ops); \ - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ - action; \ - stack.set_top_index(first); \ - } else { \ - frame.empty_params(); \ - action; \ +#define METHOD_FRAME_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + stack.set_top_index(first); \ + } else { \ + frame.empty_params(); \ + action; \ } case OP::OP_CALL: @@ -778,21 +783,16 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); + 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, can not call it", value.type()); } Value *result; { VMethodFrame frame(*junction->method, method_frame, junction->self); METHOD_FRAME_ACTION(op_call(frame)); - result=&frame.result().as_value(); + result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here } stack.push(*result); @@ -803,9 +803,7 @@ void Request::execute(ArrayOperation& op return; if(get_interrupted()) { set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); + throw Exception("parser.interrupted", 0, "execution stopped"); } break; } @@ -822,14 +820,9 @@ void Request::execute(ArrayOperation& op Junction* junction=value.get_junction(); if(!junction) { if(value.is("void")) - throw Exception(PARSER_RUNTIME, - 0, - "undefined method"); + 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, can not call it", value.type()); } #ifdef OPTIMIZE_CALL @@ -867,9 +860,7 @@ void Request::execute(ArrayOperation& op return; if(get_interrupted()) { set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); + throw Exception("parser.interrupted", 0, "execution stopped"); } break; } @@ -883,11 +874,9 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(class_name) - Value* class_value=get_class(class_name); - if(!class_value) - throw Exception(PARSER_RUNTIME, - &class_name, - "class is undefined"); + VStateless_class* vclass=get_class(class_name); + if(!vclass) + throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); debug_origin=i.next().origin; Value& vconstructor_name=*i.next().value; @@ -895,12 +884,9 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(constructor_name) - Junction* constructor_junction=get_element(*class_value, 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'", - class_value->get_class()->name_cstr()); + 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) @@ -908,11 +894,11 @@ void Request::execute(ArrayOperation& op Value *result; { - Value& object=construct(*class_value, *constructor_junction->method); + Value& object=construct(*vclass, *constructor_junction->method); VConstructorFrame frame(*constructor_junction->method, method_frame, object); METHOD_FRAME_ACTION(op_call(frame)); object.enable_default_setter(); - result=&frame.result().as_value(); + result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here } @@ -1008,9 +994,7 @@ void Request::execute(ArrayOperation& op if(b_double == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Division by zero"); + throw Exception("number.zerodivision", 0, "Division by zero"); } Value& value=*new VDouble(a_double / b_double); @@ -1026,9 +1010,7 @@ void Request::execute(ArrayOperation& op if(b_double == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Modulus by zero"); + throw Exception("number.zerodivision", 0, "Modulus by zero"); } Value& value=*new VDouble(fmod(a_double, b_double)); @@ -1044,9 +1026,7 @@ void Request::execute(ArrayOperation& op if(b_int == 0) { //const String* problem_source=b.as_string(); - throw Exception("number.zerodivision", - 0, //problem_source, - "Division by zero"); + throw Exception("number.zerodivision", 0, "Division by zero"); } Value& value=*new VInt(a_int / b_int); @@ -1233,9 +1213,7 @@ void Request::execute(ArrayOperation& op } default: - throw Exception(0, - 0, - "invalid opcode %d", opcode); + throw Exception(0, 0, "invalid opcode %d", opcode); } } } catch(const Exception&) { @@ -1247,18 +1225,17 @@ void Request::execute(ArrayOperation& op } #define SAVE_CONTEXT \ - VMethodFrame *saved_method_frame=method_frame; \ - Value* saved_rcontext=rcontext; \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ WContext *saved_wcontext=wcontext; -#define RESTORE_CONTEXT \ - wcontext=saved_wcontext; \ - rcontext=saved_rcontext; \ +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ method_frame=saved_method_frame; -Value& Request::construct(Value &class_value, const Method &method){ - VStateless_class& called_class=*class_value.get_class(); +Value& Request::construct(VStateless_class &called_class, const Method &method){ if(method.call_type!=Method::CT_STATIC) { // this is a constructor call @@ -1269,11 +1246,9 @@ Value& Request::construct(Value &class_v throw Exception(PARSER_RUNTIME, 0, //&frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - called_class.name().cstr()); + called_class.type()); } else - throw Exception(PARSER_RUNTIME, - 0, //&frame.name(), - "method is static and can not be used as constructor"); + throw Exception(PARSER_RUNTIME, 0, "method is static and can not be used as constructor"); } void Request::op_call(VMethodFrame& frame){ @@ -1295,10 +1270,7 @@ void Request::op_call(VMethodFrame& fram } else // parser code, execute it recoursion_checked_execute(*method.parser_code); } else - throw Exception(PARSER_RUNTIME, - 0, - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); + throw Exception(PARSER_RUNTIME, 0, "is not allowed to be called %s", call_type==Method::CT_STATIC ? "statically" : "dynamically"); RESTORE_CONTEXT } @@ -1321,38 +1293,23 @@ void Request::op_call_write(VMethodFrame } else // parser code, execute it recoursion_checked_execute(*method.parser_code); } else - throw Exception(PARSER_RUNTIME, - 0, - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); + throw Exception(PARSER_RUNTIME, 0, "is not allowed to be called %s", call_type==Method::CT_STATIC ? "statically" : "dynamically"); rcontext=saved_rcontext; method_frame=saved_method_frame; } Value& Request::get_element(Value& ncontext, const String& name) { -#ifdef FEATURE_GET_ELEMENT4CALL Value* value=ncontext.get_element(name); - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } -Value& Request::get_element4call(Value& ncontext, const String& name) { -#endif - if(wcontext->get_somebody_entered_some_class()) // ^class:method - if(VStateless_class *called_class=ncontext.get_class()) - if(VStateless_class *read_class=rcontext->get_class()) - if(read_class->derived_from(*called_class)){ // current derived from called - Value *value=called_class->get_element(get_self(), name); - return *(value ? &process_to_value(*value) : VVoid::get()); - } - #ifdef FEATURE_GET_ELEMENT4CALL +Value& Request::get_element4call(Value& ncontext, const String& name) { Value* value=ncontext.get_element4call(name); -#else - Value* value=ncontext.get_element(name); -#endif - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } +#endif void Request::put_element(Value& ncontext, const String& name, Value* value) { // put_element can return property-setting-junction @@ -1366,9 +1323,7 @@ void Request::put_element(Value& ncontex if(junction.auto_name){ // default setter if(param_count!=2) - throw Exception(PARSER_RUNTIME, - 0, - "default setter method must have TWO parameters (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "default setter method must have TWO parameters (has %d parameters)", param_count); Value* params[2] = { new VString(*junction.auto_name), value }; frame.store_params(params, 2); @@ -1378,9 +1333,7 @@ void Request::put_element(Value& ncontex } else { // setter if(param_count!=1) - throw Exception(PARSER_RUNTIME, - 0, - "setter method must have ONE parameter (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); frame.store_params(&value, 1); execute_method(frame); @@ -1388,7 +1341,7 @@ void Request::put_element(Value& ncontex } } -StringOrValue Request::process_getter(Junction& junction) { +Value& Request::process_getter(Junction& junction) { VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); size_t param_count=frame.method_params_count(); @@ -1398,9 +1351,7 @@ StringOrValue Request::process_getter(Ju if(param_count){ 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 then 1 parameter (has %d parameters)", param_count); param=new VString(*junction.auto_name); frame.store_params(¶m, 1); } // no need for else frame.empty_params() @@ -1410,9 +1361,7 @@ StringOrValue Request::process_getter(Ju } else { // getter if(param_count!=0) - throw Exception(PARSER_RUNTIME, - 0, - "getter method must have no parameters (has %d parameters)", param_count); + throw Exception(PARSER_RUNTIME, 0, "getter method must have no parameters (has %d parameters)", param_count); // no need for frame.empty_params() execute_method(frame); @@ -1433,23 +1382,21 @@ StringOrValue Request::process_getter(Ju using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(Value& input_value, bool intercept_string) { +Value& Request::process(Value& input_value, bool intercept_string) { Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - return process(process_getter(*junction).as_value(), intercept_string); + return process(process_getter(*junction), intercept_string); } if(junction->code) { // is it a code-junction? // process it - StringOrValue result; + ValueRef result; DEBUG_PRINT_STR("ja->\n") if(!junction->method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); SAVE_CONTEXT @@ -1508,9 +1455,7 @@ void Request::process_write(Value& input DEBUG_PRINT_STR("ja->\n") if(!junction->method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); SAVE_CONTEXT @@ -1566,15 +1511,13 @@ void Request::execute_method(VMethodFram // initialize contexts rcontext=wcontext=method_frame=&aframe; - // execute! + // execute! recoursion_checked_execute(*aframe.method.parser_code); RESTORE_CONTEXT } -const String* Request::execute_method(Value& aself, - const Method& method, Value* optional_param, - bool do_return_string) { +const String* Request::execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string) { VMethodFrame local_frame(method, method_frame/*caller*/, aself); @@ -1594,10 +1537,7 @@ const String* Request::execute_method(Va } Request::Execute_nonvirtual_method_result -Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - VString* optional_param, - bool do_return_string) { +Request::execute_nonvirtual_method(VStateless_class& aclass, const String& method_name, VString* optional_param, bool do_return_string) { Execute_nonvirtual_method_result result; result.method=aclass.get_method(method_name); if(result.method) @@ -1605,8 +1545,7 @@ Request::execute_nonvirtual_method(VStat return result; } -const String* Request::execute_virtual_method(Value& aself, - const String& method_name) { +const String* Request::execute_virtual_method(Value& aself, const String& method_name) { if(Value* value=aself.get_element(method_name)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method) @@ -1640,6 +1579,7 @@ const String* Request::get_method_filena case OP::OP_VALUE: case OP::OP_STRING__WRITE: case OP::OP_VALUE__GET_CLASS: + case OP::OP_VALUE__GET_BASE_CLASS: #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT case OP::OP_GET_OBJECT_ELEMENT: case OP::OP_GET_OBJECT_ELEMENT__WRITE: