--- parser3/src/main/execute.C 2002/04/22 10:15:12 1.239 +++ parser3/src/main/execute.C 2002/09/17 16:00:46 1.271 @@ -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.239 2002/04/22 10:15:12 paf Exp $ */ +static const char* IDENT_EXECUTE_C="$Date: 2002/09/17 16:00:46 $"; + #include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" @@ -118,7 +118,6 @@ void Request::execute(const Array& ops) debug_dump(pool(), 0, ops); debug_printf(pool(), "execution-------------------------\n"); #endif - const String *last_get_element_name=0; Array_iter i(ops); @@ -162,11 +161,15 @@ void Request::execute(const Array& ops) // OP_WITH case OP_WITH_ROOT: { - PUSH(root); + PUSH(method_frame); break; } case OP_WITH_SELF: { + if(!self) + throw Exception("parser.runtime", + 0, + "you do not have 'self' here, use local variables"); PUSH(self); break; } @@ -187,7 +190,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: @@ -198,7 +201,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: @@ -209,16 +212,16 @@ void Request::execute(const Array& ops) debug_dump(pool(), 1, *local_ops); #endif Junction& j=*NEW Junction(pool(), - *self, 0, 0, - 0, - 0, - 0, + self, 0, + method_frame, + rcontext, + wcontext, local_ops); 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: @@ -259,9 +262,6 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT_OR_OPERATOR: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - //_asm int 3; value=get_element(last_get_element_name, true); PUSH(value); @@ -269,9 +269,6 @@ void Request::execute(const Array& ops) } case OP_GET_ELEMENT: { - // maybe they do ^object.method[] call, remember the fact - wcontext->set_somebody_entered_some_object(true); - //_asm int 3; value=get_element(last_get_element_name, false); PUSH(value); @@ -290,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; } @@ -309,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); @@ -323,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; } @@ -355,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, + self, 0, + method_frame, rcontext, op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, local_ops); @@ -410,12 +407,12 @@ 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(); + 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) { @@ -437,32 +434,16 @@ void Request::execute(const Array& ops) throw Exception("parser.runtime", &frame.name(), "method is static and can not be used as constructor"); - } else { - // this is not constructor call - - // not ^name.method call, name:method call; and - // is context object or class & is it my class or my parent's class and? - VStateless_class *read_class=rcontext->get_class(); - if( - !(wcontext->get_somebody_entered_some_object() && - !wcontext->get_somebody_entered_some_class()) && - 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 - } + } else + 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()); 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); - const Method& method=*frame.junction.method; Method::Call_type call_type= called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; @@ -471,7 +452,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()); @@ -479,7 +460,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); } @@ -497,10 +478,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()) @@ -509,9 +490,6 @@ void Request::execute(const Array& ops) if(op.code==OP_CALL__WRITE) { write_assign_lang(result, last_get_element_name); - // forget the fact they've entered some ^object.method[]. - // see OP_GET_ELEMENT - wcontext->set_somebody_entered_some_object(false); } else { // OP_CALL PUSH(&result.as_value()); } @@ -720,42 +698,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; } @@ -803,9 +787,8 @@ void Request::execute(const Array& ops) } case OP_IS: { - //_asm int 3; b=POP(); a=POP(); - value=NEW VBool(pool(), b->as_string() == a->type()); + value=NEW VBool(pool(), a->is(b->as_string().cstr())); PUSH(value); break; } @@ -823,15 +806,30 @@ Value *Request::get_element(const String const String& name=POP_NAME(); remember_name=&name; Value *ncontext=POP(); Value *value=0; - if(can_call_operator) + if(can_call_operator) { 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->native_code?method_frame/*for ^process*/:0, method, 0,0,0,0); value=NEW VJunction(junction); } + } + if(!value) { + if(!wcontext->get_constructing() // not constructing + && wcontext->get_somebody_entered_some_class() ) // ^class:method + 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 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) value=&process_to_value(*value); // process possible code-junction else @@ -860,28 +858,28 @@ StringOrValue Request::process(Value& in debug_printf(pool(), "ja->\n"); #endif - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); - - WContext *jwcontext; - self=&junction->self; - if(junction->root) { - root=junction->root; - rcontext=junction->rcontext; - jwcontext=junction->wcontext; - } else - jwcontext=wcontext; + if(!junction->method_frame) + throw Exception("parser.runtime", + 0, + "junction used outside of context"); + + Value *saved_self=self; + VMethodFrame *saved_method_frame=method_frame; + Value *saved_rcontext=rcontext; + WContext *saved_wcontext=wcontext; + + self=junction->self; + method_frame=junction->method_frame; + rcontext=junction->rcontext; // for expression method params // wcontext is set 0 // using the fact in decision "which wwrapper to use" - bool using_code_frame=intercept_string && jwcontext; + bool using_code_frame=intercept_string && junction->wcontext; if(using_code_frame) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame local(pool(), *jwcontext); + VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); wcontext=&local; // execute it @@ -893,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 @@ -902,10 +900,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"); @@ -916,79 +914,94 @@ StringOrValue Request::process(Value& in return result; } -const String *Request::execute_method(Value& aself, const Method& method, - bool return_cstr) { - 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=&aself; - WWrapper local(pool(), &aself); - wcontext=&local; + self=rcontext=wcontext=method_frame=&amethod_frame; // 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(); - root=POP(); - self=static_cast(POP()); + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + self=saved_self; // return return result; } -const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); +void Request::execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string) { + 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; + //method_frame=rcontext=self=&aself; + self=&aself; +// WWrapper local(pool(), &aself, wcontext); +// wcontext=&local; + 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); + rcontext=wcontext=method_frame=&local_frame; + + // prevent non-string writes for better error reporting + if(return_string) + wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); - - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); + const String *result=0; + if(return_string) + *return_string=&wcontext->result().as_string(); - // return - return result; + wcontext=saved_wcontext; + rcontext=saved_rcontext; + method_frame=saved_method_frame; + self=saved_self; +} + +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(Value *value=aself.get_element(method_name, &aself, false)) 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; -}