--- parser3/src/main/execute.C 2009/04/15 04:50:28 1.324 +++ parser3/src/main/execute.C 2009/06/14 00:34:04 1.349 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/04/15 04:50:28 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/14 00:34:04 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -33,15 +33,55 @@ char *opcode_name[]={ // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + "VALUE__GET_CLASS", +#else "GET_CLASS", +#endif "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 "OBJECT_POOL", "STRING_POOL", - "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "PREPARE_TO_CONSTRUCT_OBJECT", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", +#endif + "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 + // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary @@ -54,6 +94,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,10 +113,10 @@ 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) { @@ -72,16 +124,86 @@ void debug_dump(SAPI_Info& sapi_info, in while(i.has_next()) { OP::OPCODE opcode=i.next().code; - if(opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE) { +#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 +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE +#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 +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + 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(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } +#endif + if( + opcode==OP::OP_VALUE + || opcode==OP::OP_STRING__WRITE +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + || opcode==OP::OP_VALUE__GET_CLASS +#endif +#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) { @@ -89,7 +211,7 @@ void debug_dump(SAPI_Info& sapi_info, in 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_OBJECT_POOL: case OP::OP_STRING_POOL: case OP::OP_CALL: case OP::OP_CALL__WRITE: @@ -98,8 +220,22 @@ void debug_dump(SAPI_Info& sapi_info, in } } } +#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,14 +249,6 @@ 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"); - } OP::OPCODE opcode=i.next().code; #ifdef DEBUG_EXECUTE @@ -133,12 +261,35 @@ void Request::execute(ArrayOperation& op { 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; } + +#ifdef OPTIMIZE_BYTECODE_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; + Value& value=*i.next().value; + const String& name=*value.get_string(); + + DEBUG_PRINT_STRING(name) + + Value* class_value=classes().get(name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &name, + "class is undefined"); + + stack.push(*class_value); + break; + } +#else case OP::OP_GET_CLASS: { // maybe they do ^class:method[] call, remember the fact @@ -154,24 +305,24 @@ void Request::execute(ArrayOperation& op stack.push(*value); break; } - +#endif // OP_WITH case OP::OP_WITH_ROOT: { stack.push(*method_frame); break; } - case OP::OP_WITH_SELF: + case OP::OP_WITH_SELF: { stack.push(get_self()); break; } - case OP::OP_WITH_READ: + case OP::OP_WITH_READ: { stack.push(*rcontext); break; } - case OP::OP_WITH_WRITE: + case OP::OP_WITH_WRITE: { if(wcontext==method_frame) throw Exception(PARSER_RUNTIME, @@ -183,41 +334,96 @@ void Request::execute(ArrayOperation& op } // OTHER ACTIONS BUT WITHs + +#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::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::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)) @@ -231,10 +437,9 @@ void Request::execute(ArrayOperation& op 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; } @@ -258,26 +463,109 @@ void Request::execute(ArrayOperation& op { 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; } - + +#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; } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: + { + 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) + + Value& value=get_element(object, field_name); + + if(opcode==OP::OP_GET_OBJECT_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: + { + 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).get_string(); + + Value& value=get_element(object, *field); + + if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#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, false); + Value& value=get_element(ncontext, name); stack.push(value); break; } @@ -286,11 +574,68 @@ void Request::execute(ArrayOperation& op { 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::OP_OBJECT_POOL: { @@ -299,7 +644,11 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(0/*empty*/, wcontext); +#else WWrapper local(0/*empty*/, wcontext); +#endif wcontext=&local; execute(local_ops); @@ -334,24 +683,14 @@ void Request::execute(ArrayOperation& op } // CALL - case OP::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::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,23 +698,28 @@ 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::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; } +#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: { wcontext->set_constructing(true); break; } +#endif case OP::OP_PREPARE_TO_EXPRESSION: { @@ -384,17 +728,12 @@ void Request::execute(ArrayOperation& op } case OP::OP_CALL: - 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(); @@ -409,38 +748,203 @@ void Request::execute(ArrayOperation& op "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 + size_t first = stack.top_index(); execute(*local_ops); - stack.pop().value(); + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); } - WContext* result_wcontext=op_call(frame); - if(opcode==OP::OP_CALL__WRITE) { - write_assign_lang(result_wcontext->result()); - } else { // OP_CALL - stack.push(result_wcontext->result().as_value()); + + stack.push(frame.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_CALL__WRITE: + { + 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()); + } + +#ifdef OPTIMIZE_CALL + const Method& method=*junction->method; + if (!wcontext->get_constructing() && 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 (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call_write(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call_write(frame); + } + } else +#endif // OPTIMIZE_CALL + { + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); + } + write_pass_lang(frame.result()); + } + + DEBUG_PRINT_STR("<-returned") + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } break; } +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + // maybe they do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=classes().get(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); + + wcontext->set_constructing(true); + + 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) + + Value& constructor_value=get_element(*class_value, constructor_name); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Junction* junction=constructor_value.get_junction(); + if(!junction) { + if(constructor_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", + constructor_value.type()); + } else { + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); + } + + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); + } + + DEBUG_PRINT_STR("<-returned") + + +/* + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } +*/ + break; + } +#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + // expression ops: unary case OP::OP_NEG: { @@ -459,14 +963,14 @@ void Request::execute(ArrayOperation& op 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::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; } @@ -474,21 +978,21 @@ void Request::execute(ArrayOperation& op { 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::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::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; } @@ -624,7 +1128,7 @@ 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; } @@ -639,14 +1143,14 @@ 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::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; } @@ -654,7 +1158,7 @@ void Request::execute(ArrayOperation& op { 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; } @@ -670,7 +1174,7 @@ void Request::execute(ArrayOperation& op { 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; } @@ -678,7 +1182,7 @@ void Request::execute(ArrayOperation& op { 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; } @@ -686,7 +1190,7 @@ void Request::execute(ArrayOperation& op { 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; } @@ -694,56 +1198,56 @@ void Request::execute(ArrayOperation& op { 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::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::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::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::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::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::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::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; } @@ -762,23 +1266,27 @@ 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(); + +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ + method_frame=saved_method_frame; + +void Request::op_call(VMethodFrame& frame){ + const Junction &junction=frame.junction; + VStateless_class& called_class=*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) { + if(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)) { + if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { // some stateless_class creatable derivates - new_self=value; } else throw Exception(PARSER_RUNTIME, 0, //&frame.name(), @@ -792,113 +1300,113 @@ WContext* Request::op_call(VMethodFrame& throw Exception(PARSER_RUNTIME, 0, //&frame.name(), "method is static and can not be used as constructor"); - } else - new_self=&frame.junction.self; + } else + new_self=&junction.self; frame.set_self(*new_self); // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); + SAVE_CONTEXT + 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"); - } + method_frame=&frame; - WContext *result_wcontext=wcontext; - // StringOrValue result=wcontext->result(); + const Method& method=*junction.method; + Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + 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(junction.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 + //return &frame; } +void Request::op_call_write(VMethodFrame& frame){ + const Junction &junction=frame.junction; + + frame.set_self(junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + + rcontext=&frame; + method_frame=&frame; + + const Method& method=*junction.method; + Method::Call_type call_type=junction.self.get_class()==&junction.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(junction.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; +} /** - @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 +Value& Request::get_element(Value& ncontext, const String& name) { + 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; + Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls + Value *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent + return *(value ? &process_to_value(*value) : VVoid::get()); } - } - if(!value) - value=ncontext.get_element(name, ncontext, true); + + Value* value=ncontext.get_element(name, ncontext, true); if(value && wcontext->get_constructing()) - if(Junction* junction=value->get_junction()) { + 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_ready: - if(value) - value=&process_to_value(*value); // process possible code-junction - else - value=VVoid::get(); - return *value; + return *(value ? &process_to_value(*value) : VVoid::get()); } -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(ncontext, name, value, false)) 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; + VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); + int param_count=frame.method_params_count(); + 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.store_params(&value, 1); frame.set_self(frame.junction.self); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT rcontext=wcontext=&frame; method_frame=&frame; @@ -909,9 +1417,7 @@ void Request::put_element(Value& ncontex 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; + RESTORE_CONTEXT } } @@ -924,33 +1430,33 @@ 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) { 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*/); + int param_count=frame.method_params_count(); - if(junction->auto_name && param_count) - frame.store_param(*new VString(*junction->auto_name)); + if(param_count){ + if(junction->auto_name){ // default getter + if(param_count==1){ + Value *param=new VString(*junction->auto_name); + frame.store_params(¶m, 1); + } else + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + } // no need for else frame.empty_params() frame.set_self(frame.junction.self); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT rcontext=wcontext=&frame; method_frame=&frame; @@ -958,9 +1464,7 @@ StringOrValue Request::process(Value& in 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; + RESTORE_CONTEXT return result; } @@ -968,18 +1472,15 @@ StringOrValue Request::process(Value& in if(junction->code) { // is it a code-junction? // process it StringOrValue result; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); -#endif + + 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; + SAVE_CONTEXT method_frame=junction->method_frame; rcontext=junction->rcontext; @@ -1010,13 +1511,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,10 +1525,103 @@ StringOrValue Request::process(Value& in return input_value; } +void Request::process_write(Value& input_value) { + Junction* junction=input_value.get_junction(); + if(junction) { + if(junction->is_getter) { // is it a getter-junction? + VMethodFrame frame(*junction, method_frame/*caller*/); + int param_count=frame.method_params_count(); + + if(param_count){ + if(junction->auto_name){ // default getter + if(param_count==1){ + Value *param=new VString(*junction->auto_name); + frame.store_params(¶m, 1); + } else + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + } // no need for else frame.empty_params() + + frame.set_self(frame.junction.self); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + + RESTORE_CONTEXT + + write_pass_lang(frame.result()); + return; + } + + 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(0/*empty*/, 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); +} + StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT // initialize contexts rcontext=wcontext=method_frame=&amethod_frame; @@ -1041,27 +1632,24 @@ StringOrValue Request::execute_method(VM // result StringOrValue result=wcontext->result(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT // return return result; } const String* Request::execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string) { + const Method& method, Value* optional_param, + bool do_return_string) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; + SAVE_CONTEXT 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(); + 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; @@ -1078,18 +1666,16 @@ const String* Request::execute_method(Va if(do_return_string) result=&wcontext->result().as_string(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT return result; } Request::Execute_nonvirtual_method_result Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - VString* optional_param, - bool do_return_string) { + 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) @@ -1098,7 +1684,7 @@ Request::execute_nonvirtual_method(VStat } const String* Request::execute_virtual_method(Value& aself, - const String& method_name) { + const String& method_name) { if(Value* value=aself.get_element(method_name, aself, false)) if(Junction* junction=value->get_junction()) if(const Method *method=junction->method)