--- parser3/src/main/execute.C 2002/04/10 09:53:15 1.224 +++ parser3/src/main/execute.C 2002/10/16 08:24:55 1.286 @@ -3,10 +3,10 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: execute.C,v 1.224 2002/04/10 09:53:15 paf Exp $ */ +static const char* IDENT_EXECUTE_C="$Date: 2002/10/16 08:24:55 $"; + #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -33,8 +33,6 @@ ulong wcontext_result_size=0; -const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; - #ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals @@ -47,16 +45,16 @@ char *opcode_name[]={ "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", - "CREATE_EWPOOL", "REDUCE_EWPOOL", - "CREATE_SWPOOL", "REDUCE_SWPOOL", - "GET_METHOD_FRAME", + "OBJECT_POOL", "STRING_POOL", "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "CALL", "CALL__WRITE", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary "SUB", "ADD", "MUL", "DIV", "MOD", "INTDIV", + "BIN_SL", "BIN_SR", "BIN_AND", "BIN_OR", "BIN_XOR", "LOG_AND", "LOG_OR", "LOG_XOR", "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", @@ -99,6 +97,9 @@ void debug_dump(Pool& pool, int level, c 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: const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } @@ -118,6 +119,7 @@ void Request::execute(const Array& ops) debug_dump(pool(), 0, ops); debug_printf(pool(), "execution-------------------------\n"); #endif + const String *last_get_element_name=0; Array_iter i(ops); while(i.has_next()) { @@ -141,36 +143,6 @@ void Request::execute(const Array& ops) PUSH(value); break; } - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: - { - VMethodFrame *frame=static_cast(stack.top_value()); - // code - const Array *local_ops=reinterpret_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); -#endif - // when they evaluate expression parameter, - // the object expression result - // does not need to be written into calling frame - // it must go into any expressions using that parameter - // hence, we zero junction.wcontext here, and later - // in .process we would test that field - // in decision "which wwrapper to use" - Junction& j=*NEW Junction(pool(), - *self, 0, 0, - root, - rcontext, - op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops); - - value=NEW VJunction(j); - - // store param - frame->store_param(frame->name(), value); - break; - } case OP_GET_CLASS: { // maybe they do ^class:method[] call, remember the fact @@ -190,12 +162,12 @@ void Request::execute(const Array& ops) // OP_WITH case OP_WITH_ROOT: { - PUSH(root); + PUSH(method_frame); break; } case OP_WITH_SELF: { - PUSH(self); + PUSH(get_self()); break; } case OP_WITH_READ: @@ -215,8 +187,7 @@ void Request::execute(const Array& ops) value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); - ncontext->put_element(name, value); - value->set_name(name); + ncontext->put_element(name, value, false); break; } case OP_CONSTRUCT_EXPR: @@ -227,8 +198,7 @@ void Request::execute(const Array& ops) value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); - ncontext->put_element(name, value->as_expr_result()); - value->set_name(name); + ncontext->put_element(name, value->as_expr_result(), false); break; } case OP_CURLY_CODE__CONSTRUCT: @@ -239,17 +209,16 @@ void Request::execute(const Array& ops) debug_dump(pool(), 1, *local_ops); #endif Junction& j=*NEW Junction(pool(), - *self, 0, 0, - root, + *get_self(), 0, + method_frame, rcontext, wcontext, local_ops); - + value=NEW VJunction(j); const String& name=POP_NAME(); Value *ncontext=POP(); - ncontext->put_element(name, value); - value->set_name(name); + ncontext->put_element(name, value, false); break; } case OP_NESTED_CODE: @@ -265,20 +234,17 @@ void Request::execute(const Array& ops) case OP_WRITE_VALUE: { value=POP(); - write_assign_lang(*value); - - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->set_somebody_entered_some_object(false); + write_assign_lang(*value, last_get_element_name); break; } case OP_WRITE_EXPR_RESULT: { + value=POP(); + write_no_lang(*value->as_expr_result()); + + // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - - value=POP(); - write_expr_result(*value->as_expr_result()); break; } case OP_STRING__WRITE: @@ -293,58 +259,54 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT_OR_OPERATOR: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - - //_asm int 3; - value=get_element(true); + value=get_element(last_get_element_name, true); PUSH(value); break; } case OP_GET_ELEMENT: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - - //_asm int 3; - value=get_element(false); + value=get_element(last_get_element_name, false); PUSH(value); break; } case OP_GET_ELEMENT__WRITE: { - value=get_element(false); - write_assign_lang(*value); + value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); + write_assign_lang(*value, last_get_element_name); break; } - case OP_CREATE_EWPOOL: + case OP_OBJECT_POOL: { - PUSH(wcontext); - PUSH((void *)flang); + const Array *local_ops=reinterpret_cast(i.next()); + + WContext *saved_wcontext=wcontext; + uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - wcontext=NEW WWrapper(pool(), 0 /*empty*/); - break; - } - case OP_REDUCE_EWPOOL: - { - value=&wcontext->result(); - flang=static_cast(reinterpret_cast(POP())); - wcontext=static_cast(POP()); + WWrapper local(pool(), 0 /*empty*/, wcontext); + wcontext=&local; + + execute(*local_ops); + + value=&wcontext->result().as_value(); + flang=saved_lang; + wcontext=saved_wcontext; PUSH(value); break; } - case OP_CREATE_SWPOOL: - { - PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/); - break; - } - case OP_REDUCE_SWPOOL: + case OP_STRING_POOL: { + const Array *local_ops=reinterpret_cast(i.next()); + + WContext *saved_wcontext=wcontext; + WWrapper local(pool(), 0 /*empty*/, wcontext); + wcontext=&local; + + execute(*local_ops); + // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext const String *string=wcontext->get_string(); @@ -353,35 +315,49 @@ void Request::execute(const Array& ops) value=NEW VString(*string); else NEW VVoid(pool()); - wcontext=static_cast(POP()); + wcontext=saved_wcontext; PUSH(value); break; } // CALL - case OP_GET_METHOD_FRAME: + case OP_STORE_PARAM: { value=POP(); - - // info: - // code compiled so that this one's always method-junction, - // not a code-junction - Junction *junction=value->get_junction(); - if(!junction) - throw Exception("parser.runtime", - &value->name(), - "(%s) not a method or junction, can not call it", - value->type()); - - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction); - PUSH(frame); + VMethodFrame *frame=static_cast(stack.top_value()); + // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 + frame->store_param(value); break; } - case OP_STORE_PARAM: + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: { - value=POP(); + // code + const Array *local_ops=reinterpret_cast(i.next()); VMethodFrame *frame=static_cast(stack.top_value()); - frame->store_param(frame->name(), value); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); +#endif + // when they evaluate expression parameter, + // the object expression result + // does not need to be written into calling frame + // it must go into any expressions using that parameter + // hence, we zero junction.wcontext here, and later + // in .process we would test that field + // in decision "which wwrapper to use" + Junction& j=*NEW Junction(pool(), + *get_self(), 0, + method_frame, + rcontext, + op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, + local_ops); + + value=NEW VJunction(j); + + // store param + // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 + frame->store_param(value); break; } @@ -398,118 +374,126 @@ void Request::execute(const Array& ops) } case OP_CALL: + case OP_CALL__WRITE: { + Array *local_ops=static_cast(i.next()); #ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); + debug_printf(pool(), "->\n"); #endif - VMethodFrame *frame=static_cast(POP()); - frame->fill_unspecified_params(); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + value=POP(); + + Junction *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()); + /* 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", + last_get_element_name, + "(%s) is code junction, can not call it", + value->type()); + */ + + VMethodFrame frame(pool(), *last_get_element_name, *junction, method_frame/*caller*/); + if(local_ops){ // store param code goes here + PUSH(&frame); // argument for *STORE_PARAM ops + execute(*local_ops); + POP(); + } + 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(); + VStateless_class *called_class=frame.junction.self.get_class(); + Value *new_self=get_self(); if(wcontext->get_constructing()) { wcontext->set_constructing(false); - if(frame->junction.method->call_type!=Method::CT_STATIC) { + if(frame.junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call if(Value *value=called_class->create_new_value(pool())) { // some stateless_class creatable derivates - self=value; + new_self=value; } else throw Exception("parser.runtime", - &frame->name(), + &frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", called_class->name().cstr()); - frame->write(*self, + frame.write(*new_self, String::UL_CLEAN // not used, always an object, not string ); } else throw Exception("parser.runtime", - &frame->name(), + &frame.name(), "method is static and can not be used as constructor"); - } else { - // this is not constructor call - - // not ^name.method call, name:method call; and - // is context object or class & is it my class or my parent's class and? - VStateless_class *read_class=rcontext->get_class(); - if( - !(wcontext->get_somebody_entered_some_object() && - !wcontext->get_somebody_entered_some_class()) && - read_class && read_class->is_or_derived_from(*called_class)) // yes - self=rcontext; // dynamic call - else // no, not me or relative of mine (=total stranger) - self=&frame->junction.self; // static call - } + } else + new_self=&frame.junction.self; - frame->set_self(*self); + frame.set_self(*new_self); // see OP_PREPARE_TO_EXPRESSION - frame->set_in_expression(wcontext->get_in_expression()); + frame.set_in_expression(wcontext->get_in_expression()); - rcontext=wcontext=frame; + rcontext=wcontext=&frame; { - // take object or class from any wrappers - // and substitute class alias to the class they are called AS - Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass); - - const Method& method=*frame->junction.method; + const Method& method=*frame.junction.method; Method::Call_type call_type= - called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; + 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? try { + method_frame=&frame; if(method.native_code) { // native code? - // root unchanged, so that ^for ^foreach & co may write to locals method.check_actual_numbered_params( - frame->junction.self, - frame->name(), frame->numbered_params()); + frame.junction.self, + frame.name(), frame.numbered_params()); method.native_code( *this, - frame->name(), frame->numbered_params()); // execute it - } else { // parser code - root=frame; - { // anti_endless_execute_recoursion - if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { - anti_endless_execute_recoursion=0; // give @exception a chance - throw Exception("parser.runtime", - &frame->name(), - "call canceled - endless recursion detected"); - } - execute(*method.parser_code); // execute it - anti_endless_execute_recoursion--; - } - } + 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((void *)&frame->name()); + exception_trace.push((void *)&frame.name()); /*re*/throw; } } else throw Exception("parser.runtime", - &frame->name(), + &frame.name(), "is not allowed to be called %s", call_type==Method::CT_STATIC?"statically":"dynamically"); } - value=&wcontext->result(); + StringOrValue result=wcontext->result(); - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row); #endif - PUSH(value); + if(op.code==OP_CALL__WRITE) { + write_assign_lang(result, last_get_element_name); + } else { // OP_CALL + PUSH(&result.as_value()); + } + #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-returned"); #endif @@ -603,10 +587,6 @@ void Request::execute(const Array& ops) if(b_double == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Division by zero"); @@ -625,10 +605,6 @@ void Request::execute(const Array& ops) if(b_double == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Modulus by zero"); @@ -647,10 +623,6 @@ void Request::execute(const Array& ops) if(b_int == 0) { const String *problem_source=&b->as_string(); -#ifndef NO_STRING_ORIGIN - if(!problem_source->origin().file) - problem_source=&b->name(); -#endif throw Exception("number.zerodivision", problem_source, "Division by zero"); @@ -660,10 +632,28 @@ void Request::execute(const Array& ops) PUSH(value); break; } + case OP_BIN_SL: + { + b=POP(); a=POP(); + value=NEW VInt(pool(), + a->as_int() << + b->as_int()); + PUSH(value); + break; + } + case OP_BIN_SR: + { + b=POP(); a=POP(); + value=NEW VInt(pool(), + a->as_int() >> + b->as_int()); + PUSH(value); + break; + } case OP_BIN_AND: { b=POP(); a=POP(); - value=NEW VDouble(pool(), + value=NEW VInt(pool(), a->as_int() & b->as_int()); PUSH(value); @@ -672,7 +662,7 @@ void Request::execute(const Array& ops) case OP_BIN_OR: { b=POP(); a=POP(); - value=NEW VDouble(pool(), + value=NEW VInt(pool(), a->as_int() | b->as_int()); PUSH(value); @@ -681,7 +671,7 @@ void Request::execute(const Array& ops) case OP_BIN_XOR: { b=POP(); a=POP(); - value=NEW VDouble(pool(), + value=NEW VInt(pool(), a->as_int() ^ b->as_int()); PUSH(value); @@ -726,42 +716,48 @@ void Request::execute(const Array& ops) case OP_NUM_LT: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() < b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result < 0.0); PUSH(value); break; } case OP_NUM_GT: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() > b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result > 0.0); PUSH(value); break; } case OP_NUM_LE: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() <= b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result <= 0.0); PUSH(value); break; } case OP_NUM_GE: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() >= b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result >= 0.0); PUSH(value); break; } case OP_NUM_EQ: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() == b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result == 0.0); PUSH(value); break; } case OP_NUM_NE: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_double() != b->as_double()); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result != 0.0); PUSH(value); break; } @@ -809,9 +805,8 @@ void Request::execute(const Array& ops) } case OP_IS: { - //_asm int 3; b=POP(); a=POP(); - value=NEW VBool(pool(), b->as_string() == a->type()); + value=NEW VBool(pool(), a->is(b->as_string().cstr())); PUSH(value); break; } @@ -824,25 +819,39 @@ void Request::execute(const Array& ops) } } -Value *Request::get_element(bool can_call_operator) { - const String& name=POP_NAME(); +/// @test cache|prepare junctions +Value *Request::get_element(const String *& remember_name, bool can_call_operator) { + const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); Value *value=0; - if(can_call_operator) - if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST + if(can_call_operator) { + if(Method* method=main_class.get_method(name)) { // looking operator of that name FIRST // as if that method were in self and we have normal dynamic method here Junction& junction=*NEW Junction(pool(), - *root, self->get_class(), method, 0,0,0,0); + main_class, method, 0,0,0,0); value=NEW VJunction(junction); } + } + 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_object=get_self()->base_object()) { // doing DYNAMIC call + Temp_derived temp_derived(*base_object, 0); // temporarily prevent go-back-down virtual calls + value=base_object->get_element(name, base_object, false); // virtual-up lookup starting from parent + goto _void; + } + } if(!value) - value=ncontext->get_element(name); + value=ncontext->get_element(name, ncontext, false); + +_void: if(value) - value=&process_to_value(*value, &name); // process possible code-junction - else { + value=&process_to_value(*value); // process possible code-junction + else value=NEW VVoid(pool()); - value->set_name(name); - } return value; } @@ -858,22 +867,27 @@ Value *Request::get_element(bool can_cal using the fact it's either string_ or value_ result requested to speed up checkes */ -void Request::process_internal( - Value& input_value, const String *result_name, - bool intercept_string, - const String **string_result, Value **value_result) { +StringOrValue Request::process(Value& input_value, bool intercept_string) { + StringOrValue result; Junction *junction=input_value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it #ifdef DEBUG_EXECUTE debug_printf(pool(), "ja->\n"); #endif - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + + 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; - WContext *frame; + 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" @@ -881,132 +895,119 @@ void Request::process_internal( if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - frame=NEW VCodeFrame(pool(), *junction->wcontext); - } else { - // plain wwrapper - frame=NEW WWrapper(pool(), 0/*empty*/); - } - - //frame->set_name(value.name()); - wcontext=frame; - self=&junction->self; - root=junction->root; - rcontext=junction->rcontext; + VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); + wcontext=&local; - { // anti_endless_execute_recoursion - if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { - anti_endless_execute_recoursion=0; // give @exception a chance - throw Exception("parser.runtime", - result_name, - "junction evaluation canceled - endless recursion detected"); - } - execute(*junction->code); - anti_endless_execute_recoursion--; - } - - if(using_code_frame) { + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - if(string_result) - *string_result=frame->get_string(); - else - *value_result=NEW VString(*frame->get_string()); + result.set_string(*wcontext->get_string()); } else { - if(string_result) - *string_result=&frame->result().as_string(); - else { - *value_result=&frame->result(); - if(result_name) - (*value_result)->set_name(*result_name); - } + // plain wwrapper + WWrapper local(pool(), 0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(0/*result_name*/, *junction->code); + + result=wcontext->result(); } - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); #endif } else { - if(string_result) // they asked for string_result - *string_result=&input_value.as_string(); - else {// they asked for value_result - *value_result=&input_value; - if(result_name) - (*value_result)->set_name(*result_name); - } + result.set_value(input_value); } + return result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; // initialize contexts - root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself); + rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); // result - const String *result=return_cstr ? &wcontext->as_string() : 0; + const String& result=wcontext->result().as_string(); - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; // return return result; } -const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +void Request::execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string) { + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; - // initialize contexts - root=rcontext=self=&amethodFrame; - wcontext=&amethodFrame; + Junction local_junction(pool(), aself, &method, 0,0,0,0); + VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/); + if(optional_param && local_frame.can_store_param()) { + local_frame.store_param(optional_param); + local_frame.fill_unspecified_params(); + } + local_frame.set_self(aself); + rcontext=wcontext=method_frame=&local_frame; + + // prevent non-string writes for better error reporting + if(return_string) + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - const String& result=wcontext->as_string(); - - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + const String *result=0; + if(return_string) + *return_string=&wcontext->result().as_string(); - // return - return result; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; +} + +void Request::execute_nonvirtual_method(VStateless_class& aclass, + const String& method_name, VString *optional_param, + const String **return_string, + const Method **return_method) { + + const Method *method=aclass.get_method(method_name); + if(return_string) + *return_string=0; + if(return_method) + *return_method=method; + + if(method) + execute_method(aclass, *method, optional_param, return_string); } const String *Request::execute_virtual_method(Value& aself, const String& method_name) { - if(Value *value=aself.get_element(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, true /*return_cstr*/); + if(const Method *method=junction->method) { + const String *result; + execute_method(aself, *method, 0/*no params*/, &result); + return result; + } return 0; } - -const String *Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, - bool return_cstr) { - if(const Method *method=aclass.get_method(method_name)) - return execute_method(aclass, *method, return_cstr); - - return 0; -}