--- parser3/src/main/execute.C 2001/03/08 17:14:53 1.78 +++ parser3/src/main/execute.C 2001/03/13 14:02:51 1.101 @@ -1,5 +1,9 @@ /* - $Id: execute.C,v 1.78 2001/03/08 17:14:53 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: execute.C,v 1.101 2001/03/13 14:02:51 paf Exp $ */ #include "pa_array.h" @@ -13,6 +17,7 @@ #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_vbool.h" +#include "pa_vtable.h" #include @@ -28,8 +33,8 @@ char *opcode_name[]={ // actions "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", "GET_CLASS", - "CONSTRUCT", - "WRITE", + "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", + "WRITE", "STRING__WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", @@ -66,7 +71,7 @@ void dump(int level, const Array& ops) { op.cast=ops.quick_get(i); fprintf(stderr, "%*s%s", level*4, "", opcode_name[op.code]); - if(op.code==OP_VALUE) { + if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { Value *value=static_cast(ops.quick_get(++i)); fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type()); } @@ -92,7 +97,7 @@ void Request::execute(const Array& ops) for(int i=0; iset_name(frame->name()); // store param - frame->store_param(value); + frame->store_param(frame->name(), value); break; } case OP_GET_CLASS: { - String& name=POP_NAME(); + // 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) THROW(0,0, @@ -158,19 +165,35 @@ void Request::execute(const Array& ops) } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT: + case OP_CONSTRUCT_VALUE: { Value *value=POP(); - String& name=POP_NAME(); + const String& name=POP_NAME(); Value *ncontext=POP(); - value->set_name(name); ncontext->put_element(name, value); + value->set_name(name); + break; + } + case OP_CONSTRUCT_EXPR: + { + Value *value=POP(); + const String& name=POP_NAME(); + Value *ncontext=POP(); + ncontext->put_element(name, value->get_expr_result()); + value->set_name(name); break; } case OP_WRITE: { Value *value=POP(); - wcontext->write(*value); + write_assign_lang(*value); + break; + } + case OP_STRING__WRITE: + { + VString *vstring=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\"", vstring->value().cstr()); + write(vstring->value()); break; } @@ -184,7 +207,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - wcontext->write(*value); + write_assign_lang(*value); break; } @@ -214,8 +237,12 @@ void Request::execute(const Array& ops) } case OP_REDUCE_RWPOOL: { - String *string=wcontext->get_string(); - Value *value=string?NEW VString(*string):NEW VString(pool()); + const String *string=wcontext->get_string(); + Value *value; + if(string) + value=NEW VString(*string); + else + value=NEW VUnknown(pool()); wcontext=static_cast(POP()); rcontext=POP(); PUSH(value); @@ -231,8 +258,12 @@ void Request::execute(const Array& ops) { // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - String *string=wcontext->get_string(); - Value *value=string?NEW VString(*string):NEW VString(pool()); + const String *string=wcontext->get_string(); + Value *value; + if(string) + value=NEW VString(*string); + else + NEW VUnknown(pool()); wcontext=static_cast(POP()); PUSH(value); break; @@ -247,11 +278,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; } @@ -259,7 +291,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; } @@ -273,16 +305,25 @@ 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(..)) - self=NEW VObject(*called_class); - frame->write(*self); + 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, + String::Untaint_lang::NO // not used, always an object, not string + ); } else self=&frame->junction.self; // no, static or simple dynamic call @@ -294,10 +335,13 @@ void Request::execute(const Array& ops) // substitute class alias to the class they are called AS Temp_alias temp_alias(*aliased, *frame->junction.vclass); - Method& method=*frame->junction.method; - if(method.native_code) // native code? - (*method.native_code)(*this, frame->numbered_params()); // execute it - else // parser code + const Method& method=*frame->junction.method; + if(method.native_code) { // native code? + 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 } Value *value=wcontext->result(); @@ -316,16 +360,14 @@ void Request::execute(const Array& ops) case OP_NEG: { Value *operand=POP(); - Value *value=NEW VDouble(pool(), - -operand->get_double()); + Value *value=NEW VDouble(pool(), -operand->get_double()); PUSH(value); break; } 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; } @@ -362,32 +404,28 @@ void Request::execute(const Array& ops) case OP_SUB: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->get_double() - b->get_double()); + Value *value=NEW VDouble(pool(), a->get_double() - b->get_double()); PUSH(value); break; } case OP_ADD: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->get_double() + b->get_double()); + Value *value=NEW VDouble(pool(), a->get_double() + b->get_double()); PUSH(value); break; } case OP_MUL: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->get_double() * b->get_double()); + Value *value=NEW VDouble(pool(), a->get_double() * b->get_double()); PUSH(value); break; } case OP_DIV: { Value *b=POP(); Value *a=POP(); - Value *value=NEW VDouble(pool(), - a->get_double() / b->get_double()); + Value *value=NEW VDouble(pool(), a->get_double() / b->get_double()); PUSH(value); break; } @@ -395,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; } @@ -404,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; } @@ -413,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; } @@ -422,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; } @@ -543,12 +581,12 @@ void Request::execute(const Array& ops) } Value *Request::get_element() { - String& name=POP_NAME(); + const String& name=POP_NAME(); Value *ncontext=POP(); Value *value=ncontext->get_element(name); if(value) - value=&autocalc(*value); // autocalc possible code-junction + value=&process(*value, &name); // process possible code-junction else { value=NEW VUnknown(pool()); value->set_name(name); @@ -557,10 +595,20 @@ Value *Request::get_element() { return value; } -Value& Request::autocalc(Value& value, bool make_string) { +Value& Request::process(Value& value, const String *name, bool intercept_string) { + // intercept_string: + // true: + // they want result=string value, + // possible object result goes to wcontext + // false: + // they want any result[string|object] + // 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); @@ -568,7 +616,7 @@ Value& Request::autocalc(Value& value, b PUSH(wcontext); WContext *frame; - if(make_string) { + if(intercept_string) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes frame=NEW VCodeFrame(pool(), *junction->wcontext); @@ -582,8 +630,7 @@ Value& Request::autocalc(Value& value, b root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - Value *result; - if(make_string) { + if(intercept_string) { // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction @@ -597,11 +644,49 @@ Value& Request::autocalc(Value& value, b 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_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; } -void Request::write(Value& avalue) { - wcontext->write(avalue); -} \ No newline at end of file +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; +}