--- parser3/src/main/execute.C 2002/09/02 14:27:54 1.261 +++ parser3/src/main/execute.C 2002/09/17 16:00:46 1.271 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/09/02 14:27:54 $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/09/17 16:00:46 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -111,7 +111,7 @@ void debug_dump(Pool& pool, int level, c #define POP_NAME() static_cast(stack.pop())->as_string() #define POP_CODE() static_cast(stack.pop()) -void Request::execute(const Array& ops, bool clean_junctions) { +void Request::execute(const Array& ops) { // _asm int 3; #ifdef DEBUG_EXECUTE debug_printf(pool(), "source----------------------------\n"); @@ -130,8 +130,6 @@ void Request::execute(const Array& ops, Value *value; Value *a; Value *b; - bool bool_result; - double double_result; Array *b_code; switch(op.code) { // param in next instruction @@ -168,6 +166,10 @@ void Request::execute(const Array& ops, } case OP_WITH_SELF: { + if(!self) + throw Exception("parser.runtime", + 0, + "you do not have 'self' here, use local variables"); PUSH(self); break; } @@ -210,7 +212,7 @@ void Request::execute(const Array& ops, debug_dump(pool(), 1, *local_ops); #endif Junction& j=*NEW Junction(pool(), - *self, 0, 0, + self, 0, method_frame, rcontext, wcontext, @@ -288,7 +290,7 @@ void Request::execute(const Array& ops, 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); @@ -305,7 +307,7 @@ void Request::execute(const Array& ops, const Array *local_ops=reinterpret_cast(i.next()); WContext *saved_wcontext=wcontext; - WWrapper local(pool(), 0 /*empty*/); + WWrapper local(pool(), 0 /*empty*/, wcontext); wcontext=&local; execute(*local_ops); @@ -350,7 +352,7 @@ 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, + self, 0, method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, @@ -410,7 +412,7 @@ void Request::execute(const Array& ops, Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - VStateless_class *called_class=frame.junction.self.get_class(); + VStateless_class *called_class=frame.junction.self?frame.junction.self->get_class():0; if(wcontext->get_constructing()) { wcontext->set_constructing(false); if(frame.junction.method->call_type!=Method::CT_STATIC) { @@ -433,9 +435,9 @@ void Request::execute(const Array& ops, &frame.name(), "method is static and can not be used as constructor"); } else - self=&frame.junction.self; + self=frame.junction.self; - frame.set_self(*self); + frame.set_self(self); // see OP_PREPARE_TO_EXPRESSION frame.set_in_expression(wcontext->get_in_expression()); @@ -660,27 +662,29 @@ void Request::execute(const Array& ops, case OP_LOG_AND: { b_code=POP_CODE(); a=POP(); + bool result; if(a->as_bool()) { execute(*b_code); b=POP(); - bool_result=b->as_bool(); + result=b->as_bool(); } else - bool_result=false; - value=NEW VBool(pool(), bool_result); + result=false; + value=NEW VBool(pool(), result); PUSH(value); break; } case OP_LOG_OR: { b_code=POP_CODE(); a=POP(); + bool result; if(a->as_bool()) - bool_result=true; + result=true; else { execute(*b_code); b=POP(); - bool_result=b->as_bool(); + result=b->as_bool(); } - value=NEW VBool(pool(), bool_result); + value=NEW VBool(pool(), result); PUSH(value); break; } @@ -694,48 +698,48 @@ void Request::execute(const Array& ops, case OP_NUM_LT: { b=POP(); a=POP(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result < 0); + 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(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result > 0); + 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(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result <= 0); + 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(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result >= 0); + 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(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result== 0); + 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(); - double_result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), double_result != 0); + double result=a->as_double() - b->as_double(); + value=NEW VBool(pool(), result != 0.0); PUSH(value); break; } @@ -806,7 +810,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(), - *method_frame, self->get_class(), method, 0,0,0,0); + method->native_code?method_frame/*for ^process*/:0, method, 0,0,0,0); value=NEW VJunction(junction); } } @@ -864,7 +868,7 @@ StringOrValue Request::process(Value& in Value *saved_rcontext=rcontext; WContext *saved_wcontext=wcontext; - self=&junction->self; + self=junction->self; method_frame=junction->method_frame; rcontext=junction->rcontext; @@ -875,7 +879,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 @@ -887,7 +891,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 @@ -945,15 +949,15 @@ void Request::execute_method(Value& asel // initialize contexts //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); + local_frame.set_self(self); rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting