--- parser3/src/main/execute.C 2001/03/11 09:24:43 1.90 +++ parser3/src/main/execute.C 2001/03/12 21:18:01 1.97 @@ -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.90 2001/03/11 09:24:43 paf Exp $ + $Id: execute.C,v 1.97 2001/03/12 21:18:01 paf Exp $ */ #include "pa_array.h" @@ -17,6 +17,7 @@ #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_vbool.h" +#include "pa_vtable.h" #include @@ -122,7 +123,7 @@ void Request::execute(const Array& ops) Value *value=NEW VJunction(j); // store param - frame->store_param(value); + frame->store_param(frame->name(), value); break; } case OP_GET_CLASS: @@ -182,7 +183,7 @@ void Request::execute(const Array& ops) case OP_WRITE: { Value *value=POP(); - write(*value); + write_assign_lang(*value); break; } case OP_STRING__WRITE: @@ -203,7 +204,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - write(*value); + write_assign_lang(*value); break; } @@ -274,11 +275,12 @@ void Request::execute(const Array& ops) if(!junction) THROW(0,0, &value->name(), - "type is '%s', can not call it (must be method or junction)", + "(%s) uncallable, must be method or junction", value->type()); VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); - frame->set_name(junction->self.name()); + //frame->set_name(junction->self.name()); + frame->set_name(value->name()); PUSH(frame); break; } @@ -286,7 +288,7 @@ void Request::execute(const Array& ops) { Value *value=POP(); VMethodFrame *frame=static_cast(stack.top_value()); - frame->store_param(value); + frame->store_param(frame->name(), value); break; } @@ -307,8 +309,11 @@ void Request::execute(const Array& ops) 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(..)) - self=NEW VObject(pool(), *called_class); + // yes, constructor call: $some[^class:method[..]] + if(called_class->name()==TABLE_CLASS_NAME) + self=NEW VTable(pool()); + else + self=NEW VObject(pool(), *called_class); frame->write(*self, String::Untaint_lang::NO // not used, always an object, not string ); @@ -325,8 +330,10 @@ void Request::execute(const Array& ops) Method& method=*frame->junction.method; if(method.native_code) { // native code? - method.check_actual_numbered_params(frame->numbered_params()); - (*method.native_code)(*this, frame->numbered_params()); // execute it + method.check_actual_numbered_params( + 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 } @@ -353,7 +360,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; } @@ -419,8 +426,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; } @@ -428,8 +435,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; } @@ -437,8 +444,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; } @@ -446,8 +453,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; } @@ -572,7 +579,7 @@ Value *Request::get_element() { Value *value=ncontext->get_element(name); if(value) - value=&autocalc(*value, &name); // autocalc possible code-junction + value=&process(*value, &name); // process possible code-junction else { value=NEW VUnknown(pool()); value->set_name(name); @@ -581,7 +588,7 @@ Value *Request::get_element() { return value; } -Value& Request::autocalc(Value& value, const String *name, bool intercept_string) { +Value& Request::process(Value& value, const String *name, bool intercept_string) { // intercept_string: // true: // they want result=string value, @@ -591,9 +598,10 @@ Value& Request::autocalc(Value& value, c // nothing goes to wcontext. // used in (expression) params evaluation + Value *result; Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? - // autocalc it + // process it fprintf(stderr, "ja->\n"); PUSH(self); PUSH(root); @@ -615,7 +623,6 @@ Value& Request::autocalc(Value& value, c root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - Value *result; if(intercept_string) { // CodeFrame soul: // string writes were intercepted @@ -623,8 +630,6 @@ Value& Request::autocalc(Value& value, c result=NEW VString(*frame->get_string()); } else result=frame->result(); - if(name) - result->set_name(*name); wcontext=static_cast(POP()); rcontext=POP(); @@ -632,46 +637,42 @@ Value& Request::autocalc(Value& value, c self=static_cast(POP()); fprintf(stderr, "<-ja returned"); - return *result; } else - return value; + result=&value; + + if(name) + result->set_name(*name); + return *result; } char *Request::execute_static_method(VClass& vclass, String& method_name, bool return_cstr) { - Value *value=vclass.get_element(method_name); - if(value) { // found some 'METHOD_NAME' element - Junction *junction=value->get_junction(); - if(junction) {// it even has junction! - const Method *method=junction->method; - if(method) { // and junction is method-junction! call it - 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; - } - } + 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; } return 0; }