--- parser3/src/main/execute.C 2002/04/22 10:15:12 1.239 +++ parser3/src/main/execute.C 2002/08/14 14:18:28 1.253 @@ -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="$Date: 2002/08/14 14:18:28 $"; + #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); @@ -187,7 +231,7 @@ void Request::execute(const Array& ops) value=POP(); const String& name=POP_NAME(); Value *ncontext=POP(); - ncontext->put_element(name, value); + ncontext->put_element(name, value, false); break; } case OP_CONSTRUCT_EXPR: @@ -198,7 +242,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()); + ncontext->put_element(name, value->as_expr_result(), false); break; } case OP_CURLY_CODE__CONSTRUCT: @@ -210,15 +254,16 @@ 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(); Value *ncontext=POP(); - ncontext->put_element(name, value); + ncontext->put_element(name, value, false); break; } case OP_NESTED_CODE: @@ -259,9 +304,6 @@ 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(last_get_element_name, true); PUSH(value); @@ -269,9 +311,6 @@ void Request::execute(const Array& ops) } 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(last_get_element_name, false); PUSH(value); @@ -437,20 +476,8 @@ void Request::execute(const Array& ops) throw Exception("parser.runtime", &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 + self=&frame.junction.self; frame.set_self(*self); @@ -459,10 +486,6 @@ void Request::execute(const Array& ops) 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; Method::Call_type call_type= called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; @@ -500,7 +523,7 @@ void Request::execute(const Array& ops) wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) @@ -509,9 +532,6 @@ void Request::execute(const Array& ops) if(op.code==OP_CALL__WRITE) { write_assign_lang(result, last_get_element_name); - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->set_somebody_entered_some_object(false); } else { // OP_CALL PUSH(&result.as_value()); } @@ -803,9 +823,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(), false)); PUSH(value); break; } @@ -823,15 +842,30 @@ Value *Request::get_element(const String const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); Value *value=0; - if(can_call_operator) + if(can_call_operator) { if(Method* method=OP.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); 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=self->base_object()) { // doing DYNAMIC call + 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); // process possible code-junction else @@ -860,28 +894,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 @@ -905,7 +939,7 @@ StringOrValue Request::process(Value& in wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); @@ -916,79 +950,96 @@ 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(); root=POP(); - self=static_cast(POP()); + self=static_cast(POP()); // return 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; + + // 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->result().as_string(); + const String *result=0; + if(return_string) + *return_string=&wcontext->result().as_string(); wcontext=static_cast(POP()); rcontext=POP(); root=POP(); - self=static_cast(POP()); - - // return - return result; + self=static_cast(POP()); +} + +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; -}