--- parser3/src/main/execute.C 2001/02/23 17:48:00 1.30 +++ parser3/src/main/execute.C 2001/02/24 11:46:03 1.36 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.30 2001/02/23 17:48:00 paf Exp $ + $Id: execute.C,v 1.36 2001/02/24 11:46:03 paf Exp $ */ #include "pa_array.h" @@ -8,18 +8,18 @@ #include "pa_vstring.h" #include "pa_vhash.h" #include "pa_vunknown.h" -#include "pa_vframe.h" -#include "pa_wwrapper.h" +#include "pa_vcframe.h" +#include "pa_vmframe.h" #include #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) -#define POP_SR() static_cast(stack.pop())->as_string() +#define POP_NAME() static_cast(stack.pop())->as_string() char *opcode_name[]={ - "STRING", "CODE_ARRAY", + "STRING", "CODE", "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", @@ -28,7 +28,6 @@ char *opcode_name[]={ "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", "GET_METHOD_FRAME", - "CREATE_JUNCTION", "STORE_PARAM", "CALL" }; @@ -57,18 +56,18 @@ void dump(int level, const Array& ops) { } printf("\n"); - if(op.code==OP_CODE_ARRAY) { + if(op.code==OP_CODE) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); dump(level+1, *local_ops); } } } -void Request::execute(Array& ops) { +void Request::execute(const Array& ops) { if(1) { - puts("---------------------------"); + puts("source----------------------------"); dump(0, ops); - puts("---------------------------"); + puts("execution-------------------------"); } int size=ops.size(); @@ -78,12 +77,30 @@ void Request::execute(Array& ops) { op.cast=ops.quick_get(i); printf("%d:%s", stack.top(), opcode_name[op.code]); - if(op.code==OP_CODE_ARRAY) { - const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); - //dump(level+1, *local_ops); - } - switch(op.code) { + // param in next instruction + case OP_STRING: + { + VString *vstring=static_cast(ops.quick_get(++i)); + printf(" \"%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()); + Junction& j=*NEW Junction(pool(), + *self, + 0, + root,rcontext,wcontext,local_ops); + + Value *value=NEW VJunction(j); + PUSH(value); + break; + } + + // OP_WITH case OP_WITH_WRITE: { PUSH(wcontext); @@ -105,24 +122,7 @@ void Request::execute(Array& ops) { break; } - case OP_STRING: - { - VString *vstring=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", vstring->get_string()->cstr()); - PUSH(vstring); - break; - } - - case OP_CONSTRUCT: - { - Value *value=POP(); - String& name=POP_SR(); - Value *ncontext=POP(); - value->set_name(name); - ncontext->put_element(name, value); - break; - } - + // ... case OP_WRITE: { Value *value=POP(); @@ -144,6 +144,16 @@ void Request::execute(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); @@ -152,7 +162,7 @@ void Request::execute(Array& ops) { } case OP_REDUCE_EWPOOL: { - Value *value=wcontext->value(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); PUSH(value); break; @@ -179,23 +189,23 @@ void Request::execute(Array& ops) { case OP_GET_METHOD_FRAME: { - String& name=POP_SR(); // ýòî áûâàåò junction, íå name - Value *ncontext=static_cast(stack[0]); + Value *value=POP(); // [self/class?;params;local;code/native_code](name) - Method *method=ncontext->get_method(name); - if(!method) + Junction *junction=value->get_junction(); + if(!junction) THROW(0,0, - &name, - "method not found in %s", ncontext->name()->cstr()); + value->name(), + "is not a method or a junction (it is '%s'), can not call it", + value->type()); //unless(method) method=operators.get_method[...;code/native_code](name) - VFrame *frame=NEW VFrame(pool(), *method); + 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; } @@ -203,18 +213,18 @@ void Request::execute(Array& ops) { case OP_CALL: { printf("->\n"); - VFrame *frame=static_cast(POP()); - Value *ncontext=POP(); - PUSH(root); PUSH(self); PUSH(rcontext); PUSH(wcontext); + 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=rcontext; + self=&frame->junction.self; // TODO: íå âñåãäà frame..self frame->set_self(self); root=rcontext=wcontext=frame; - execute(frame->method.code); - Value *value=wcontext->value(); - wcontext=static_cast(POP()); rcontext=POP(); self=POP(); root=POP(); + execute(frame->junction.method->code); + Value *value=wcontext->result(); + wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); wcontext->write(value); printf("<-returned"); break; @@ -230,14 +240,33 @@ void Request::execute(Array& ops) { } Value *Request::get_element() { - String& name=POP_SR(); + String& name=POP_NAME(); Value *ncontext=POP(); - Value *value=ncontext->get_element(name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code) - // name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ + Value *value=ncontext->get_element(name); - if(!value) { + if(value) { + 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); + // 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; + execute(*junction->code); + // 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"); + } + } else { value=NEW VUnknown(pool()); value->set_name(name); } return value; -} \ No newline at end of file +}