--- parser3/src/main/execute.C 2001/03/08 10:13:26 1.67 +++ parser3/src/main/execute.C 2001/03/10 13:07:09 1.84 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.67 2001/03/08 10:13:26 paf Exp $ + $Id: execute.C,v 1.84 2001/03/10 13:07:09 paf Exp $ */ #include "pa_array.h" @@ -28,7 +28,7 @@ char *opcode_name[]={ // actions "WITH_SELF", "WITH_ROOT", "WITH_READ", "WITH_WRITE", "GET_CLASS", - "CONSTRUCT", + "CONSTRUCT_VALUE", "CONSTRUCT_DOUBLE", "WRITE", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", @@ -92,7 +92,7 @@ void Request::execute(const Array& ops) for(int i=0; i(stack[stack.top()]); + VMethodFrame *frame=static_cast(stack.top_value()); // code const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); fprintf(stderr, " (%d)\n", local_ops->size()); @@ -116,7 +116,7 @@ void Request::execute(const Array& ops) root, frame, frame, local_ops); Value *value=NEW VJunction(j); - value->set_name(frame->name()); + ///value->set_name(frame->name()); // store param frame->store_param(value); @@ -124,7 +124,7 @@ void Request::execute(const Array& ops) } case OP_GET_CLASS: { - String& name=POP_NAME(); + const String& name=POP_NAME(); VClass *vclass=static_cast(classes().get(name)); if(!vclass) THROW(0,0, @@ -158,19 +158,28 @@ 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(*value); break; } @@ -184,7 +193,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - wcontext->write(value); + write(*value); break; } @@ -214,8 +223,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 +244,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; @@ -242,14 +259,14 @@ void Request::execute(const Array& ops) case OP_GET_METHOD_FRAME: { Value *value=POP(); - // [self/class?;params;local;code/native_code](name) + // info: this one's always method-junction, not a code-junction Junction *junction=value->get_junction(); if(!junction) THROW(0,0, &value->name(), "type is '%s', can not call it (must be method or junction)", value->type()); - //unless(method) method=operators.get_method[...;code/native_code](name) + VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); frame->set_name(junction->self.name()); PUSH(frame); @@ -258,7 +275,7 @@ void Request::execute(const Array& ops) case OP_STORE_PARAM: { Value *value=POP(); - VMethodFrame *frame=static_cast(stack[0]); + VMethodFrame *frame=static_cast(stack.top_value()); frame->store_param(value); break; } @@ -274,18 +291,20 @@ void Request::execute(const Array& ops) PUSH(wcontext); VClass *called_class=frame->junction.self.get_class(); - // constructing? - if(wcontext->constructing()) { // yes - // constructor call: $some(^class:method(..)) - frame->write(self=NEW VObject(pool(), *called_class)); - } else { // no - // context is object or class & is it my class or my parent's class? - VClass *read_class=rcontext->get_class(); - if(read_class && read_class->is_or_derived_from(*called_class)) // yes - self=rcontext; // class dynamic call - else // no - self=&frame->junction.self; // static or simple dynamic call - } + // is context object or class & is it my class or my parent's class? + VClass *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(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 + frame->set_self(*self); root=rcontext=wcontext=frame; { @@ -293,7 +312,13 @@ void Request::execute(const Array& ops) VAliased *aliased=self->get_aliased(); // substitute class alias to the class they are called AS Temp_alias temp_alias(*aliased, *frame->junction.vclass); - execute(frame->junction.method->code); + + 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 + } else // parser code + execute(*method.parser_code); // execute it } Value *value=wcontext->result(); @@ -318,8 +343,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(), ~static_cast(operand->get_double())); PUSH(value); break; } @@ -533,42 +557,63 @@ 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) { - Junction *junction=value->get_junction(); - if(junction && junction->code) { // is it a code-junction? - // autocalc it - fprintf(stderr, "ja->\n"); - PUSH(self); - PUSH(root); - PUSH(rcontext); - PUSH(wcontext); + if(value) + value=&autocalc(*value, &name); // autocalc possible code-junction + else { + value=NEW VUnknown(pool()); + value->set_name(name); + } + + return value; +} +Value& Request::autocalc(Value& value, const String *name, bool make_string) { + Junction *junction=value.get_junction(); + if(junction && junction->code) { // is it a code-junction? + // autocalc it + fprintf(stderr, "ja->\n"); + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + WContext *frame; + if(make_string) { // almost plain wwrapper about junction wcontext, // BUT intercepts string writes - VCodeFrame frame(pool(), *junction->wcontext); wcontext=&frame; - self=&junction->self; - root=junction->root; - rcontext=junction->rcontext; - execute(*junction->code); + frame=NEW VCodeFrame(pool(), *junction->wcontext); + } else { + // plain wwrapper + frame=NEW WWrapper(pool(), 0 /* empty */, false /*not constructing*/); + } + + wcontext=frame; + self=&junction->self; + root=junction->root; + rcontext=junction->rcontext; + execute(*junction->code); + Value *result; + if(make_string) { // CodeFrame soul: // string writes were intercepted // returning them as the result of getting code-junction - value=NEW VString(*frame.get_string()); - - wcontext=static_cast(POP()); - rcontext=POP(); - root=POP(); - self=static_cast(POP()); - - fprintf(stderr, "<-ja returned"); - } + result=NEW VString(*frame->get_string()); + } else + result=frame->result(); + if(name) + result->set_name(*name); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + fprintf(stderr, "<-ja returned"); + return *result; } else - value=NEW VUnknown(pool()); - - value->set_name(name); - return value; + return value; }