--- parser3/src/main/execute.C 2002/09/02 12:20:15 1.260 +++ parser3/src/main/execute.C 2002/10/15 14:28:57 1.284 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/09/02 12:20:15 $"; +static const char* IDENT_EXECUTE_C="$Date: 2002/10/15 14:28:57 $"; #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,7 +112,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"); @@ -208,7 +209,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, @@ -258,14 +259,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; @@ -286,7 +285,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); @@ -303,7 +302,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); @@ -348,7 +347,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, @@ -386,17 +385,26 @@ 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); @@ -447,19 +455,16 @@ void Request::execute(const Array& ops, method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? try { + method_frame=&frame; if(method.native_code) { // native code? - // 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()); method.native_code( *this, frame.name(), frame.numbered_params()); // execute it - } else { // parser code - method_frame=&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()); @@ -628,10 +633,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); @@ -640,7 +663,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); @@ -649,7 +672,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); @@ -695,8 +718,6 @@ void Request::execute(const Array& ops, { b=POP(); a=POP(); double result=a->as_double() - b->as_double(); - double zero=0.0; - result+=zero; value=NEW VBool(pool(), result < 0.0); PUSH(value); break; @@ -729,8 +750,6 @@ void Request::execute(const Array& ops, { b=POP(); a=POP(); double result=a->as_double() - b->as_double(); - double zero=0.0; - result+=zero; value=NEW VBool(pool(), result == 0.0); PUSH(value); break; @@ -807,10 +826,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(), - *method_frame, self->get_class(), method, 0,0,0,0); + main_class, method, 0,0,0,0); value=NEW VJunction(junction); } } @@ -831,7 +850,7 @@ Value *Request::get_element(const String _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()); @@ -879,7 +898,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 @@ -891,7 +910,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 @@ -949,10 +968,10 @@ 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); - VMethodFrame local_frame(pool(), method.name, local_junction); + Junction local_junction(pool(), *self, &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();