--- parser3/src/main/execute.C 2001/02/24 11:20:33 1.34 +++ parser3/src/main/execute.C 2001/02/25 14:47:13 1.44 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.34 2001/02/24 11:20:33 paf Exp $ + $Id: execute.C,v 1.44 2001/02/25 14:47:13 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", @@ -54,6 +55,10 @@ void dump(int level, const Array& ops) { VString *vstring=static_cast(ops.quick_get(++i)); printf(" \"%s\"", vstring->get_string()->cstr()); } + if(op.code==OP_CLASS) { + VClass *vclass=static_cast(ops.quick_get(++i)); + printf(" \"%s\"", vclass->name().cstr()); + } printf("\n"); if(op.code==OP_CODE) { @@ -89,7 +94,8 @@ void Request::execute(const Array& ops) case OP_CODE: { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - printf(" (%d)", local_ops->size()); + printf(" (%d)\n", local_ops->size()); + dump(1, *local_ops); Junction& j=*NEW Junction(pool(), *self, 0, @@ -99,16 +105,18 @@ void Request::execute(const Array& ops) PUSH(value); break; } - - // OP_WITH - case OP_WITH_WRITE: + case OP_CLASS: { - PUSH(wcontext); + VClass *vclass=static_cast(ops.quick_get(++i)); + printf(" \"%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 +124,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,25 +167,16 @@ 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: { - Value *value=wcontext->value_or_string(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); PUSH(value); break; @@ -174,19 +188,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 +209,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); @@ -216,21 +231,32 @@ void Request::execute(const Array& ops) 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 + + 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 + // 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); + root=rcontext=wcontext=frame; execute(frame->junction.method->code); - Value *value=wcontext->value(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); wcontext->write(value); printf("<-returned"); break; } - default: printf("\tTODO"); break; @@ -246,7 +272,7 @@ Value *Request::get_element() { if(value) { Junction *junction=value->get_junction(); - if(junction && junction->code) { // is it a code junction? + if(junction && junction->code) { // is it a code-junction? // autocalc it printf("ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); @@ -257,11 +283,11 @@ Value *Request::get_element() { root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - // CodeFrame soul: string writes intercepted - String *code_string_result=frame.get_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=POP(); - // writing string result to current context - wcontext->write(code_string_result); printf("<-ja returned"); } } else {