--- parser3/src/main/execute.C 2001/02/25 10:11:50 1.41 +++ parser3/src/main/execute.C 2001/02/25 18:02:12 1.48 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.41 2001/02/25 10:11:50 paf Exp $ + $Id: execute.C,v 1.48 2001/02/25 18:02:12 paf Exp $ */ #include "pa_array.h" @@ -36,30 +36,30 @@ char *opcode_name[]={ void dump(int level, const Array& ops) { if(0){ int size=ops.size(); - //printf("size=%d\n", size); + //fprintf(stderr, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - printf(" \"%s\"", vstring->get_string()->cstr()); + fprintf(stderr, " \"%s\"", vstring->get_string()->cstr()); } if(op.code==OP_CLASS) { VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name()->cstr()); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); } - printf("\n"); + fprintf(stderr, "\n"); if(op.code==OP_CODE) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); @@ -70,35 +70,34 @@ void dump(int level, const Array& ops) { void Request::execute(const Array& ops) { if(1) { - puts("source----------------------------"); + fputs("source----------------------------", stderr); dump(0, ops); - puts("execution-------------------------"); + fputs("execution-------------------------", stderr); } int size=ops.size(); - //printf("size=%d\n", size); + //fprintf(stderr, "size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); - printf(" \"%s\"", vstring->get_string()->cstr()); + fprintf(stderr, " \"%s\"", vstring->get_string()->cstr()); PUSH(vstring); break; } case OP_CODE: { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - printf(" (%d)\n", local_ops->size()); + fprintf(stderr, " (%d)\n", local_ops->size()); dump(1, *local_ops); Junction& j=*NEW Junction(pool(), - *self, - 0, + *self, 0, 0, root,rcontext,wcontext,local_ops); Value *value=NEW VJunction(j); @@ -108,7 +107,7 @@ void Request::execute(const Array& ops) case OP_CLASS: { VClass *vclass=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vclass->name()->cstr()); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); PUSH(vclass); break; } @@ -171,7 +170,7 @@ void Request::execute(const Array& ops) case OP_CREATE_EWPOOL: { PUSH(wcontext); - wcontext=NEW WWrapper(pool(), 0 /* empty */); + wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */); break; } case OP_REDUCE_EWPOOL: @@ -188,13 +187,13 @@ void Request::execute(const Array& ops) PUSH(rcontext); rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WWrapper(pool(), ncontext); + wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */); break; } case OP_REDUCE_RWPOOL: { String *string=wcontext->get_string(); - Value *value=NEW VString(string); + Value *value=NEW VString(*string); wcontext=static_cast(POP()); rcontext=POP(); PUSH(value); @@ -209,7 +208,7 @@ void Request::execute(const Array& ops) Junction *junction=value->get_junction(); if(!junction) THROW(0,0, - value->name(), + &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) @@ -227,37 +226,53 @@ void Request::execute(const Array& ops) case OP_CALL: { - printf("->\n"); + fprintf(stderr, "->\n"); VMethodFrame *frame=static_cast(POP()); frame->fill_unspecified_params(); - PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + VClass *called_class=frame->junction.self.get_class(); - // variable already constructed? - if(wcontext->get_class()) { // yes - // static or dynamic call - self=&frame->junction.self; - } else { // no + // constructing? + if(wcontext->constructing()) { // yes // constructor call: $some(^class:method(..)) self=NEW VObject(pool(), *called_class); - frame->write(self); + 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 } - frame->set_self(self); - + frame->set_self(*self); root=rcontext=wcontext=frame; - execute(frame->junction.method->code); + { + // take object or class from any wrappers + 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); + } Value *value=wcontext->result(); - wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); wcontext->write(value); - printf("<-returned"); + fprintf(stderr, "<-returned"); break; } default: - printf("\tTODO"); + fprintf(stderr, "\tTODO"); break; } - printf("\n"); + fprintf(stderr, "\n"); } } @@ -270,8 +285,12 @@ Value *Request::get_element() { Junction *junction=value->get_junction(); if(junction && junction->code) { // is it a code-junction? // autocalc it - printf("ja->\n"); - PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); + fprintf(stderr, "ja->\n"); + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + // almost plain wwrapper about junction wcontext, // BUT intercepts string writes VCodeFrame frame(pool(), *junction->wcontext); wcontext=&frame; @@ -282,9 +301,13 @@ Value *Request::get_element() { // 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=POP(); - printf("<-ja returned"); + value=NEW VString(*frame.get_string()); + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + fprintf(stderr, "<-ja returned"); } } else { value=NEW VUnknown(pool());