--- parser3/src/main/execute.C 2002/04/18 10:51:01 1.236 +++ 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.236 2002/04/18 10:51:01 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" @@ -46,7 +46,6 @@ char *opcode_name[]={ "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", "OBJECT_POOL", "STRING_POOL", - "GET_METHOD_FRAME", "STORE_PARAM", "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", @@ -99,6 +98,7 @@ void debug_dump(Pool& pool, int level, c 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); } @@ -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); @@ -143,36 +187,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 @@ -244,7 +258,8 @@ void Request::execute(const Array& ops) rcontext, wcontext, local_ops); - + junction_cleaner.register_junction(pool(), j); + value=NEW VJunction(j); const String& name=POP_NAME(); Value *ncontext=POP(); @@ -359,29 +374,43 @@ void Request::execute(const Array& ops) } // 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", - last_get_element_name, - "(%s) not a method or junction, can not call it", - value->type()); - - VMethodFrame *frame=NEW VMethodFrame(pool(), *last_get_element_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(), + *self, 0, 0, + root, + 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; } @@ -400,20 +429,41 @@ 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(); + 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", + last_get_element_name, + "(%s) not a method or junction, can not call it", + value->type()); + + VMethodFrame frame(pool(), *last_get_element_name, *junction); + if(local_ops){ // store param code goes here + PUSH(&frame); // argument for *STORE_PARAM ops + execute(*local_ops); + POP(); + } + frame.fill_unspecified_params(); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - VStateless_class *called_class=frame->junction.self.get_class(); + VStateless_class *called_class=frame.junction.self.get_class(); 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())) { @@ -421,16 +471,16 @@ void Request::execute(const Array& ops) 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(*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 @@ -444,21 +494,21 @@ void Request::execute(const Array& ops) 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 + self=&frame.junction.self; // static call } - frame->set_self(*self); + frame.set_self(*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); + 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; if( @@ -468,24 +518,24 @@ void Request::execute(const Array& ops) 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 + frame.name(), frame.numbered_params()); // execute it } else { // parser code - root=frame; + root=&frame; // execute it - recoursion_checked_execute(&frame->name(), *method.parser_code); + 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"); @@ -854,6 +904,12 @@ StringOrValue Request::process(Value& in #ifdef DEBUG_EXECUTE 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); @@ -905,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(); @@ -938,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; -}