--- parser3/src/main/execute.C 2003/03/04 11:51:52 1.295.2.23 +++ parser3/src/main/execute.C 2009/05/01 11:41:14 1.331 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2003/03/04 11:51:52 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/05/01 11:41:14 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -23,7 +23,7 @@ static const char* IDENT_EXECUTE_C="$Dat #include "pa_vimage.h" #include "pa_wwrapper.h" -// #define DEBUG_EXECUTE +//#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -33,12 +33,27 @@ 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", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", +#endif + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT__WRITE", +#endif "OBJECT_POOL", "STRING_POOL", - "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", @@ -67,33 +82,45 @@ void debug_printf(SAPI_Info& sapi_info, va_end(args); } -void debug_dump(SAPI_Info& sapi_info, Pool& pool, int level, ArrayOperation& ops) { +void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { Array_iterator i(ops); while(i.has_next()) { - Operation& op=i.next(); + OP::OPCODE opcode=i.next().code; - if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - ValuePtr value=i.next().value; + 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 +#endif + ) { + Operation::Origin origin=i.next().origin; + Value& value=*i.next().value; debug_printf(sapi_info, "%*s%s" " \"%s\" %s", - level*4, "", opcode_name[op.code], - value->get_string(&pool)->cstr().get(), value->type()); + level*4, "", opcode_name[opcode], + value.get_string()->cstr(), value.type()); continue; } - debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[op.code]); + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); - switch(op.code) { - 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: - if(ArrayOperation* local_ops=i.next().ops.get()) - debug_dump(sapi_info, pool, level+1, *local_ops); + switch(opcode) { + 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); } } } @@ -102,244 +129,322 @@ void debug_dump(SAPI_Info& sapi_info, Po // Request void Request::execute(ArrayOperation& ops) { -// _asm int 3; + register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' + + const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; + try{ #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "source----------------------------\n"); - debug_dump(sapi_info, pool(), 0, ops); + debug_dump(sapi_info, 0, ops); debug_printf(sapi_info, "execution-------------------------\n"); #endif - StringPtr last_get_element_name(0); - - Array_iterator i(ops); - ValuePtr value; - ValuePtr a; ValuePtr b; - //ArrayOperationPtr b_code; - - StringPtr name; - Value* ncontext; + for(Array_iterator i(ops); i.has_next(); ) { + OP::OPCODE opcode=i.next().code; - ArrayOperationPtr local_ops; - - while(i.has_next()) { - if(interrupted()) - throw Exception("parser.interrupted", - Exception::undefined_source, - "execution stopped"); - - Operation& op=i.next(); #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); #endif - switch(op.code) { + switch(opcode) { // param in next instruction - case OP_VALUE: + case OP::OP_VALUE: { - value=i.next().value; + debug_origin=i.next().origin; + Value& value=*i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value->get_string(&pool())->cstr().get(), value->type()); + debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); #endif stack.push(value); break; } - case OP_GET_CLASS: + +#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(); - name=stack.pop().string(pool()); - value=classes().get(name); + debug_origin=i.next().origin; + Value& value=*i.next().value; + const String& name=*value.get_string(); + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + 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 + wcontext->set_somebody_entered_some_class(); + + const String& name=stack.pop().string(); + Value* value=classes().get(name); if(!value) - throw Exception("parser.runtime", - StringPtr(name), + throw Exception(PARSER_RUNTIME, + &name, "class is undefined"); - stack.push(value); + stack.push(*value); break; } - +#endif // OP_WITH - case OP_WITH_ROOT: + case OP::OP_WITH_ROOT: { - stack.push(ValuePtr(method_frame)); + stack.push(*method_frame); break; } - case OP_WITH_SELF: + case OP::OP_WITH_SELF: { - stack.push(ValuePtr(get_self())); + stack.push(get_self()); break; } - case OP_WITH_READ: + case OP::OP_WITH_READ: { - stack.push(ValuePtr(rcontext)); + stack.push(*rcontext); break; } - case OP_WITH_WRITE: + case OP::OP_WITH_WRITE: { if(wcontext==method_frame) - throw Exception("parser.runtime", - Exception::undefined_source, + throw Exception(PARSER_RUNTIME, + 0, "$.name outside of $name[...]"); - stack.push(ValuePtr(wcontext)); + stack.push(*wcontext); break; } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT_VALUE: + case OP::OP_CONSTRUCT_VALUE: { - value=stack.pop().value; - name=stack.pop().string(pool()); - ncontext=stack.pop().value.get(); - ncontext->put_element(name, value, false); + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + 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); - value=stack.pop().value; - name=stack.pop().string(pool()); - ncontext=stack.pop().value.get(); - ncontext->put_element(name, value->as_expr_result(), false); + Value& expr=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=expr.as_expr_result(); + put_element(ncontext, name, &value); break; } - case OP_CURLY_CODE__CONSTRUCT: + case OP::OP_CURLY_CODE__CONSTRUCT: { - local_ops=i.next().ops; + ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops->count()); - debug_dump(sapi_info, pool(), 1, *local_ops); -#endif - value=ValuePtr(new VJunction(JunctionPtr(new Junction( + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); +#endif + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, wcontext, - local_ops)))); + &local_ops); + + wcontext->attach_junction(&value); - name=stack.pop().string(pool()); - ncontext=stack.pop().value.get(); - ncontext->put_element(name, value, false); + 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(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) + throw Exception(PARSER_RUNTIME, + 0, + "property value can not be code, use [] or () brackets"); + break; } - case OP_NESTED_CODE: + case OP::OP_NESTED_CODE: { - local_ops=i.next().ops; + ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops->count()); - debug_dump(sapi_info, pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); #endif stack.push(local_ops); break; } - case OP_WRITE_VALUE: + case OP::OP_WRITE_VALUE: { - value=stack.pop().value; - write_assign_lang(value, last_get_element_name); + Value& value=stack.pop().value(); + write_assign_lang(value); break; } - case OP_WRITE_EXPR_RESULT: + case OP::OP_WRITE_EXPR_RESULT: { - value=stack.pop().value; - write_no_lang(value->as_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); break; } - case OP_STRING__WRITE: + case OP::OP_STRING__WRITE: { - value=i.next().value; + i.next(); // ignore origin + Value* value=i.next().value; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\"", value->get_string(0)->cstr().get()); + debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr()); #endif - write_no_lang(*value->get_string(0)); + write_no_lang(*value->get_string()); 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; + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + 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: { - value=get_element(last_get_element_name, true); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) method->junction_template=new VJunction(main_class, method); + stack.push(*method->junction_template); + break; + } + Value& value=get_element(ncontext, name); stack.push(value); break; } - case OP_GET_ELEMENT: +#endif + + case OP::OP_GET_ELEMENT: { - value=get_element(last_get_element_name, false); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); stack.push(value); break; } - case OP_GET_ELEMENT__WRITE: +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: { - value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); - write_assign_lang(value, last_get_element_name); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value& value=get_element(*rcontext, name); + stack.push(value); break; } +#endif - case OP_OBJECT_POOL: + 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); + write_assign_lang(value); + break; + } + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT__WRITE: { - local_ops=i.next().ops; + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, " \"%s\" ", name.cstr()); +#endif + + Value& value=get_element(*rcontext, name); + write_assign_lang(value); + break; + } +#endif + + case OP::OP_OBJECT_POOL: + { + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - String_UL saved_lang=flang; - flang=String::UL_PASS_APPENDED; - WWrapper local(ValuePtr(0)/*empty*/, wcontext); local.ref(); + String::Language saved_lang=flang; + flang=String::L_PASS_APPENDED; + WWrapper local(0/*empty*/, wcontext); wcontext=&local; - execute(*local_ops); + execute(local_ops); - value=wcontext->result().as_value(); + stack.push(wcontext->result().as_value()); flang=saved_lang; wcontext=saved_wcontext; - stack.push(value); break; } - case OP_STRING_POOL: + case OP::OP_STRING_POOL: { - local_ops=i.next().ops; + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(ValuePtr(0) /*empty*/, wcontext); local.ref(); + WWrapper local(0 /*empty*/, wcontext); wcontext=&local; - execute(*local_ops); + execute(local_ops); + Value* value; // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - if(StringPtr string=wcontext->get_string(&pool())) - value=ValuePtr(new VString(string)); + if(const String* string=wcontext->get_string()) + value=new VString(*string); else - value=ValuePtr(new VVoid); + value=VVoid::get(); + stack.push(*value); wcontext=saved_wcontext; - stack.push(value); break; } // CALL - case OP_STORE_PARAM: - { - value=stack.pop().value; - VMethodFrame *frame=static_cast(stack.top_value().ptr); - // 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 - local_ops=i.next().ops; - VMethodFrame *frame=static_cast(stack.top_value().ptr); + ArrayOperation& local_ops=*i.next().ops; #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops->count()); - debug_dump(sapi_info, pool(), 1, *local_ops); + debug_printf(sapi_info, " (%d)\n", local_ops.count()); + debug_dump(sapi_info, 1, local_ops); #endif // when they evaluate expression parameter, // the object expression result @@ -348,49 +453,62 @@ 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=ValuePtr(new VJunction(JunctionPtr(new Junction( + VJunction& value=*new VJunction( get_self(), 0, method_frame, rcontext, - op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops)))); + opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, + &local_ops); +#ifdef USE_DESTRUCTORS + value.set_temporal(true); +#else + if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) +#endif + wcontext->attach_junction(&value); // 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_CONSTRUCT_OBJECT: { wcontext->set_constructing(true); break; } - case OP_PREPARE_TO_EXPRESSION: + case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } - case OP_CALL: - case OP_CALL__WRITE: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: { - local_ops=i.next().ops; + //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, pool(), 1, *local_ops); + debug_dump(sapi_info, 1, *local_ops); debug_printf(sapi_info, "->\n"); #endif - value=stack.pop().value; + Value& value=stack.pop().value(); - JunctionPtr junction=value->get_junction(); - if(!junction) - throw Exception("parser.runtime", - last_get_element_name, - "(%s) not a method or junction, can not call it", - value->type()); + 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()); + } /* no check needed, code compiled the way that that's impossible // check: // that this is method-junction, not a code-junction @@ -398,466 +516,504 @@ void Request::execute(ArrayOperation& op // $junction{code} // ^junction[] if(!junction->method) - throw Exception("parser.runtime", - last_get_element_name, - "(%s) is code junction, can not call it", - value->type()); + throw Exception(PARSER_RUNTIME, + "is '%s', it is code junction, can not call it", + value.type()); */ - VMethodFrame frame(pool(), last_get_element_name, *junction, method_frame/*caller*/); frame.ref(); + VMethodFrame frame(*junction, method_frame); + WContext* result_wcontext; + 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); + result_wcontext=op_call(frame); + stack.set_top_index(first); + } else { + frame.empty_params(); + result_wcontext=op_call(frame); } - frame.fill_unspecified_params(); - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - VStateless_class *called_class=frame.junction.self->get_class(); - ValuePtr new_self=get_self(); - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - if(frame.junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - - if(ValuePtr value=called_class->create_new_value()) { - // some stateless_class creatable derivates - new_self=value; - } else - throw Exception("parser.runtime", - frame.name(), - "is not a constructor, system class '%s' can be constructed only implicitly", - (char*)called_class->name()->cstr()); - - frame.write(new_self, - String::UL_CLEAN // not used, always an object, not string - ); - } else - throw Exception("parser.runtime", - frame.name(), - "method is static and can not be used as constructor"); - } else - new_self=frame.junction.self; - frame.set_self(new_self); - - // 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.get() ? Method::CT_STATIC : Method::CT_DYNAMIC; - if( - method.call_type==Method::CT_ANY || - method.call_type==call_type) { // allowed call type? - try { - 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.name(), frame.numbered_params()); // execute it - } else // parser code, execute it - recoursion_checked_execute(frame.name(), *method.parser_code); - } catch(...) { - // record it to stack trace - exception_trace.push(frame.name()); - rethrow; - } - } else - throw Exception("parser.runtime", - frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); - - } - StringOrValue result=wcontext->result(); - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - - if(op.code==OP_CALL__WRITE) { - write_assign_lang(result, last_get_element_name); + if(opcode==OP::OP_CALL__WRITE) { + write_assign_lang(result_wcontext->result()); } else { // OP_CALL - stack.push(result.as_value()); + stack.push(result_wcontext->result().as_value()); } - + #ifdef DEBUG_EXECUTE debug_printf(sapi_info, "<-returned"); #endif + //is_debug_junction=false; + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } break; } // expression ops: unary - case OP_NEG: + case OP::OP_NEG: { - a=stack.pop().value; - value=ValuePtr(new VDouble(-a->as_double())); + Value& a=stack.pop().value(); + Value& value=*new VDouble(-a.as_double()); stack.push(value); break; } - case OP_INV: + case OP::OP_INV: { - a=stack.pop().value; - value=ValuePtr(new VDouble(~a->as_int())); + Value& a=stack.pop().value(); + Value& value=*new VDouble(~a.as_int()); stack.push(value); break; } - case OP_NOT: + case OP::OP_NOT: { - a=stack.pop().value; - value=ValuePtr(new VBool(!a->as_bool())); + Value& a=stack.pop().value(); + Value& value=VBool::get(!a.as_bool()); stack.push(value); break; } - case OP_DEF: + case OP::OP_DEF: { - a=stack.pop().value; - value=ValuePtr(new VBool(a->is_defined())); + Value& a=stack.pop().value(); + Value& value=VBool::get(a.is_defined()); stack.push(value); break; } - case OP_IN: + case OP::OP_IN: { - /// @test String::cmp - a=stack.pop().value; - CharPtr path=a->as_string(&pool())->cstr(); - value=ValuePtr(new VBool( - request_info.uri && strncmp(path, request_info.uri, strlen(path))==0)); + Value& a=stack.pop().value(); + const String& path=a.as_string(); + 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: { - a=stack.pop().value; - value=ValuePtr(new VBool( - file_readable(absolute(a->as_string(&pool()))))); + Value& a=stack.pop().value(); + Value& value=VBool::get(file_exist(absolute(a.as_string()))); stack.push(value); break; } - case OP_DEXISTS: + case OP::OP_DEXISTS: { - a=stack.pop().value; - value=ValuePtr(new VBool( - dir_readable(absolute(a->as_string(&pool()))))); + Value& a=stack.pop().value(); + Value& value=VBool::get(dir_exists(absolute(a.as_string()))); stack.push(value); break; } // expression ops: binary - case OP_SUB: + case OP::OP_SUB: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() - b->as_double())); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() + b->as_double())); + 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: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VDouble(a->as_double() * b->as_double())); + 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: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=ValuePtr(new VDouble(a_double / b_double)); + Value& value=*new VDouble(a_double / b_double); stack.push(value); break; } - case OP_MOD: + case OP::OP_MOD: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Modulus by zero"); } - value=ValuePtr(new VDouble(fmod(a_double, b_double))); + Value& value=*new VDouble(fmod(a_double, b_double)); stack.push(value); break; } - case OP_INTDIV: + case OP::OP_INTDIV: { - b=stack.pop().value; a=stack.pop().value; + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - int a_int=a->as_int(); - int b_int=b->as_int(); + int a_int=a.as_int(); + int b_int=b.as_int(); if(b_int == 0) { - StringPtr problem_source=b->as_string(&pool()); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=ValuePtr(new VInt(a_int / b_int)); + Value& value=*new VInt(a_int / b_int); stack.push(value); break; } - case OP_BIN_SL: + case OP::OP_BIN_SL: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( - a->as_int() << - b->as_int())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() << + b.as_int()); stack.push(value); break; } - case OP_BIN_SR: + case OP::OP_BIN_SR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( - a->as_int() >> - b->as_int())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() >> + b.as_int()); stack.push(value); break; } - case OP_BIN_AND: + case OP::OP_BIN_AND: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( - a->as_int() & - b->as_int())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() & + b.as_int()); stack.push(value); break; } - case OP_BIN_OR: + case OP::OP_BIN_OR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( - a->as_int() | - b->as_int())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() | + b.as_int()); stack.push(value); break; } - case OP_BIN_XOR: + case OP::OP_BIN_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VInt( - a->as_int() ^ - b->as_int())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() ^ + b.as_int()); stack.push(value); break; } - case OP_LOG_AND: + case OP::OP_LOG_AND: { - local_ops=stack.pop().ops; a=stack.pop().value; + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) { - execute(*local_ops); - b=stack.pop().value; - result=b->as_bool(); + if(a.as_bool()) { + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } else result=false; - value=ValuePtr(new VBool(result)); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_OR: + case OP::OP_LOG_OR: { - local_ops=stack.pop().ops; a=stack.pop().value; + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) + if(a.as_bool()) result=true; else { - execute(*local_ops); - b=stack.pop().value; - result=b->as_bool(); + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } - value=ValuePtr(new VBool(result)); + Value& value=VBool::get(result); stack.push(value); break; } - case OP_LOG_XOR: + case OP::OP_LOG_XOR: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->as_bool() ^ b->as_bool())); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_bool() ^ b.as_bool()); stack.push(value); break; } - case OP_NUM_LT: + case OP::OP_NUM_LT: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result < 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_doubleas_double() - b->as_double(); - value=ValuePtr(new VBool(result > 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double>b_double); stack.push(value); break; } - case OP_NUM_LE: + case OP::OP_NUM_LE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result <= 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double<=b_double); stack.push(value); break; } - case OP_NUM_GE: + case OP::OP_NUM_GE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result >= 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double>=b_double); stack.push(value); break; } - case OP_NUM_EQ: + case OP::OP_NUM_EQ: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result == 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double==b_double); stack.push(value); break; } - case OP_NUM_NE: + case OP::OP_NUM_NE: { - b=stack.pop().value; a=stack.pop().value; - double result=a->as_double() - b->as_double(); - value=ValuePtr(new VBool(result != 0.0)); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double!=b_double); stack.push(value); break; } - case OP_STR_LT: + case OP::OP_STR_LT: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) < *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() < b.as_string()); stack.push(value); break; } - case OP_STR_GT: + case OP::OP_STR_GT: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) > *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() > b.as_string()); stack.push(value); break; } - case OP_STR_LE: + case OP::OP_STR_LE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) <= *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() <= b.as_string()); stack.push(value); break; } - case OP_STR_GE: + case OP::OP_STR_GE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) >= *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() >= b.as_string()); stack.push(value); break; } - case OP_STR_EQ: + case OP::OP_STR_EQ: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) == *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() == b.as_string()); stack.push(value); break; } - case OP_STR_NE: + case OP::OP_STR_NE: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(*a->as_string(&pool()) != *b->as_string(&pool()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() != b.as_string()); stack.push(value); break; } - case OP_IS: + case OP::OP_IS: { - b=stack.pop().value; a=stack.pop().value; - value=ValuePtr(new VBool(a->is(b->as_string(&pool())->cstr()))); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.is(b.as_string().cstr())); stack.push(value); break; } default: - throw Exception(Exception::undefined_type, - Exception::undefined_source, - "invalid opcode %d", op.code); + throw Exception(0, + 0, + "invalid opcode %d", opcode); } } + } catch(const Exception&) { + // record it to stack trace + if(debug_name) + exception_trace.push(Trace(debug_name, debug_origin)); + rethrow; + } } +#define SAVE_CONTEXT \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ + WContext *saved_wcontext=wcontext; + +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ + method_frame=saved_method_frame; + +WContext* Request::op_call(VMethodFrame& frame){ + SAVE_CONTEXT + + 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)) { + // 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 + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "method is static and can not be used as constructor"); + } else + new_self=&frame.junction.self; + + frame.set_self(*new_self); + + // 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"); + } + + WContext *result_wcontext=wcontext; + // StringOrValue result=wcontext->result(); + + RESTORE_CONTEXT + + return result_wcontext; +} + + /** @todo cache|prepare junctions @bug ^superbase:method would dynamically call ^base:method if there is any */ -ValuePtr Request::get_element(StringPtr& remember_name, bool can_call_operator) { - StringPtr name=stack.pop().string(pool()); remember_name=name; - ValuePtr ncontext=stack.pop().value; - ValuePtr value; - if(can_call_operator) { - if(MethodPtr method=main_class->get_method(name)) // looking operator of that name FIRST - value=ValuePtr(new VJunction(JunctionPtr(new Junction( - main_class, method.get(), 0,0,0, ArrayOperationPtr(0))))); - } - if(!value) { - if(!wcontext->get_constructing() // not constructing - && wcontext->get_somebody_entered_some_class() ) // ^class:method - if(VStateless_class *called_class=ncontext->get_class()) +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(ValuePtr base=get_self()->base()) { // doing DYNAMIC call - Temp_derived temp_derived(*base, VObjectPtr(0)); // temporarily prevent go-back-down virtual calls - value=base->get_element(name, *base, false); // virtual-up lookup starting from parent - goto value_ready; + if(Value* base=get_self().base()) { // doing DYNAMIC call + 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, false); + + Value* value=ncontext.get_element(name, ncontext, true); if(value && wcontext->get_constructing()) - if(JunctionPtr junction=value->get_junction()) { - if(junction->self->get_class()!=ncontext.get()) - throw Exception("parser.runtime", - name, + 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()); - } + ncontext.get_class()->name_cstr()); + + return *(value ? &process_to_value(*value) : VVoid::get()); +} + +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(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { + // process it + 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); + + frame.store_params(&value, 1); + frame.set_self(frame.junction.self); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; -value_ready: - if(value) - value=process_to_value(value); // process possible code-junction - else - value=ValuePtr(new VVoid); + // prevent non-string writes for better error reporting [setters are not expected to return anything] + wcontext->write(*method_frame); - return value; + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + // we don't need it StringOrValue result=wcontext->result(); + + RESTORE_CONTEXT + } } /** @param intercept_string @@ -871,72 +1027,103 @@ value_ready: using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(ValuePtr input_value, bool intercept_string) { - StringOrValue result; - JunctionPtr junction=input_value->get_junction(); - if(junction && junction->code) { // is it a code-junction? - // process it -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); +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? + 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 + StringOrValue result=wcontext->result(); + + RESTORE_CONTEXT + + return result; + } + + if(junction->code) { // is it a code-junction? + // process it + StringOrValue result; +#ifdef DEBUG_EXECUTE + debug_printf(sapi_info, "ja->\n"); #endif - if(!junction->method_frame) - throw Exception("parser.runtime", - Exception::undefined_source, + 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; - - 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" - bool using_code_frame=intercept_string && junction->wcontext; - if(using_code_frame) { - // almost plain wwrapper about junction wcontext, - // BUT intercepts string writes - VCodeFrame local(*junction->wcontext, junction->wcontext); local.ref(); - wcontext=&local; + 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" + bool using_code_frame=intercept_string && junction->wcontext; + if(using_code_frame) { + // almost plain wwrapper about junction wcontext + + VCodeFrame local(*junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + // CodeFrame soul: + result=wcontext->result(); + } else { + // plain wwrapper + WWrapper local(0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + result=wcontext->result(); + } + + RESTORE_CONTEXT - // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); - - // CodeFrame soul: - // string writes were intercepted - // returning them as the result of getting code-junction - result.set_string(wcontext->get_string(&pool())); - } else { - // plain wwrapper - WWrapper local(ValuePtr(0)/*empty*/, wcontext); local.ref(); - wcontext=&local; - - // execute it - recoursion_checked_execute(Exception::undefined_source/*result_name*/, *junction->code); - - result=wcontext->result(); - } - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - #ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); + debug_printf(sapi_info, "<-ja returned"); #endif - } else { - result.set_value(input_value); - } - return result; + return result; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects + } + + return input_value; } -StringPtr Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; +StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { + SAVE_CONTEXT // initialize contexts rcontext=wcontext=method_frame=&amethod_frame; @@ -945,69 +1132,65 @@ StringPtr Request::execute_method(VMetho execute(*method.parser_code); // result - StringPtr result=wcontext->result().as_string(&pool()); + StringOrValue result=wcontext->result(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; + RESTORE_CONTEXT // return return result; } -StringPtr Request::execute_method(ValuePtr aself, - const Method& method, VStringPtr optional_param, - bool do_return_string) { - VMethodFrame *saved_method_frame=method_frame; - Value* saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; +const String* Request::execute_method(Value& aself, + const Method& method, Value* optional_param, + bool do_return_string) { + + SAVE_CONTEXT - Junction local_junction(aself, &method, 0,0,0, ArrayOperationPtr(0)); - VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/); local_frame.ref(); - if(optional_param && local_frame.can_store_param()) { - local_frame.store_param(optional_param); - local_frame.fill_unspecified_params(); + Junction local_junction(aself, &method); + VMethodFrame local_frame(local_junction, method_frame/*caller*/); + 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(pool(), ValuePtr(&local_frame)); + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - StringPtr result(0); + const String* result=0; if(do_return_string) - result=wcontext->result().as_string(&pool()); + 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, - StringPtr method_name, VStringPtr 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) - result.string=execute_method(ValuePtr(&aclass), *result.method, optional_param, - do_return_string); + result.string=execute_method(aclass, *result.method, optional_param, do_return_string); return result; } -StringPtr Request::execute_virtual_method(ValuePtr aself, - StringPtr method_name) { - if(ValuePtr value=aself->get_element(method_name, *aself, false)) - if(JunctionPtr junction=value->get_junction()) +const String* Request::execute_virtual_method(Value& aself, + 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) - return execute_method(aself, *method, VStringPtr(0)/*no params*/, true); + return execute_method(aself, *method, 0/*no params*/, true); - return StringPtr(0); + return 0; }