--- parser3/src/main/execute.C 2001/03/27 17:12:23 1.129 +++ parser3/src/main/execute.C 2001/04/09 10:08:30 1.142 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.129 2001/03/27 17:12:23 paf Exp $ + $Id: execute.C,v 1.142 2001/04/09 10:08:30 paf Exp $ */ #include "pa_config_includes.h" @@ -21,6 +21,7 @@ #include "pa_vdouble.h" #include "pa_vbool.h" #include "pa_vtable.h" +#include "pa_vfile.h" #include @@ -58,7 +59,7 @@ char *opcode_name[]={ }; void va_log_printf(Pool& pool, const char *fmt,va_list args) { -// return; + return; char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); SAPI::log(pool, "%s", buf); @@ -73,7 +74,7 @@ void log_printf(Pool& pool, const char * void dump(Pool& pool, int level, const Array& ops) { if(0){ - int size=ops.size(); + int size=ops.quick_size(); //log_printf(pool, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - log_printf(pool, " \"%s\" %s", value->get_string()->cstr(), value->type()); + log_printf(pool, + "%*s%s" + " \"%s\" %s", + level*4, "", opcode_name[op.code], + value->get_string()->cstr(), value->type()); + continue; } - //\log_printf(pool, "\n"); + log_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)); @@ -109,7 +114,7 @@ void Request::execute(const Array& ops) log_printf(pool(), "execution-------------------------\n"); } - int size=ops.size(); + int size=ops.quick_size(); //log_printf(pool(), "size=%d\n", size); for(int i=0; isize()); dump(pool(), 1, *local_ops); + // when called method of some object, specifying object literally, + // e.g ^t.menu, code of curly params must be executed + // in r/w context of that object. + // otherwise in current r/w context. + // // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame @@ -143,7 +153,13 @@ void Request::execute(const Array& ops) // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), *self, 0, 0, - root, frame, op.code==OP_EXPR_CODE__STORE_PARAM?0:frame, local_ops); + root, + wcontext->somebody_entered_some_object()>1? + &frame->junction.self /*^t.menu{}*/:rcontext/*^if()*/, + op.code==OP_EXPR_CODE__STORE_PARAM? + 0:wcontext->somebody_entered_some_object()>1? + frame/*^t.menu{}*/:wcontext/*^if()*/, + local_ops); Value *value=NEW VJunction(j); @@ -153,7 +169,7 @@ void Request::execute(const Array& ops) } case OP_GET_CLASS: { - // maybe the do ^class:method[] call, remember the fact + // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); const String& name=POP_NAME(); @@ -161,7 +177,7 @@ void Request::execute(const Array& ops) if(!value) THROW(0,0, &name, - ": undefined class"); + "class undefined"); PUSH(value); break; @@ -230,6 +246,9 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT: { + // maybe they do ^object.method[] call, remember the fact + wcontext->inc_somebody_entered_some_object(); + Value *value=get_element(); PUSH(value); break; @@ -246,12 +265,15 @@ void Request::execute(const Array& ops) case OP_CREATE_EWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */); + PUSH((void *)flang); + flang=String::UL_PASS_APPENDED; + wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/); break; } case OP_REDUCE_EWPOOL: { Value *value=wcontext->result(); + flang=static_cast(reinterpret_cast(POP())); wcontext=static_cast(POP()); PUSH(value); break; @@ -263,7 +285,7 @@ void Request::execute(const Array& ops) PUSH(rcontext); rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); + wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); break; } case OP_REDUCE_RWPOOL: @@ -282,7 +304,7 @@ void Request::execute(const Array& ops) case OP_CREATE_SWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */); + wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/); break; } case OP_REDUCE_SWPOOL: @@ -304,6 +326,7 @@ void Request::execute(const Array& ops) case OP_GET_METHOD_FRAME: { Value *value=POP(); + // info: // code compiled so that this one's always method-junction, // not a code-junction @@ -314,7 +337,13 @@ void Request::execute(const Array& ops) "(%s) not a method or junction, can not call it", value->type()); - VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); + bool is_constructor= + wcontext->constructing() && // constructing? + wcontext->somebody_entered_some_class(); // ^class:method[..]? + if(is_constructor) + wcontext->constructing(false); + + VMethodFrame *frame=NEW VMethodFrame(pool(), *junction, is_constructor); frame->set_name(value->name()); PUSH(frame); break; @@ -343,17 +372,17 @@ void Request::execute(const Array& ops) if(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) - if( - wcontext->constructing() && // constructing? - wcontext->somebody_entered_some_class()) { // ^class:method[..]? - // yes, this is a constructor call + if(frame->is_constructor) { + // this is a constructor call // some stateless_object derivates with constructors if(called_class==table_class) self=NEW VTable(pool()); + else if(called_class==file_class) + self=NEW VFile(pool()); else // stateful object self=NEW VObject(pool(), *called_class); frame->write(*self, - String::UL_NO // not used, always an object, not string + String::UL_CLEAN // not used, always an object, not string ); } else self=&frame->junction.self; // no, static or simple dynamic call @@ -366,15 +395,26 @@ void Request::execute(const Array& ops) Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass); const Method& method=*frame->junction.method; - if(method.native_code) { // native code? - 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 - execute(*method.parser_code); // execute it + Method::Call_type call_type= + called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; + if( + method.call_type==Method::CT_ANY || + method.call_type==call_type) // allowed call type? + if(method.native_code) { // native code? + 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 + execute(*method.parser_code); // execute it + else + THROW(0, 0, + &frame->name(), + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + } Value *value=wcontext->result(); @@ -615,9 +655,8 @@ void Request::execute(const Array& ops) default: THROW(0,0, 0, - "unhandled '%s' opcode", opcode_name[op.code]); + "invalid opcode %d", op.code); } - //\log_printf(pool(), "\n"); } } @@ -625,7 +664,13 @@ Value *Request::get_element() { const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); - + if(!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); + } if(value) value=&process(*value, &name); // process possible code-junction else { @@ -706,7 +751,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, false /*not constructing*/); // execute! execute(*method.parser_code);