--- parser3/src/main/execute.C 2001/04/03 05:23:41 1.136 +++ parser3/src/main/execute.C 2001/05/16 16:48:56 1.157 @@ -5,31 +5,33 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.136 2001/04/03 05:23:41 paf Exp $ + $Id: execute.C,v 1.157 2001/05/16 16:48:56 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" + +//#define DEBUG_EXECUTE -#include #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) #define POP_NAME() static_cast(stack.pop())->as_string() - +#ifdef DEBUG_EXECUTE char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", @@ -48,7 +50,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", @@ -59,7 +61,6 @@ char *opcode_name[]={ }; void va_log_printf(Pool& pool, const char *fmt,va_list args) { - 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.quick_size(); //log_printf(pool, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); +#ifdef DEBUG_EXECUTE log_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); +#endif PUSH(value); break; } @@ -136,29 +142,22 @@ void Request::execute(const Array& ops) VMethodFrame *frame=static_cast(stack.top_value()); // code const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); +#ifdef DEBUG_EXECUTE log_printf(pool(), " (%d)\n", local_ops->size()); 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. - // +#endif // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame // it must go into any expressions using that parameter - // hence, zeroing junction.wcontext being created - // later, in .process we would test that field + // hence, we zero junction.wcontext here, and later + // in .process we would test that field // in decision "which wwrapper to use" Junction& j=*NEW Junction(pool(), *self, 0, 0, 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() */, + rcontext, + op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, local_ops); Value *value=NEW VJunction(j); @@ -177,7 +176,7 @@ void Request::execute(const Array& ops) if(!value) THROW(0,0, &name, - ": undefined class"); + "class is undefined"); PUSH(value); break; @@ -228,6 +227,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: @@ -239,7 +242,9 @@ void Request::execute(const Array& ops) case OP_STRING__WRITE: { VString *vstring=static_cast(ops.quick_get(++i)); +#ifdef DEBUG_EXECUTE log_printf(pool(), " \"%s\"", vstring->string().cstr()); +#endif write_no_lang(vstring->string()); break; } @@ -265,12 +270,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; @@ -280,9 +288,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: @@ -301,7 +309,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: @@ -323,6 +331,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 @@ -333,8 +342,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; } @@ -348,7 +362,9 @@ void Request::execute(const Array& ops) case OP_CALL: { +#ifdef DEBUG_EXECUTE log_printf(pool(), "->\n"); +#endif VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); PUSH(self); @@ -357,20 +373,23 @@ 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()); - else if(called_class==file_class) - self=NEW VFile(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, @@ -393,7 +412,7 @@ void Request::execute(const Array& ops) 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( + method.check_actual_numbered_params(pool(), frame->junction.self, frame->name(), frame->numbered_params()); (*method.native_code)( @@ -416,7 +435,9 @@ void Request::execute(const Array& ops) self=static_cast(POP()); PUSH(value); +#ifdef DEBUG_EXECUTE log_printf(pool(), "<-returned"); +#endif break; } @@ -431,7 +452,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; } @@ -453,7 +474,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; } @@ -465,6 +487,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: @@ -499,8 +529,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; } @@ -508,8 +538,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; } @@ -517,8 +547,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; } @@ -526,8 +556,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; } @@ -647,7 +677,7 @@ void Request::execute(const Array& ops) default: THROW(0,0, 0, - "unhandled '%s' opcode", opcode_name[op.code]); + "invalid opcode %d", op.code); } } } @@ -655,8 +685,14 @@ void Request::execute(const Array& ops) 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 { @@ -682,7 +718,9 @@ Value& Request::process(Value& value, co Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? // process it +#ifdef DEBUG_EXECUTE log_printf(pool(), "ja->\n"); +#endif PUSH(self); PUSH(root); PUSH(rcontext); @@ -720,7 +758,9 @@ Value& Request::process(Value& value, co root=POP(); self=static_cast(POP()); +#ifdef DEBUG_EXECUTE log_printf(pool(), "<-ja returned"); +#endif } else result=&value; @@ -737,7 +777,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);