--- parser3/src/main/execute.C 2001/06/27 12:44:33 1.167 +++ parser3/src/main/execute.C 2001/08/02 09:58:34 1.190 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: execute.C,v 1.167 2001/06/27 12:44:33 parser Exp $ */ +static const char *RCSId="$Id: execute.C,v 1.190 2001/08/02 09:58:34 parser Exp $"; #include "pa_opcode.h" #include "pa_array.h" @@ -25,7 +24,7 @@ //#define DEBUG_EXECUTE -const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; +const uint ANTI_ENDLESS_EXECUTE_RECOURSION=400; #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -33,17 +32,16 @@ char *opcode_name[]={ "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", // actions - "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", + "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "GET_CLASS", - "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", + "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", - "CREATE_RWPOOL", "REDUCE_RWPOOL", "CREATE_SWPOOL", "REDUCE_SWPOOL", "GET_METHOD_FRAME", "STORE_PARAM", - "CALL", + "PREPARE_TO_CONSTRUCT_OBJECT", "CALL", // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", @@ -70,24 +68,13 @@ void debug_printf(Pool& pool, const char } void debug_dump(Pool& pool, int level, const Array& ops) { - { - int size=ops.quick_size(); - //debug_printf(pool, "size=%d\n", size); - for(int i=0; i(ops.quick_get(++i)); + Value *value=static_cast(i.next()); debug_printf(pool, "%*s%s" " \"%s\" %s", @@ -97,8 +84,11 @@ void debug_dump(Pool& pool, int level, c } debug_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); - if(op.code==OP_CURLY_CODE__STORE_PARAM || op.code==OP_EXPR_CODE__STORE_PARAM) { - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + switch(op.code) { + case OP_CURLY_CODE__STORE_PARAM: + case OP_EXPR_CODE__STORE_PARAM: + case OP_CURLY_CODE__CONSTRUCT: + const Array *local_ops=reinterpret_cast(i.next()); debug_dump(pool, level+1, *local_ops); } } @@ -116,11 +106,10 @@ void Request::execute(const Array& ops) debug_printf(pool(), "execution-------------------------\n"); #endif - int size=ops.quick_size(); - //debug_printf(pool(), "size=%d\n", size); - for(int i=0; i(ops.quick_get(++i)); + Value *value=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); #endif @@ -141,7 +130,7 @@ void Request::execute(const Array& ops) { VMethodFrame *frame=static_cast(stack.top_value()); // code - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + const Array *local_ops=reinterpret_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " (%d)\n", local_ops->size()); debug_dump(pool(), 1, *local_ops); @@ -183,14 +172,14 @@ void Request::execute(const Array& ops) } // OP_WITH - case OP_WITH_SELF: + case OP_WITH_ROOT: { - PUSH(self); + PUSH(root); break; } - case OP_WITH_ROOT: + case OP_WITH_SELF: { - PUSH(root); + PUSH(self); break; } case OP_WITH_READ: @@ -223,6 +212,27 @@ void Request::execute(const Array& ops) value->set_name(name); break; } + case OP_CURLY_CODE__CONSTRUCT: + { + const Array *local_ops=reinterpret_cast(i.next()); +#ifdef DEBUG_EXECUTE + debug_printf(pool(), " (%d)\n", local_ops->size()); + debug_dump(pool(), 1, *local_ops); +#endif + Junction& j=*NEW Junction(pool(), + *self, 0, 0, + root, + rcontext, + wcontext, + local_ops); + + Value *value=NEW VJunction(j); + const String& name=POP_NAME(); + Value *ncontext=POP(); + ncontext->put_element(name, value); + value->set_name(name); + break; + } case OP_WRITE_VALUE: { Value *value=POP(); @@ -241,7 +251,7 @@ void Request::execute(const Array& ops) } case OP_STRING__WRITE: { - VString *vstring=static_cast(ops.quick_get(++i)); + VString *vstring=static_cast(i.next()); #ifdef DEBUG_EXECUTE debug_printf(pool(), " \"%s\"", vstring->string().cstr()); #endif @@ -254,6 +264,7 @@ void Request::execute(const Array& ops) // maybe they do ^object.method[] call, remember the fact wcontext->inc_somebody_entered_some_object(); + //_asm int 3; Value *value=get_element(); PUSH(value); break; @@ -272,7 +283,7 @@ void Request::execute(const Array& ops) PUSH(wcontext); PUSH((void *)flang); flang=String::UL_PASS_APPENDED; - wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/); + wcontext=NEW WWrapper(pool(), 0 /*empty*/); break; } case OP_REDUCE_EWPOOL: @@ -284,32 +295,10 @@ void Request::execute(const Array& ops) break; } - case OP_CREATE_RWPOOL: - { - Value *ncontext=POP(); - PUSH(rcontext); - PUSH(wcontext); - rcontext=ncontext; - wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); - break; - } - case OP_REDUCE_RWPOOL: - { - const String *string=wcontext->get_string(); - Value *value; - if(string) - value=NEW VString(*string); - else - value=NEW VVoid(pool()); - wcontext=static_cast(POP()); - rcontext=POP(); - PUSH(value); - break; - } case OP_CREATE_SWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/); + wcontext=NEW WWrapper(pool(), 0 /*empty*/); break; } case OP_REDUCE_SWPOOL: @@ -337,18 +326,12 @@ void Request::execute(const Array& ops) // not a code-junction Junction *junction=value->get_junction(); if(!junction) - THROW(0,0, + THROW(0, 0, &value->name(), "(%s) not a method or junction, can not call it", value->type()); - bool is_constructor= - wcontext->constructing() && // constructing? - wcontext->somebody_entered_some_class(); // ^class:method[..]? - if(is_constructor) - wcontext->constructing(false); - - VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction, is_constructor); + VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction); PUSH(frame); break; } @@ -360,6 +343,11 @@ void Request::execute(const Array& ops) break; } + case OP_PREPARE_TO_CONSTRUCT_OBJECT: + { + wcontext->constructing(true); + break; + } case OP_CALL: { #ifdef DEBUG_EXECUTE @@ -373,30 +361,39 @@ void Request::execute(const Array& ops) PUSH(wcontext); VStateless_class *called_class=frame->junction.self.get_class(); - // not ^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->somebody_entered_some_object() && - read_class && read_class->is_or_derived_from(*called_class)) // yes - self=rcontext; // class dynamic call - else // no, not me or relative of mine (total stranger) - // were are constructing something and - // our constructor is just method call and - // not static-only-method call - if(frame->is_constructor && - wcontext->somebody_entered_some_object()==1 && - frame->junction.method->call_type!=Method::CT_STATIC) { + if(wcontext->constructing()) { + wcontext->constructing(false); + if(frame->junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - // some stateless_object creatable derivates - if(Value *value=called_class->create_new_value(pool())) + + if(Value *value=called_class->create_new_value(pool())) { + // some stateless_object creatable derivates self=value; - else // stateful object + } else { + // stateful object self=NEW VObject(pool(), *called_class); + } frame->write(*self, String::UL_CLEAN // not used, always an object, not string ); - } else - self=&frame->junction.self; // no, static or simple dynamic call + } else + THROW(0, 0, + &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->somebody_entered_some_object() && + !wcontext->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 + } frame->set_self(*self); root=rcontext=wcontext=frame; @@ -530,16 +527,44 @@ void Request::execute(const Array& ops) case OP_DIV: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), a->as_double() / b->as_double()); + + double a_double=a->as_double(); + double b_double=b->as_double(); + + if(b_double == 0) { + const String *problem_source=&b->as_string(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif + THROW(0, 0, + problem_source, + "Division by zero"); + } + + Value *value=NEW VDouble(pool(), a_double / b_double); PUSH(value); break; } case OP_MOD: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->as_int() % - b->as_int()); + + double a_double=a->as_double(); + double b_double=b->as_double(); + + if(b_double == 0) { + const String *problem_source=&b->as_string(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif + THROW(0, 0, + problem_source, + "Modulus by zero"); + } + + Value *value=NEW VDouble(pool(), fmod(a_double, b_double)); PUSH(value); break; } @@ -694,14 +719,14 @@ void Request::execute(const Array& ops) Value *Request::get_element() { const String& name=POP_NAME(); Value *ncontext=POP(); - Value *value; - if(Method* method=OP.get_method(name)) { // operator? - // as if that method were in self and we have normal dynamic method here - Junction& junction=*NEW Junction(pool(), - *self, self->get_class(), method, 0,0,0,0); - value=NEW VJunction(junction); - } else - value=ncontext->get_element(name); + Value *value=ncontext->get_element(name); + if(!value) + if(Method* method=OP.get_method(name)) { // maybe operator? + // as if that method were in self and we have normal dynamic method here + Junction& junction=*NEW Junction(pool(), + *self, self->get_class(), method, 0,0,0,0); + value=NEW VJunction(junction); + } if(value) value=&process(*value, &name); // process possible code-junction else { @@ -745,9 +770,10 @@ Value& Request::process(Value& value, co frame=NEW VCodeFrame(pool(), *junction->wcontext); } else { // plain wwrapper - frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/); + frame=NEW WWrapper(pool(), 0/*empty*/); } + //frame->set_name(value.name()); wcontext=frame; self=&junction->self; root=junction->root; @@ -777,7 +803,8 @@ Value& Request::process(Value& value, co return *result; } -const String *Request::execute_method(Value& aself, const Method& method, bool return_cstr) { +const String *Request::execute_method(Value& aself, const Method& method, + bool return_cstr) { PUSH(self); PUSH(root); PUSH(rcontext); @@ -785,7 +812,7 @@ const String *Request::execute_method(Va // initialize contexts root=rcontext=self=&aself; - wcontext=NEW WWrapper(pool(), &aself, false /*not constructing*/); + wcontext=NEW WWrapper(pool(), &aself); // execute! execute(*method.parser_code); @@ -806,12 +833,22 @@ const String *Request::execute_method(Va return result; } -const String *Request::execute_method(Value& aself, - const String& method_name, bool return_cstr) { +const String *Request::execute_virtual_method(Value& aself, + const String& method_name, + bool return_cstr) { if(Value *value=aself.get_element(method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) return execute_method(aself, *method, return_cstr); + + 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; }