--- parser3/src/main/execute.C 2008/06/16 12:44:57 1.321 +++ parser3/src/main/execute.C 2016/10/04 13:23:46 1.388 @@ -1,12 +1,10 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2008/06/16 12:44:57 $"; - #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -23,25 +21,76 @@ static const char * const IDENT_EXECUTE_ #include "pa_vimage.h" #include "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", - "GET_CLASS", + "VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT_OR_OPERATOR", +#else + "GET_ELEMENT_OR_OPERATOR", +#endif + "GET_ELEMENT", + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", + "VALUE__GET_ELEMENT__WRITE", + "WITH_ROOT__VALUE__GET_ELEMENT", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + "GET_OBJECT_ELEMENT", + "GET_OBJECT_ELEMENT__WRITE", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + "GET_OBJECT_VAR_ELEMENT", + "GET_OBJECT_VAR_ELEMENT__WRITE", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + "WITH_SELF__VALUE__GET_ELEMENT", + "WITH_SELF__VALUE__GET_ELEMENT__WRITE", +#endif + +#ifdef FEATURE_GET_ELEMENT4CALL + "GET_ELEMENT4CALL", +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + "GET_OBJECT_ELEMENT4CALL", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + "GET_OBJECT_VAR_ELEMENT4CALL", +#endif +#endif // FEATURE_GET_ELEMENT4CALL + "OBJECT_POOL", "STRING_POOL", - "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "PREPARE_TO_CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + "WITH_ROOT__VALUE__CONSTRUCT_EXPR", + "WITH_ROOT__VALUE__CONSTRUCT_VALUE", + "WITH_WRITE__VALUE__CONSTRUCT_EXPR", + "WITH_WRITE__VALUE__CONSTRUCT_VALUE", + "WITH_SELF__VALUE__CONSTRUCT_EXPR", + "WITH_SELF__VALUE__CONSTRUCT_VALUE", +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + "GET_ELEMENT__SPECIAL", + "GET_ELEMENT__SPECIAL__WRITE", +#endif // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary @@ -54,6 +103,18 @@ char *opcode_name[]={ "IS" }; +const char* debug_value_to_cstr(Value& value){ + const String* string=value.get_string(); + + if(string) + return string->cstr(); + else + if(value.is_bool()) + return value.as_bool() ? "" : ""; + else + return ""; +} + void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); @@ -61,45 +122,128 @@ void va_debug_printf(SAPI_Info& sapi_inf } void debug_printf(SAPI_Info& sapi_info, const char* fmt, ...) { - va_list args; - va_start(args, fmt); - va_debug_printf(sapi_info, fmt, args); - va_end(args); + va_list args; + va_start(args, fmt); + va_debug_printf(sapi_info, fmt, args); + va_end(args); } void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { Array_iterator i(ops); while(i.has_next()) { - OPCODE opcode=i.next().code; + OP::OPCODE opcode=i.next().code; + +#if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) + if( + 1==0 +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE +#ifdef FEATURE_GET_ELEMENT4CALL + || opcode==OP::OP_GET_OBJECT_ELEMENT4CALL +#endif +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE +#ifdef FEATURE_GET_ELEMENT4CALL + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT4CALL +#endif +#endif + ){ + i.next(); // skip origin + 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)); + continue; + } +#endif + if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE + ){ + i.next(); // skip origin + 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)); - if(opcode==OP_VALUE || opcode==OP_STRING__WRITE) { + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } + if( + 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 + || opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR + || opcode==OP::OP_WITH_ROOT__VALUE__GET_ELEMENT +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE +#endif + ) { Operation::Origin origin=i.next().origin; Value& value=*i.next().value; + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[opcode], - value.get_string()->cstr(), value.type()); + debug_value_to_cstr(value), value.type()); continue; } + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: - case OP_CURLY_CODE__CONSTRUCT: - case OP_NESTED_CODE: - case OP_OBJECT_POOL: - case OP_STRING_POOL: - case OP_CALL: - case OP_CALL__WRITE: + 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_CALL: + case OP::OP_CALL__WRITE: if(ArrayOperation* local_ops=i.next().ops) debug_dump(sapi_info, level+1, *local_ops); } } } +#define DEBUG_PRINT_STR(str) debug_printf(sapi_info, str); +#define DEBUG_PRINT_STRING(value) debug_printf(sapi_info, " \"%s\" ", value.cstr()); +#define DEBUG_PRINT_VALUE_AND_TYPE(value) debug_printf(sapi_info, " \"%s\" %s", debug_value_to_cstr(value), value.type()); +#define DEBUG_PRINT_OPS(local_ops) \ + debug_printf(sapi_info, \ + " (%d)\n", local_ops?local_ops->count():0); \ + if(local_ops) debug_dump(sapi_info, 1, *local_ops); + +#else +#define DEBUG_PRINT_STR(str) +#define DEBUG_PRINT_STRING(value) +#define DEBUG_PRINT_VALUE_AND_TYPE(value) +#define DEBUG_PRINT_OPS(local_ops) #endif + // Request void Request::execute(ArrayOperation& ops) { @@ -113,15 +257,7 @@ void Request::execute(ArrayOperation& op debug_printf(sapi_info, "execution-------------------------\n"); #endif for(Array_iterator i(ops); i.has_next(); ) { - if(get_skip()) - return; - if(get_interrupted()) { - set_interrupted(false); - throw Exception("parser.interrupted", - 0, - "execution stopped"); - } - OPCODE opcode=i.next().code; + OP::OPCODE opcode=i.next().code; #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); @@ -129,204 +265,457 @@ void Request::execute(ArrayOperation& op switch(opcode) { // param in next instruction - case OP_VALUE: + case OP::OP_VALUE: { debug_origin=i.next().origin; Value& value=*i.next().value; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); -#endif + + DEBUG_PRINT_VALUE_AND_TYPE(value) + stack.push(value); break; } - case OP_GET_CLASS: + 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; - const String& name=stack.pop().string(); - Value* value=classes().get(name); - if(!value) - throw Exception(PARSER_RUNTIME, - &name, - "class is undefined"); + DEBUG_PRINT_STRING(name) - stack.push(*value); + 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) + + VStateless_class* vclass=get_class(name); + if(!vclass) + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); + + stack.push(*new VBaseClassWrapper(*vclass, get_self())); + break; + } + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + case OP::OP_GET_ELEMENT__SPECIAL: + case OP::OP_GET_ELEMENT__SPECIAL__WRITE: + { + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + + Value* value=0; + if(VStateless_class* vclass=ncontext.get_class()){ + if(SYMBOLS_EQ(name,CLASS_SYMBOL)){ + value=vclass; + } else if(SYMBOLS_EQ(name,CLASS_NAME_SYMBOL)){ + value=new VString(*new String(vclass->type())); + } + } else { + // VJunction is without class, returning self + if(SYMBOLS_EQ(name,CLASS_SYMBOL)){ + value=&ncontext; + } 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 { + write_assign_lang(*value); + } + break; + } +#endif + // OP_WITH - case OP_WITH_ROOT: + case OP::OP_WITH_ROOT: { stack.push(*method_frame); break; } - case OP_WITH_SELF: + case OP::OP_WITH_SELF: { stack.push(get_self()); break; } - case OP_WITH_READ: + case OP::OP_WITH_READ: { stack.push(*rcontext); break; } - case OP_WITH_WRITE: + 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; } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT_VALUE: + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT +#define DO_CONSTRUCT(context, vvalue) { \ + debug_origin=i.next().origin; \ + const String& name=*i.next().value->get_string(); debug_name=&name; \ + DEBUG_PRINT_STRING(name) \ + Value& value=stack.pop().value(); \ + put_element( context, name, vvalue ); \ + break; \ + } +#define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) +#define DO_CONSTRUCT_EXPR(context) { \ + wcontext->set_in_expression(false); \ + DO_CONSTRUCT(context, &value.as_expr_result()) \ + } + + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) + } + + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_VALUE(*wcontext) + } + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) + +#endif // OPTIMIZE_BYTECODE_CONSTRUCT + + case OP::OP_CONSTRUCT_VALUE: + { +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=stack.pop().value(); +#else Value& value=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - put_element(ncontext, name, value); +#endif + put_element(ncontext, name, &value); break; } - case OP_CONSTRUCT_EXPR: + + case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& expr=stack.pop().value(); +#else Value& expr=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); +#endif Value& value=expr.as_expr_result(); - put_element(ncontext, name, value); + put_element(ncontext, name, &value); break; } - case OP_CURLY_CODE__CONSTRUCT: + + case OP::OP_CURLY_CODE__CONSTRUCT: { ArrayOperation& local_ops=*i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif - Value& value=*new VJunction( + + DEBUG_PRINT_OPS((&local_ops)) + + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, &local_ops); + wcontext->attach_junction(&value); + const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + 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; } - case OP_NESTED_CODE: + case OP::OP_NESTED_CODE: { ArrayOperation& local_ops=*i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif + + DEBUG_PRINT_OPS((&local_ops)) + stack.push(local_ops); break; } - case OP_WRITE_VALUE: + case OP::OP_WRITE_VALUE: { Value& value=stack.pop().value(); write_assign_lang(value); break; } - case OP_WRITE_EXPR_RESULT: + case OP::OP_WRITE_EXPR_RESULT: { - Value& value=stack.pop().value(); - write_no_lang(value.as_expr_result()); - - // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); + + Value& value=stack.pop().value(); + wcontext->write(value.as_expr_result()); break; } - case OP_STRING__WRITE: + case OP::OP_STRING__WRITE: { i.next(); // ignore origin Value* value=i.next().value; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr()); -#endif - write_no_lang(*value->get_string()); + + const String& string_value=*value->get_string(); + + DEBUG_PRINT_STRING(string_value) + + write_no_lang(string_value); break; } - - case OP_GET_ELEMENT_OR_OPERATOR: + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + 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); + break; + } + Value& value=get_element(*rcontext, name); + stack.push(value); + break; + } +#else + case OP::OP_GET_ELEMENT_OR_OPERATOR: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, true); + 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); + break; + } + Value& value=get_element(ncontext, name); stack.push(value); break; } - case OP_GET_ELEMENT: +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + +#define DO_GET_OBJECT_ELEMENT(code) {\ + debug_origin=i.next().origin; \ + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; \ + DEBUG_PRINT_STRING(context_name) \ + Value& object=get_element(*rcontext, context_name); \ + debug_origin=i.next().origin; \ + const String& field_name=*i.next().value->get_string(); debug_name=&field_name; \ + DEBUG_PRINT_STRING(field_name) \ + code; \ + break; \ + } + + case OP::OP_GET_OBJECT_ELEMENT: DO_GET_OBJECT_ELEMENT({ + Value& value=get_element(object, field_name); + stack.push(value); + }) + case OP::OP_GET_OBJECT_ELEMENT__WRITE: DO_GET_OBJECT_ELEMENT({ + Value& value=get_element(object, field_name); + write_assign_lang(value); + }) +#ifdef FEATURE_GET_ELEMENT4CALL + case OP::OP_GET_OBJECT_ELEMENT4CALL: DO_GET_OBJECT_ELEMENT({ + Value& value=get_element4call(object, field_name); + stack.push(value); + }) +#endif +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + +#define DO_GET_OBJECT_VAR_ELEMENT(code) {\ + debug_origin=i.next().origin; \ + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; \ + DEBUG_PRINT_STRING(context_name) \ + Value& object=get_element(*rcontext, context_name); \ + debug_origin=i.next().origin; \ + const String& var_name=*i.next().value->get_string(); debug_name=&var_name; \ + DEBUG_PRINT_STRING(var_name) \ + const String* field=&get_element(*rcontext, var_name).as_string(); \ + code; \ + break; \ + } + + case OP::OP_GET_OBJECT_VAR_ELEMENT: DO_GET_OBJECT_VAR_ELEMENT({ + Value& value=get_element(object, *field); + stack.push(value); + }) + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: DO_GET_OBJECT_VAR_ELEMENT({ + Value& value=get_element(object, *field); + write_assign_lang(value); + }) +#ifdef FEATURE_GET_ELEMENT4CALL + case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL: DO_GET_OBJECT_VAR_ELEMENT({ + Value& value=get_element4call(object, *field); + stack.push(value); + }) +#endif +#endif + + case OP::OP_GET_ELEMENT: + { + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); + stack.push(value); + break; + } + +#ifdef FEATURE_GET_ELEMENT4CALL + case OP::OP_GET_ELEMENT4CALL: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, false); + Value& value=get_element4call(ncontext, name); stack.push(value); break; } +#endif - case OP_GET_ELEMENT__WRITE: + case OP::OP_GET_ELEMENT__WRITE: { const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name, false); + Value& value=get_element(ncontext, name); write_assign_lang(value); break; } +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); + stack.push(value); + break; + } + + case OP::OP_VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); + write_assign_lang(value); + break; + } + + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*method_frame, name); + stack.push(value); + break; + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(get_self(), name); + + if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#endif - case OP_OBJECT_POOL: + case OP::OP_OBJECT_POOL: { ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; - WWrapper local(0/*empty*/, wcontext); +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(wcontext); +#else + WWrapper local(wcontext); +#endif wcontext=&local; execute(local_ops); - stack.push(wcontext->result().as_value()); + stack.push(wcontext->result()); flang=saved_lang; wcontext=saved_wcontext; break; } - case OP_STRING_POOL: + case OP::OP_STRING_POOL: { ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(0 /*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; execute(local_ops); - Value* value; // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - if(const String* string=wcontext->get_string()) - value=new VString(*string); - else - value=new VVoid; + const String* string=wcontext->get_string(); + Value* value=string ? new VString(*string) : new VString(); stack.push(*value); wcontext=saved_wcontext; @@ -334,24 +723,14 @@ void Request::execute(ArrayOperation& op } // CALL - case OP_STORE_PARAM: - { - Value& value=stack.pop().value(); - VMethodFrame& frame=stack.top_value().method_frame(); - // this op is executed from CALL local_ops only, so may skip the check "method_frame_to_fill==0" - frame.store_param(value); - break; - } - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: { // code ArrayOperation& local_ops=*i.next().ops; - VMethodFrame& frame=stack.top_value().method_frame(); -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif + + DEBUG_PRINT_OPS((&local_ops)) + // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame @@ -359,163 +738,254 @@ void Request::execute(ArrayOperation& op // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Value& value=*new VJunction( + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, - opcode==OP_EXPR_CODE__STORE_PARAM?0:wcontext, + opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); +#ifndef USE_DESTRUCTORS + if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) + wcontext->attach_junction(&value); +#endif // store param - // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 - frame.store_param(value); + stack.push(value); break; } - case OP_PREPARE_TO_CONSTRUCT_OBJECT: + case OP::OP_PREPARE_TO_EXPRESSION: { - wcontext->set_constructing(true); + wcontext->set_in_expression(true); break; } - case OP_PREPARE_TO_EXPRESSION: +#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: { - wcontext->set_in_expression(true); + ArrayOperation* local_ops=i.next().ops; + + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Value& value=stack.pop().value(); + + Junction* junction=value.get_junction(); + if(!junction) { + if(value.is("void")) + 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()); + } + + Value *result; + { + VMethodFrame frame(*junction->method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); + result=&frame.result(); + // VMethodFrame desctructor deletes junctions in stack params here + } + stack.push(*result); + + DEBUG_PRINT_STR("<-returned") + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", 0, "execution stopped"); + } break; } - case OP_CALL: - case OP_CALL__WRITE: + case OP::OP_CALL__WRITE: { - //is_debug_junction=true; ArrayOperation* local_ops=i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0); - if(local_ops) - debug_dump(sapi_info, 1, *local_ops); - debug_printf(sapi_info, "->\n"); -#endif + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + Value& value=stack.pop().value(); 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()); } - /* no check needed, code compiled the way that that's impossible - // check: - // that this is method-junction, not a code-junction - // [disabling these contstructions:] - // $junction{code} - // ^junction[] - if(!junction->method) - throw Exception(PARSER_RUNTIME, - "is '%s', it is code junction, can not call it", - value.type()); - */ - - VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - stack.push(frame); // argument for *STORE_PARAM ops - execute(*local_ops); - stack.pop().value(); + +#ifdef OPTIMIZE_CALL + const Method& method=*junction->method; + if(method.call_optimization==Method::CO_WITHOUT_FRAME){ + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + MethodParams method_params; + method_params.store_params((Value**)stack.ptr(first), stack.top_index()-first); + method.check_actual_numbered_params(junction->self, &method_params); + method.native_code(*this, method_params); // execute it + + stack.set_top_index(first); + } else { + MethodParams method_params; + method.check_actual_numbered_params(junction->self, &method_params); + method.native_code(*this, method_params); // execute it + } + } else if(method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + VMethodFrame frame(method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call_write(frame)); + } else +#endif // OPTIMIZE_CALL + { + VMethodFrame frame(method, method_frame, junction->self); + METHOD_FRAME_ACTION(op_call(frame)); + write_pass_lang(frame.result()); } - WContext* result_wcontext=op_call(frame); - if(opcode==OP_CALL__WRITE) { - write_assign_lang(result_wcontext->result()); - } else { // OP_CALL - stack.push(result_wcontext->result().as_value()); + + DEBUG_PRINT_STR("<-returned") + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", 0, "execution stopped"); } + break; + } -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-returned"); -#endif - //is_debug_junction=false; + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); debug_name=&class_name; + + DEBUG_PRINT_STRING(class_name) + + 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; + const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; + + DEBUG_PRINT_STRING(constructor_name) + + 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()); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Value *result; + { + 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(); + // VMethodFrame desctructor deletes junctions in stack params here + } + + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(*result); + else + write_pass_lang(*result); + + DEBUG_PRINT_STR("<-returned") break; } // expression ops: unary - case OP_NEG: + case OP::OP_NEG: { Value& a=stack.pop().value(); Value& value=*new VDouble(-a.as_double()); stack.push(value); break; } - case OP_INV: + case OP::OP_INV: { Value& a=stack.pop().value(); Value& value=*new VDouble(~a.as_int()); stack.push(value); break; } - case OP_NOT: + case OP::OP_NOT: { Value& a=stack.pop().value(); - Value& value=*new VBool(!a.as_bool()); + Value& value=VBool::get(!a.as_bool()); stack.push(value); break; } - case OP_DEF: + case OP::OP_DEF: { Value& a=stack.pop().value(); - Value& value=*new VBool(a.is_defined()); + Value& value=VBool::get(a.is_defined()); stack.push(value); break; } - case OP_IN: + case OP::OP_IN: { Value& a=stack.pop().value(); const String& path=a.as_string(); - Value& value=*new VBool(request_info.uri && *request_info.uri && path.this_starts(request_info.uri)); + Value& value=VBool::get(request_info.uri && *request_info.uri && path.this_starts(request_info.uri)); stack.push(value); break; } - case OP_FEXISTS: + case OP::OP_FEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(file_exist(absolute(a.as_string()))); + Value& value=VBool::get(file_exist(absolute(a.as_string()))); stack.push(value); break; } - case OP_DEXISTS: + case OP::OP_DEXISTS: { Value& a=stack.pop().value(); - Value& value=*new VBool(dir_exists(absolute(a.as_string()))); + Value& value=VBool::get(dir_exists(absolute(a.as_string()))); stack.push(value); break; } // expression ops: binary - case 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()); stack.push(value); break; } - case 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()); stack.push(value); break; } - case 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()); stack.push(value); break; } - case OP_DIV: + case OP::OP_DIV: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -524,16 +994,14 @@ 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); stack.push(value); break; } - case OP_MOD: + case OP::OP_MOD: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -542,16 +1010,14 @@ 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)); stack.push(value); break; } - case OP_INTDIV: + case OP::OP_INTDIV: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); @@ -560,16 +1026,14 @@ 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); stack.push(value); break; } - case OP_BIN_SL: + case OP::OP_BIN_SL: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -578,7 +1042,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_SR: + case OP::OP_BIN_SR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -587,7 +1051,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_AND: + case OP::OP_BIN_AND: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -596,7 +1060,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_OR: + case OP::OP_BIN_OR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -605,7 +1069,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_BIN_XOR: + case OP::OP_BIN_XOR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); Value& value=*new VInt( @@ -614,7 +1078,7 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } - case OP_LOG_AND: + case OP::OP_LOG_AND: { ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; @@ -624,11 +1088,11 @@ void Request::execute(ArrayOperation& op result=b.as_bool(); } else result=false; - Value& value=*new VBool(result); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_OR: + case OP::OP_LOG_OR: { ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; @@ -639,119 +1103,117 @@ void Request::execute(ArrayOperation& op Value& b=stack.pop().value(); result=b.as_bool(); } - Value& value=*new VBool(result); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_XOR: + case OP::OP_LOG_XOR: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_bool() ^ b.as_bool()); + Value& value=VBool::get(a.as_bool() ^ b.as_bool()); stack.push(value); break; } - case 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(); - Value& value=*new VBool(a_doubleb_double); + Value& value=VBool::get(a_double>b_double); stack.push(value); break; } - case 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(); - Value& value=*new VBool(a_double<=b_double); + Value& value=VBool::get(a_double<=b_double); stack.push(value); break; } - case 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(); - Value& value=*new VBool(a_double>=b_double); + Value& value=VBool::get(a_double>=b_double); stack.push(value); break; } - case 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(); - Value& value=*new VBool(a_double==b_double); + Value& value=VBool::get(a_double==b_double); stack.push(value); break; } - case 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(); - Value& value=*new VBool(a_double!=b_double); + Value& value=VBool::get(a_double!=b_double); stack.push(value); break; } - case OP_STR_LT: + case OP::OP_STR_LT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() < b.as_string()); + Value& value=VBool::get(a.as_string() < b.as_string()); stack.push(value); break; } - case OP_STR_GT: + case OP::OP_STR_GT: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() > b.as_string()); + Value& value=VBool::get(a.as_string() > b.as_string()); stack.push(value); break; } - case OP_STR_LE: + case OP::OP_STR_LE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() <= b.as_string()); + Value& value=VBool::get(a.as_string() <= b.as_string()); stack.push(value); break; } - case OP_STR_GE: + case OP::OP_STR_GE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() >= b.as_string()); + Value& value=VBool::get(a.as_string() >= b.as_string()); stack.push(value); break; } - case OP_STR_EQ: + case OP::OP_STR_EQ: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() == b.as_string()); + Value& value=VBool::get(a.as_string() == b.as_string()); stack.push(value); break; } - case OP_STR_NE: + case OP::OP_STR_NE: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.as_string() != b.as_string()); + Value& value=VBool::get(a.as_string() != b.as_string()); stack.push(value); break; } - case OP_IS: + case OP::OP_IS: { Value& b=stack.pop().value(); Value& a=stack.pop().value(); - Value& value=*new VBool(a.is(b.as_string().cstr())); + Value& value=VBool::get(a.is(b.as_string().cstr())); stack.push(value); break; } default: - throw Exception(0, - 0, - "invalid opcode %d", opcode); + throw Exception(0, 0, "invalid opcode %d", opcode); } } } catch(const Exception&) { @@ -762,159 +1224,152 @@ void Request::execute(ArrayOperation& op } } -WContext* Request::op_call(VMethodFrame& frame){ - frame.fill_unspecified_params(); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; +#define SAVE_CONTEXT \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ WContext *saved_wcontext=wcontext; - - VStateless_class& called_class=*frame.junction.self.get_class(); - Value* new_self; - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - new_self=&get_self(); - if(frame.junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - HashStringValue& new_object_fields=*new HashStringValue(); - if(Value* value=called_class.create_new_value(fpool, new_object_fields)) { + +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ + method_frame=saved_method_frame; + + +Value& Request::construct(VStateless_class &called_class, const Method &method){ + + if(method.call_type!=Method::CT_STATIC) { + // this is a constructor call + if(Value* result=called_class.create_new_value(fpool)) { // some stateless_class creatable derivates - new_self=value; - } else - throw Exception(PARSER_RUNTIME, - 0, //&frame.name(), - "is not a constructor, system class '%s' can be constructed only implicitly", - called_class.name().cstr()); - - frame.write(*new_self, - String::L_CLEAN // not used, always an object, not string - ); - } else + return *result; + } else throw Exception(PARSER_RUNTIME, 0, //&frame.name(), - "method is static and can not be used as constructor"); + "is not a constructor, system class '%s' can be constructed only implicitly", + called_class.type()); } else - new_self=&frame.junction.self; - - frame.set_self(*new_self); + throw Exception(PARSER_RUNTIME, 0, "method is static and can not be used as constructor"); +} +void Request::op_call(VMethodFrame& frame){ // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); - rcontext=wcontext=&frame; - { - const Method& method=*frame.junction.method; - Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; - if( - method.call_type==Method::CT_ANY || - method.call_type==call_type) { // allowed call type? - method_frame=&frame; - if(method.native_code) { // native code? - method.check_actual_numbered_params( - frame.junction.self, - /*frame.name(), */frame.numbered_params()); - method.native_code( - *this, - *frame.numbered_params()); // execute it - } else // parser code, execute it - recoursion_checked_execute(*method.parser_code); - } else - throw Exception(PARSER_RUNTIME, - 0, //&frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); - } + SAVE_CONTEXT - WContext *result_wcontext=wcontext; - // StringOrValue result=wcontext->result(); + rcontext=wcontext=method_frame=&frame; - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + Value& self=frame.self(); + const Method& method=frame.method; + Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; + + if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? + if(method.native_code) { // native code? + method.check_actual_numbered_params(self, frame.numbered_params()); + method.native_code(*this, *frame.numbered_params()); // execute it + } 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"); - return result_wcontext; + RESTORE_CONTEXT } +void Request::op_call_write(VMethodFrame& frame){ + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; -/** - @todo cache|prepare junctions - @bug ^superbase:method would dynamically call ^base:method if there is any -*/ -Value& Request::get_element(Value& ncontext, const String& name, bool can_call_operator) { - Value* value=0; - if(can_call_operator) { - if(Method* method=main_class.get_method(name)) // looking operator of that name FIRST - value=new VJunction(main_class, method); - } - if(!value) { - if(!wcontext->get_constructing() // not constructing - && 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 - if(Value* base=get_self().base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls - value=base->get_element(name, *base, true); // virtual-up lookup starting from parent - goto value_ready; - } - } - if(!value) - value=ncontext.get_element(name, ncontext, true); + rcontext=&frame; + method_frame=&frame; - if(value && wcontext->get_constructing()) - if(Junction* junction=value->get_junction()) { - if(junction->self.get_class()!=&ncontext) - throw Exception(PARSER_RUNTIME, - &name, - "constructor must be declared in class '%s'", - ncontext.get_class()->name_cstr()); - } + Value& self=frame.self(); + const Method& method=frame.method; + Method::Call_type call_type=self.get_class()==&self ? Method::CT_STATIC : Method::CT_DYNAMIC; + + if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? + if(method.native_code) { // native code? + method.check_actual_numbered_params(self, frame.numbered_params()); + method.native_code(*this, *frame.numbered_params()); // execute it + } 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"); + + rcontext=saved_rcontext; + method_frame=saved_method_frame; +} -value_ready: - if(value) - value=&process_to_value(*value); // process possible code-junction - else - value=new VVoid; +Value& Request::get_element(Value& ncontext, const String& name) { + Value* value=ncontext.get_element(name); + return *(value ? &process(*value) : VVoid::get()); +} - return *value; +#ifdef FEATURE_GET_ELEMENT4CALL +Value& Request::get_element4call(Value& ncontext, const String& name) { + Value* value=ncontext.get_element4call(name); + return *(value ? &process(*value) : VVoid::get()); } +#endif -void Request::put_element(Value& ncontext, const String& name, Value& value) { +void Request::put_element(Value& ncontext, const String& name, Value* value) { // put_element can return property-setting-junction - if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(const VJunction* vjunction=ncontext.put_element(name, value)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { - const Junction& junction=vjunction->junction(); - // process it - ArrayString* params_names=junction.method->params_names; - int param_count=params_names? params_names->count(): 0; - if(param_count!=1) - throw Exception(PARSER_RUNTIME, - 0, - "setter method must have ONE parameter (has %d parameters)", param_count); - - VMethodFrame frame(junction, method_frame/*caller*/); - frame.store_param(value); - - frame.set_self(frame.junction.self); - - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - rcontext=wcontext=&frame; - method_frame=&frame; - - // prevent non-string writes for better error reporting [setters are not expected to return anything] - wcontext->write(*method_frame); - - recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - // we don't need it StringOrValue result=wcontext->result(); - - method_frame=saved_method_frame; - wcontext=saved_wcontext; - rcontext=saved_rcontext; + const Junction& junction = vjunction->junction(); + VConstructorFrame frame(*junction.method, method_frame /*caller*/, junction.self); + + size_t param_count=frame.method_params_count(); + + 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); + + Value* params[2] = { new VString(*junction.auto_name), value }; + frame.store_params(params, 2); + + Temp_disable_default_setter temp(junction.self); + execute_method(frame); + } else { + // setter + if(param_count!=1) + throw Exception(PARSER_RUNTIME, 0, "setter method must have ONE parameter (has %d parameters)", param_count); + + frame.store_params(&value, 1); + execute_method(frame); + } } } +Value& Request::process_getter(Junction& junction) { + VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); + size_t param_count=frame.method_params_count(); + + if(junction.auto_name){ + // default getter + Value *param; + + 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); + param=new VString(*junction.auto_name); + frame.store_params(¶m, 1); + } // no need for else frame.empty_params() + + Temp_disable_default_getter temp(junction.self); + execute_method(frame); + } else { + // getter + if(param_count!=0) + 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); + } + + return frame.result(); +} + /** @param intercept_string - true: they want result=string value, @@ -924,62 +1379,26 @@ void Request::put_element(Value& ncontex nothing goes to wcontext. used in @c (expression) params evaluation - using the fact it's either string_ or value_ result requested to speed up checkes + 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? - int param_count=junction->method->params_names?junction->method->params_names->count():0; - 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); - } else if(param_count) - throw Exception(PARSER_RUNTIME, - 0, - "getter method must have no parameters (has %d parameters)", param_count); - - VMethodFrame frame(*junction, method_frame/*caller*/); - - if(junction->auto_name && param_count) - frame.store_param(*new VString(*junction->auto_name)); - - frame.set_self(frame.junction.self); - - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - rcontext=wcontext=&frame; - method_frame=&frame; - - recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it - StringOrValue result=wcontext->result(); - - method_frame=saved_method_frame; - wcontext=saved_wcontext; - rcontext=saved_rcontext; - - return result; + return process(process_getter(*junction), intercept_string); } if(junction->code) { // is it a code-junction? // process it - StringOrValue result; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); -#endif + ValueRef result; + + DEBUG_PRINT_STR("ja->\n") if(!junction->method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); - - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); + + SAVE_CONTEXT method_frame=junction->method_frame; rcontext=junction->rcontext; @@ -1001,7 +1420,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1010,13 +1429,10 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT + + DEBUG_PRINT_STR("<-ja returned") -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); -#endif return result; } @@ -1027,69 +1443,101 @@ StringOrValue Request::process(Value& in return input_value; } -StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; +void Request::process_write(Value& input_value) { + Junction* junction=input_value.get_junction(); + if(junction) { + // no getter-junction check as process_write is called + // to process method arguments, not from get_element + + if(junction->code) { // is it a code-junction? + // process it + + DEBUG_PRINT_STR("ja->\n") + + if(!junction->method_frame) + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); + + SAVE_CONTEXT + + method_frame=junction->method_frame; + rcontext=junction->rcontext; + + // for expression method params + // wcontext is set 0 + // using the fact in decision "which wwrapper to use" +#ifdef OPTIMIZE_CALL + if(wcontext==junction->wcontext){ + // no wrappers for wcontext + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + + } else +#endif + if(junction->wcontext) { + // almost plain wwrapper about junction wcontext + VCodeFrame local(*junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + write_pass_lang(local.result()); + } else { + // plain wwrapper + WWrapper local(wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + write_pass_lang(local.result()); + } + + DEBUG_PRINT_STR("<-ja returned") + + return; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects + } + + write_pass_lang(input_value); +} + +void Request::execute_method(VMethodFrame& aframe) { + SAVE_CONTEXT // initialize contexts - rcontext=wcontext=method_frame=&amethod_frame; - - // execute! - execute(*method.parser_code); - - // result - StringOrValue result=wcontext->result(); + rcontext=wcontext=method_frame=&aframe; - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + // execute! + recoursion_checked_execute(*aframe.method.parser_code); - // return - return result; + RESTORE_CONTEXT } -const String* Request::execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string) { +const String* Request::execute_method(Value& aself, const Method& method, Value* optional_param, bool do_return_string) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - Junction local_junction(aself, &method); - VMethodFrame local_frame(local_junction, method_frame/*caller*/); - if(optional_param && local_frame.can_store_param()) { - local_frame.store_param(*optional_param); - local_frame.fill_unspecified_params(); + VMethodFrame local_frame(method, method_frame/*caller*/, aself); + + if(optional_param && local_frame.method_params_count()>0) { + local_frame.store_params(&optional_param, 1); + } else { + local_frame.empty_params(); } - local_frame.set_self(aself); - rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting if(do_return_string) - wcontext->write(local_frame); + local_frame.write(local_frame); - // execute! - execute(*method.parser_code); - - // result - const String* result=0; - if(do_return_string) - result=&wcontext->result().as_string(); + execute_method(local_frame); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - - return result; + return do_return_string ? local_frame.get_string() : 0; } 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) @@ -1097,12 +1545,88 @@ Request::execute_nonvirtual_method(VStat return result; } -const String* Request::execute_virtual_method(Value& aself, - const String& method_name) { - if(Value* value=aself.get_element(method_name, aself, false)) +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) return execute_method(aself, *method, 0/*no params*/, true); return 0; } + +const String* Request::get_method_filename(const Method* method){ + if(ArrayOperation* code=method->parser_code) + if(code){ + Operation::Origin origin={0, 0, 0}; + Array_iterator i(*code); + while( i.has_next() ){ + switch( i.next().code ){ + 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_CALL: + case OP::OP_CALL__WRITE: + { + i.next(); // skip local ops + i.next(); // skip next opcode + // continue execution + } + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + 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: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: + case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: +#endif + +#ifdef FEATURE_GET_ELEMENT4CALL + case OP::OP_GET_ELEMENT4CALL: +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT4CALL: +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT4CALL: +#endif +#endif // FEATURE_GET_ELEMENT4CALL + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: +#endif + { + origin=i.next().origin; + break; + } + default: break; + } + if(origin.file_no) + return get_used_filename(origin.file_no); + } + } + return 0; +} +