--- parser3/src/main/execute.C 2002/04/22 10:15:12 1.239 +++ parser3/src/main/execute.C 2002/08/01 11:26:49 1.243 @@ -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.239 2002/04/22 10:15:12 paf Exp $ */ +static const char* IDENT_EXECUTE_C="$Id: execute.C,v 1.243 2002/08/01 11:26:49 paf Exp $"; + #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -111,6 +111,49 @@ void debug_dump(Pool& pool, int level, c #define POP_NAME() static_cast(stack.pop())->as_string() #define POP_CODE() static_cast(stack.pop()) +/** + Helps preventing evaluation of junctions in outdated context + + To stop situations like this: +@code + @main[] + ^method1[] + ^method2[] + + @method1[] + $junction{ + some code + } + + @method2[] + ^junction[] +@endcode + + All Junctions, generated by OP_CURLY_CODE__CONSTRUCT are registered here, + and on scope exit got cleaned - there Junction::root becomes 0, + which later in Request::process triggers exception +*/ +class Auto_junction_cleaner { +public: + Auto_junction_cleaner () : junctions(0) {} + ~Auto_junction_cleaner () { + if(junctions) { + Array_iter i(*junctions); + while(i.has_next()) + static_cast(i.next())->change_context(0); + // someday free junctions + } + } + void register_junction(Pool& apool, Junction& ajunction) { + if(!junctions) + junctions=new(apool) Array(apool); + if(junctions) + *junctions+=&ajunction; + } +private: + Array *junctions; +}; + void Request::execute(const Array& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE @@ -119,6 +162,7 @@ void Request::execute(const Array& ops) debug_printf(pool(), "execution-------------------------\n"); #endif + Auto_junction_cleaner junction_cleaner; const String *last_get_element_name=0; Array_iter i(ops); @@ -210,10 +254,11 @@ void Request::execute(const Array& ops) #endif Junction& j=*NEW Junction(pool(), *self, 0, 0, - 0, - 0, - 0, + root, + rcontext, + wcontext, local_ops); + junction_cleaner.register_junction(pool(), j); value=NEW VJunction(j); const String& name=POP_NAME(); @@ -860,28 +905,28 @@ StringOrValue Request::process(Value& in debug_printf(pool(), "ja->\n"); #endif + if(!junction->root) + throw Exception("parser.runtime", + 0, + "junction used outside of context"); + PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - - WContext *jwcontext; + self=&junction->self; - if(junction->root) { - root=junction->root; - rcontext=junction->rcontext; - jwcontext=junction->wcontext; - } else - jwcontext=wcontext; + root=junction->root; + 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 && jwcontext; + bool using_code_frame=intercept_string && junction->wcontext; if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *jwcontext); + VCodeFrame local(pool(), *junction->wcontext); wcontext=&local; // execute it @@ -916,29 +961,21 @@ StringOrValue Request::process(Value& in return result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { +const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); // initialize contexts - root=rcontext=self=&aself; - WWrapper local(pool(), &aself); - wcontext=&local; + root=rcontext=self=&amethodFrame; + wcontext=&amethodFrame; // execute! execute(*method.parser_code); // result - const String *result=0; - if(return_cstr) { - if(Value *result_var_value=wcontext->get_element(*result_var_name)) - result=&result_var_value->as_string(); - else - result=&wcontext->as_string(); - } + const String& result=wcontext->result().as_string(); wcontext=static_cast(POP()); rcontext=POP(); @@ -949,46 +986,72 @@ const String *Request::execute_method(Va return result; } -const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { +void Request::execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string) { PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); // initialize contexts - root=rcontext=self=&amethodFrame; - wcontext=&amethodFrame; + //root=rcontext=self=&aself; + self=&aself; +// WWrapper local(pool(), &aself); +// wcontext=&local; + Junction local_junction(pool(), *self, self->get_class(), &method, 0,0,0,0); + VMethodFrame local_frame(pool(), method.name, local_junction); + if(optional_param && local_frame.can_store_param()) { + local_frame.store_param(optional_param); + local_frame.fill_unspecified_params(); + } + local_frame.set_self(*self); + root=rcontext=wcontext=&local_frame; // execute! execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); + const String *result=0; + if(return_string) { + /*if(Value *result_var_value=wcontext->get_element(*result_var_name)) + *return_string=&result_var_value->as_string(); + else + *return_string=&wcontext->as_string();*/ + *return_string=&wcontext->result().as_string(); + } wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=static_cast(POP()); - - // return - return result; +} + +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(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; -}