--- parser3/src/main/execute.C 2002/08/13 13:02:40 1.251 +++ parser3/src/main/execute.C 2002/10/22 09:40:11 1.287 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/08/13 13:02:40 $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/10/22 09:40:11 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -54,6 +54,7 @@ char *opcode_name[]={ "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", @@ -111,49 +112,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 +119,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,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: @@ -221,6 +177,11 @@ void Request::execute(const Array& ops) } case OP_WITH_WRITE: { + if(wcontext==method_frame) + throw Exception("parser.runtime", + 0, + "$.name outside of $name[...]"); + PUSH(wcontext); break; } @@ -253,12 +214,11 @@ 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); - junction_cleaner.register_junction(pool(), j); value=NEW VJunction(j); const String& name=POP_NAME(); @@ -304,14 +264,12 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT_OR_OPERATOR: { - //_asm int 3; value=get_element(last_get_element_name, true); PUSH(value); break; } case OP_GET_ELEMENT: { - //_asm int 3; value=get_element(last_get_element_name, false); PUSH(value); break; @@ -329,17 +287,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 +306,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 +320,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 +352,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, + *get_self(), 0, + method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, local_ops); @@ -432,29 +390,38 @@ void Request::execute(const Array& ops) #endif 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()); + /* 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); + 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(); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; 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) { @@ -462,14 +429,14 @@ void Request::execute(const Array& ops) 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(), "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 @@ -477,9 +444,9 @@ void Request::execute(const Array& ops) &frame.name(), "method is static and can not be used as constructor"); } else - self=&frame.junction.self; + 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()); @@ -488,24 +455,21 @@ void Request::execute(const Array& ops) { 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()); method.native_code( *this, frame.name(), frame.numbered_params()); // execute it - } else { // parser code - root=&frame; - // 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()); @@ -520,10 +484,9 @@ 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; #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS if(const String *s=value->get_string()) @@ -674,10 +637,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 +667,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 +676,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 +721,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 +811,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; } @@ -843,10 +830,10 @@ Value *Request::get_element(const String Value *ncontext=POP(); Value *value=0; if(can_call_operator) { - if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST + 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); } } @@ -856,18 +843,18 @@ Value *Request::get_element(const String 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); // virtual-up lookup starting from parent + 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, ncontext); + value=ncontext->get_element(name, ncontext, false); _void: if(value) - value=&process_to_value(*value); // process possible code-junction + value=&process_to_value(*value); // process possible code-junction else value=NEW VVoid(pool()); @@ -894,18 +881,16 @@ 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); + 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 +900,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 +912,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 +921,9 @@ 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; #ifdef DEBUG_EXECUTE debug_printf(pool(), "<-ja returned"); @@ -950,15 +934,13 @@ 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) { + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; // initialize contexts - root=rcontext=self=&amethodFrame; - wcontext=&amethodFrame; + rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); @@ -966,10 +948,9 @@ 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; // return return result; @@ -978,24 +959,18 @@ 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); + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; - // initialize contexts - //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); + 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(*self); - root=rcontext=wcontext=&local_frame; + local_frame.set_self(aself); + rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting if(return_string) @@ -1009,10 +984,9 @@ 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; } void Request::execute_nonvirtual_method(VStateless_class& aclass, @@ -1032,7 +1006,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, &aself)) + 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 +1016,3 @@ const String *Request::execute_virtual_m return 0; } -