--- parser3/src/main/execute.C 2002/08/12 14:21:52 1.249 +++ parser3/src/main/execute.C 2002/09/18 13:15:43 1.274 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/08/12 14:21:52 $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/09/18 13:15:43 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -111,49 +111,6 @@ 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 @@ -161,8 +118,6 @@ void Request::execute(const Array& ops) debug_dump(pool(), 0, ops); debug_printf(pool(), "execution-------------------------\n"); #endif - - Auto_junction_cleaner junction_cleaner; const String *last_get_element_name=0; Array_iter i(ops); @@ -206,7 +161,7 @@ void Request::execute(const Array& ops) // OP_WITH case OP_WITH_ROOT: { - PUSH(root); + PUSH(method_frame); break; } case OP_WITH_SELF: @@ -231,7 +186,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: @@ -242,7 +197,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: @@ -253,17 +208,16 @@ void Request::execute(const Array& ops) debug_dump(pool(), 1, *local_ops); #endif Junction& j=*NEW Junction(pool(), - *self, 0, 0, - root, + *self, 0, + method_frame, 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: @@ -329,17 +283,17 @@ void Request::execute(const Array& ops) { const Array *local_ops=reinterpret_cast(i.next()); - PUSH(wcontext); - PUSH((void *)flang); + WContext *saved_wcontext=wcontext; + uchar saved_lang= flang; flang=String::UL_PASS_APPENDED; - WWrapper local(pool(), 0 /*empty*/); + WWrapper local(pool(), 0 /*empty*/, wcontext); wcontext=&local; execute(*local_ops); value=&wcontext->result().as_value(); - flang=static_cast(reinterpret_cast(POP())); - wcontext=static_cast(POP()); + flang=saved_lang; + wcontext=saved_wcontext; PUSH(value); break; } @@ -348,8 +302,8 @@ void Request::execute(const Array& ops) { const Array *local_ops=reinterpret_cast(i.next()); - PUSH(wcontext); - WWrapper local(pool(), 0 /*empty*/); + WContext *saved_wcontext=wcontext; + WWrapper local(pool(), 0 /*empty*/, wcontext); wcontext=&local; execute(*local_ops); @@ -362,7 +316,7 @@ void Request::execute(const Array& ops) value=NEW VString(*string); else NEW VVoid(pool()); - wcontext=static_cast(POP()); + wcontext=saved_wcontext; PUSH(value); break; } @@ -394,8 +348,8 @@ void Request::execute(const Array& ops) // in .process we would test that field // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), - *self, 0, 0, - root, + *self, 0, + method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, local_ops); @@ -449,10 +403,10 @@ void Request::execute(const Array& ops) POP(); } frame.fill_unspecified_params(); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + Value *saved_self=self; + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; VStateless_class *called_class=frame.junction.self.get_class(); if(wcontext->get_constructing()) { @@ -477,7 +431,7 @@ void Request::execute(const Array& ops) &frame.name(), "method is static and can not be used as constructor"); } else - self=&frame.junction.self; // static call + self=&frame.junction.self; frame.set_self(*self); @@ -494,7 +448,7 @@ void Request::execute(const Array& ops) method.call_type==call_type) { // allowed call type? try { if(method.native_code) { // native code? - // root unchanged, so that ^for ^foreach & co may write to locals + // method_frame unchanged, so that ^for ^foreach & co may write to locals method.check_actual_numbered_params( frame.junction.self, frame.name(), frame.numbered_params()); @@ -502,7 +456,7 @@ void Request::execute(const Array& ops) *this, frame.name(), frame.numbered_params()); // execute it } else { // parser code - root=&frame; + method_frame=&frame; // execute it recoursion_checked_execute(&frame.name(), *method.parser_code); } @@ -520,10 +474,10 @@ void Request::execute(const Array& ops) } 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; + self=saved_self; #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) @@ -674,10 +628,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); @@ -686,7 +658,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); @@ -695,7 +667,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); @@ -740,42 +712,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; } @@ -824,7 +802,7 @@ void Request::execute(const Array& ops) case OP_IS: { b=POP(); a=POP(); - value=NEW VBool(pool(), a->as(b->as_string().cstr())!=0); + value=NEW VBool(pool(), a->is(b->as_string().cstr())); PUSH(value); break; } @@ -846,7 +824,7 @@ Value *Request::get_element(const String 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); + *method_frame, method, 0,0,0,0); value=NEW VJunction(junction); } } @@ -857,13 +835,13 @@ Value *Request::get_element(const String 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); // virtual-up lookup starting from parent + 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) @@ -894,18 +872,18 @@ StringOrValue Request::process(Value& in debug_printf(pool(), "ja->\n"); #endif - if(!junction->root) + if(!junction->method_frame) throw Exception("parser.runtime", 0, "junction used outside of context"); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + Value *saved_self=self; + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; self=&junction->self; - root=junction->root; + method_frame=junction->method_frame; rcontext=junction->rcontext; // for expression method params @@ -915,7 +893,7 @@ StringOrValue Request::process(Value& in if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *junction->wcontext); + VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); wcontext=&local; // execute it @@ -927,7 +905,7 @@ StringOrValue Request::process(Value& in result.set_string(*wcontext->get_string()); } else { // plain wwrapper - WWrapper local(pool(), 0/*empty*/); + WWrapper local(pool(), 0/*empty*/, wcontext); wcontext=&local; // execute it @@ -936,10 +914,10 @@ StringOrValue Request::process(Value& in 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; + self=saved_self; #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); @@ -950,15 +928,14 @@ StringOrValue Request::process(Value& in return result; } -const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { + Value *saved_self=self; + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; // initialize contexts - root=rcontext=self=&amethodFrame; - wcontext=&amethodFrame; + self=rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); @@ -966,10 +943,10 @@ const String& Request::execute_method(VM // result 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; + self=saved_self; // return return result; @@ -978,24 +955,24 @@ const String& Request::execute_method(VM void Request::execute_method(Value& aself, const Method& method, VString *optional_param, const String **return_string) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + Value *saved_self=self; + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; // initialize contexts - //root=rcontext=self=&aself; + //method_frame=rcontext=self=&aself; self=&aself; -// WWrapper local(pool(), &aself); +// WWrapper local(pool(), &aself, wcontext); // wcontext=&local; - Junction local_junction(pool(), *self, self->get_class(), &method, 0,0,0,0); + Junction local_junction(pool(), *self, &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; + rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting if(return_string) @@ -1009,10 +986,10 @@ void Request::execute_method(Value& asel if(return_string) *return_string=&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; + self=saved_self; } void Request::execute_nonvirtual_method(VStateless_class& aclass, @@ -1032,7 +1009,7 @@ void Request::execute_nonvirtual_method( 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) { const String *result; @@ -1042,4 +1019,3 @@ const String *Request::execute_virtual_m return 0; } -