--- parser3/src/main/execute.C 2001/04/09 10:08:30 1.142 +++ parser3/src/main/execute.C 2001/05/08 05:50:01 1.154 @@ -5,23 +5,24 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.142 2001/04/09 10:08:30 paf Exp $ + $Id: execute.C,v 1.154 2001/05/08 05:50:01 paf 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 @@ -48,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", @@ -139,26 +140,18 @@ void Request::execute(const Array& ops) 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. - // // 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 +170,7 @@ void Request::execute(const Array& ops) if(!value) THROW(0,0, &name, - "class undefined"); + "class is undefined"); PUSH(value); break; @@ -228,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: @@ -283,8 +280,8 @@ void Request::execute(const Array& ops) { Value *ncontext=POP(); PUSH(rcontext); - rcontext=ncontext; PUSH(wcontext); + rcontext=ncontext; wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/); break; } @@ -367,18 +364,22 @@ 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? 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(frame->is_constructor) { + // were are constructing something and + // our constructor is just method call + if(frame->is_constructor && + wcontext->somebody_entered_some_object()==1) { // 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()); + // 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, @@ -401,7 +402,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)( @@ -461,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; } @@ -473,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: @@ -663,14 +673,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); - 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); - } + 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 {