--- parser3/src/main/execute.C 2001/03/09 04:47:29 1.79 +++ parser3/src/main/execute.C 2001/03/10 13:07:09 1.84 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.79 2001/03/09 04:47:29 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; iset_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(); + 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(); + 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; @@ -281,8 +298,10 @@ void Request::execute(const Array& ops) 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); + 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 @@ -295,9 +314,10 @@ void Request::execute(const Array& ops) Temp_alias temp_alias(*aliased, *frame->junction.vclass); Method& method=*frame->junction.method; - if(method.native_code) // native code? + 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 + } else // parser code execute(*method.parser_code); // execute it } Value *value=wcontext->result(); @@ -316,16 +336,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(), ~static_cast(operand->get_double())); PUSH(value); break; } @@ -362,32 +380,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; } @@ -543,12 +557,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=&autocalc(*value, &name); // autocalc possible code-junction else { value=NEW VUnknown(pool()); value->set_name(name); @@ -557,7 +571,7 @@ Value *Request::get_element() { return value; } -Value& Request::autocalc(Value& value, bool make_string) { +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 @@ -590,6 +604,8 @@ Value& Request::autocalc(Value& value, b result=NEW VString(*frame->get_string()); } else result=frame->result(); + if(name) + result->set_name(*name); wcontext=static_cast(POP()); rcontext=POP();