--- parser3/src/main/execute.C 2001/03/08 13:52:10 1.72 +++ parser3/src/main/execute.C 2001/03/10 15:17:47 1.86 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.72 2001/03/08 13:52:10 paf Exp $ + $Id: execute.C,v 1.86 2001/03/10 15:17:47 paf Exp $ */ #include "pa_array.h" @@ -28,8 +28,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 +66,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 +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,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(*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 +200,7 @@ void Request::execute(const Array& ops) case OP_GET_ELEMENT__WRITE: { Value *value=get_element(); - wcontext->write(*value); + write(*value); break; } @@ -214,8 +230,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 +251,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; @@ -258,7 +282,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,19 +298,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(..)) - self=NEW VObject(pool(), *called_class); - frame->write(*self); - } 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; { @@ -296,9 +321,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(); @@ -324,8 +350,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; } @@ -539,18 +564,21 @@ 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); - // autocalc possible code-junction - value=value?&autocalc(*value):NEW VUnknown(pool()); + if(value) + value=&autocalc(*value, &name); // autocalc possible code-junction + else { + value=NEW VUnknown(pool()); + value->set_name(name); + } - value->set_name(name); 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 @@ -583,6 +611,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(); @@ -595,6 +625,41 @@ Value& Request::autocalc(Value& value, b return value; } -void Request::write(Value& avalue) { - wcontext->write(avalue); -} \ No newline at end of file +char *Request::execute_static(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; + } + } + } + return 0; +}