--- parser3/src/main/execute.C 2001/03/27 16:35:54 1.128 +++ parser3/src/main/execute.C 2001/05/15 10:01:25 1.156 @@ -5,22 +5,24 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.128 2001/03/27 16:35:54 paf Exp $ + $Id: execute.C,v 1.156 2001/05/15 10:01:25 parser Exp $ */ #include "pa_config_includes.h" -#include "code.h" +#include "pa_opcode.h" #include "pa_array.h" #include "pa_request.h" #include "pa_vstring.h" #include "pa_vhash.h" #include "pa_vunknown.h" -#include "pa_vcframe.h" -#include "pa_vmframe.h" +#include "pa_vcode_frame.h" +#include "pa_vmethod_frame.h" #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_vbool.h" #include "pa_vtable.h" +#include "pa_vfile.h" +#include "pa_vimage.h" #include @@ -47,7 +49,7 @@ char *opcode_name[]={ "CALL", // expression ops: unary - "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", + "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary "SUB", "ADD", "MUL", "DIV", "MOD", "BIN_AND", "BIN_OR", "BIN_XOR", @@ -73,7 +75,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 +115,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; iset_somebody_entered_some_class(); const String& name=POP_NAME(); @@ -161,7 +170,7 @@ void Request::execute(const Array& ops) if(!value) THROW(0,0, &name, - ": undefined class"); + "class is undefined"); PUSH(value); break; @@ -212,6 +221,10 @@ void Request::execute(const Array& ops) { Value *value=POP(); write_assign_lang(*value); + + // forget the fact they've entered some ^object.method[]. + // see OP_GET_ELEMENT + wcontext->clear_somebody_entered_some_object(); break; } case OP_WRITE_EXPR_RESULT: @@ -230,6 +243,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 +262,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; @@ -261,9 +280,9 @@ void Request::execute(const Array& ops) { Value *ncontext=POP(); PUSH(rcontext); - rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); + rcontext=ncontext; + wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); break; } case OP_REDUCE_RWPOOL: @@ -282,7 +301,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 +323,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,8 +334,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); - frame->set_name(value->name()); + 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); PUSH(frame); break; } @@ -338,22 +363,27 @@ void Request::execute(const Array& ops) PUSH(wcontext); VStateless_class *called_class=frame->junction.self.get_class(); - // is context object or class & is it my class or my parent's 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(read_class && read_class->is_or_derived_from(*called_class)) // yes + 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) - if( - wcontext->constructing() && // constructing? - wcontext->somebody_entered_some_class()) { // ^class:method[..]? - // yes, this is a constructor call - // some stateless_object derivates with constructors - if(called_class==table_class) - self=NEW VTable(pool()); + // 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) { + // this is a constructor call + // some stateless_object creatable derivates + if(Value *value=called_class->create_new_value(pool())) + self=value; 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 +396,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(pool(), + 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(); @@ -399,7 +440,7 @@ void Request::execute(const Array& ops) case OP_INV: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), ~(int)operand->as_double()); + Value *value=NEW VDouble(pool(), ~operand->as_int()); PUSH(value); break; } @@ -421,7 +462,8 @@ void Request::execute(const Array& ops) { Value *operand=POP(); const char *path=operand->as_string().cstr(); - Value *value=NEW VBool(pool(), info.uri && strcmp(path, info.uri)<=0); + Value *value=NEW VBool(pool(), + info.uri && strncmp(path, info.uri, strlen(path))==0); PUSH(value); break; } @@ -433,6 +475,14 @@ void Request::execute(const Array& ops) PUSH(value); break; } + case OP_DEXISTS: + { + Value *operand=POP(); + Value *value=NEW VBool(pool(), + dir_readable(absolute(operand->as_string()))); + PUSH(value); + break; + } // expression ops: binary case OP_SUB: @@ -467,8 +517,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->as_double() % - (int)b->as_double()); + a->as_int() % + b->as_int()); PUSH(value); break; } @@ -476,8 +526,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->as_double() & - (int)b->as_double()); + a->as_int() & + b->as_int()); PUSH(value); break; } @@ -485,8 +535,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->as_double() | - (int)b->as_double()); + a->as_int() | + b->as_int()); PUSH(value); break; } @@ -494,8 +544,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - (int)a->as_double() ^ - (int)b->as_double()); + a->as_int() ^ + b->as_int()); PUSH(value); break; } @@ -615,17 +665,22 @@ 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"); } } Value *Request::get_element() { const String& name=POP_NAME(); Value *ncontext=POP(); - Value *value=ncontext->get_element(name); - + 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); if(value) value=&process(*value, &name); // process possible code-junction else { @@ -655,7 +710,7 @@ Value& Request::process(Value& value, co PUSH(self); PUSH(root); PUSH(rcontext); - PUSH(wcontext); + PUSH(wcontext); WContext *frame; // for expression method params @@ -706,7 +761,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);