--- parser3/src/main/execute.C 2001/02/24 08:28:37 1.32 +++ parser3/src/main/execute.C 2001/02/25 08:50:14 1.39 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.32 2001/02/24 08:28:37 paf Exp $ + $Id: execute.C,v 1.39 2001/02/25 08:50:14 paf Exp $ */ #include "pa_array.h" @@ -8,9 +8,9 @@ #include "pa_vstring.h" #include "pa_vhash.h" #include "pa_vunknown.h" -#include "pa_vframe.h" -#include "pa_wwrapper.h" -#include "pa_vjunction.h" +#include "pa_vcframe.h" +#include "pa_vmframe.h" +#include "pa_vobject.h" #include @@ -20,7 +20,7 @@ char *opcode_name[]={ - "STRING", "CODE", + "STRING", "CODE", "CLASS", "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", @@ -55,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) { @@ -90,25 +94,29 @@ 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, - root,self,rcontext,local_ops); + 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)); + 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,15 +167,6 @@ 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: { @@ -162,7 +176,7 @@ void Request::execute(const Array& ops) } case OP_REDUCE_EWPOOL: { - Value *value=wcontext->value(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); PUSH(value); break; @@ -187,6 +201,7 @@ void Request::execute(const Array& ops) break; } + // CALL case OP_GET_METHOD_FRAME: { Value *value=POP(); @@ -195,17 +210,17 @@ void Request::execute(const Array& ops) if(!junction) THROW(0,0, value->name(), - "is not a method or a junction (it is '%s'), can not call it", - value->type()); + "type is '%s', can not call it (must be method or junction)", + value->type()); //unless(method) method=operators.get_method[...;code/native_code](name) - VFrame *frame=NEW VFrame(pool(), *junction); + VMethodFrame *frame=NEW VMethodFrame(pool(), *junction); PUSH(frame); break; } case OP_STORE_PARAM: { Value *value=POP(); - VFrame *frame=static_cast(stack[0]); + VMethodFrame *frame=static_cast(stack[0]); frame->store_param(value); break; } @@ -213,24 +228,34 @@ void Request::execute(const Array& ops) case OP_CALL: { printf("->\n"); - VFrame *frame=static_cast(POP()); - frame->fill_empty_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 + VMethodFrame *frame=static_cast(POP()); + frame->fill_unspecified_params(); + PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); + + VClass *context_class=wcontext->get_class(); + VClass *called_class=frame->junction.self.get_class(); + // context is some class? [variable already constructed?] + if(context_class) { // yes + // is it me or one of my parents? + if(context_class->is_or_derived_from(*called_class)) // yes + self=&frame->junction.self; // dynamic call + else // no + self=called_class; // static call + } else { // no, we have constructor call here: $some(^class:method(..)) + self=NEW VObject(pool(), *called_class); + frame->write(self); + } 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,18 +271,21 @@ 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"); - VFrame frame(pool(), *junction); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); - frame.set_self(self=junction->self); + // almost plain wwrapper about junction wcontext, + // BUT intercepts string writes + VCodeFrame frame(pool(), *junction->wcontext); wcontext=&frame; + self=&junction->self; root=junction->root; rcontext=junction->rcontext; - wcontext=&frame; execute(*junction->code); - value=wcontext->value(); - //value=wcontext->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(); printf("<-ja returned"); } @@ -266,4 +294,4 @@ Value *Request::get_element() { value->set_name(name); } return value; -} \ No newline at end of file +}