--- parser3/src/main/execute.C 2001/03/12 18:13:50 1.96 +++ parser3/src/main/execute.C 2001/03/13 14:28:51 1.103 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.96 2001/03/12 18:13:50 paf Exp $ + $Id: execute.C,v 1.103 2001/03/13 14:28:51 paf Exp $ */ #include "pa_array.h" @@ -50,7 +50,8 @@ char *opcode_name[]={ "BIN_AND", "BIN_OR", "BIN_XOR", "LOG_AND", "LOG_OR", "LOG_XOR", "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", - "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE" + "STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE", + "IS" }; void dump(int level, const Array& ops) { @@ -128,6 +129,9 @@ void Request::execute(const Array& ops) } case OP_GET_CLASS: { + // maybe the do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + const String& name=POP_NAME(); VClass *vclass=static_cast(classes().get(name)); if(!vclass) @@ -302,16 +306,20 @@ void Request::execute(const Array& ops) PUSH(rcontext); PUSH(wcontext); - VClass *called_class=frame->junction.self.get_class(); + VStateless_class *called_class=frame->junction.self.get_class(); // is context object or class & is it my class or my parent's class? - VClass *read_class=rcontext->get_class(); + VStateless_class *read_class=rcontext->get_class(); 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? - // yes, constructor call: $some[^class:method[..]] + if( + wcontext->constructing() && // constructing? + wcontext->somebody_entered_some_class()) { // ^class:method[..]? + // yes, this is a constructor call if(called_class->name()==TABLE_CLASS_NAME) self=NEW VTable(pool()); + else if(called_class->name()==ENV_CLASS_NAME) + self=NEW VEnv(pool()); else self=NEW VObject(pool(), *called_class); frame->write(*self, @@ -324,11 +332,10 @@ void Request::execute(const Array& ops) root=rcontext=wcontext=frame; { // take object or class from any wrappers - VAliased *aliased=self->get_aliased(); - // substitute class alias to the class they are called AS - Temp_alias temp_alias(*aliased, *frame->junction.vclass); + // and substitute class alias to the class they are called AS + Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass); - Method& method=*frame->junction.method; + const Method& method=*frame->junction.method; if(method.native_code) { // native code? method.check_actual_numbered_params( frame->name(), frame->numbered_params()); @@ -360,7 +367,7 @@ void Request::execute(const Array& ops) case OP_INV: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), ~static_cast(operand->get_double())); + Value *value=NEW VDouble(pool(), ~(int)operand->get_double()); PUSH(value); break; } @@ -426,8 +433,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) % - static_cast(b->get_double())); + (int)a->get_double() % + (int)b->get_double()); PUSH(value); break; } @@ -435,8 +442,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) & - static_cast(b->get_double())); + (int)a->get_double() & + (int)b->get_double()); PUSH(value); break; } @@ -444,8 +451,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) | - static_cast(b->get_double())); + (int)a->get_double() | + (int)b->get_double()); PUSH(value); break; } @@ -453,8 +460,8 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); Value *value=NEW VDouble(pool(), - static_cast(a->get_double()) ^ - static_cast(b->get_double())); + (int)a->get_double() ^ + (int)b->get_double()); PUSH(value); break; } @@ -563,6 +570,13 @@ void Request::execute(const Array& ops) PUSH(value); break; } + case OP_IS: + { + Value *b=POP(); Value *a=POP(); + Value *value=NEW VBool(pool(), b->as_string() == a->type()); + PUSH(value); + break; + } default: THROW(0,0, @@ -645,34 +659,41 @@ Value& Request::process(Value& value, co return *result; } -char *Request::execute_static_method(VClass& vclass, String& method_name, bool return_cstr) { - if(const Method *method=vclass.get_method(method_name)) { - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); - - // initialize contexts - root=rcontext=self=&vclass; - wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */); - - // execute! - execute(*method->parser_code); - - // result - char *result; - if(return_cstr) - result=wcontext->get_string()->cstr(); // chars - else - result=0; // ignore result - - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); - - // return - return result; - } +char *Request::execute_method(Value& aself, const Method& method, bool return_cstr) { + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + root=rcontext=self=&aself; + wcontext=NEW WWrapper(pool(), &aself, false /* not constructing */); + + // execute! + execute(*method.parser_code); + + // result + char *result; + if(return_cstr) + result=wcontext->get_string()->cstr(); // chars + else + result=0; // ignore result + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + // return + return result; +} + +char *Request::execute_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; }