--- parser3/src/main/execute.C 2001/02/24 11:46:03 1.36 +++ parser3/src/main/execute.C 2001/02/25 17:33:44 1.46 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.36 2001/02/24 11:46:03 paf Exp $ + $Id: execute.C,v 1.46 2001/02/25 17:33:44 paf Exp $ */ #include "pa_array.h" @@ -10,6 +10,7 @@ #include "pa_vunknown.h" #include "pa_vcframe.h" #include "pa_vmframe.h" +#include "pa_vobject.h" #include @@ -19,7 +20,7 @@ char *opcode_name[]={ - "STRING", "CODE", + "STRING", "CODE", "CLASS", "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", @@ -35,26 +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()); } - printf("\n"); + if(op.code==OP_CLASS) { + VClass *vclass=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); + } + fprintf(stderr, "\n"); if(op.code==OP_CODE) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); @@ -65,50 +70,52 @@ 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)", 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); PUSH(value); break; } - - // OP_WITH - case OP_WITH_WRITE: + case OP_CLASS: { - PUSH(wcontext); + VClass *vclass=static_cast(ops.quick_get(++i)); + fprintf(stderr, " \"%s\"", vclass->name().cstr()); + PUSH(vclass); break; } - case OP_WITH_READ: + + // OP_WITH + case OP_WITH_SELF: { - PUSH(rcontext); + PUSH(self); break; } case OP_WITH_ROOT: @@ -116,13 +123,28 @@ void Request::execute(const Array& ops) PUSH(root); break; } - case OP_WITH_SELF: + case OP_WITH_READ: { - PUSH(self); + PUSH(rcontext); + break; + } + case OP_WITH_WRITE: + { + PUSH(wcontext); break; } // ... + case OP_CONSTRUCT: + { + Value *value=POP(); + String& name=POP_NAME(); + Value *ncontext=POP(); + value->set_name(name); + ncontext->put_element(name, value); + break; + } + // TODO: OP_EXPRESSION_EVAL, OP_MODIFY_EVAL, case OP_WRITE: { Value *value=POP(); @@ -144,20 +166,11 @@ void Request::execute(const Array& ops) break; } - case OP_CONSTRUCT: - { - Value *value=POP(); - String& name=POP_NAME(); - Value *ncontext=POP(); - value->set_name(name); - ncontext->put_element(name, value); - break; - } 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: @@ -174,19 +187,20 @@ 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); break; } + // CALL case OP_GET_METHOD_FRAME: { Value *value=POP(); @@ -194,9 +208,9 @@ void Request::execute(const Array& ops) Junction *junction=value->get_junction(); if(!junction) THROW(0,0, - value->name(), - "is not a method or a junction (it is '%s'), can not call it", - value->type()); + &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); PUSH(frame); @@ -212,30 +226,49 @@ 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); - //left_class=ncontext.get_class() - //right_class=frame.self.get_class() - //self=f(left_class[thoughts' food], right_self[junction], right_class[static], wcontext.value()[dynamic], new(right_class)[construct]) - self=&frame->junction.self; // TODO: не всегда frame..self - frame->set_self(self); + PUSH(self); + PUSH(root); + PUSH(rcontext); + 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 & 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); + VAliased *aliased=reinterpret_cast(self->get_aliased()); + Temp_alias temp_alias(*aliased, *frame->junction.vclass); root=rcontext=wcontext=frame; 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"); } } @@ -248,8 +281,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; @@ -260,9 +297,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());