--- parser3/src/main/execute.C 2001/02/23 11:53:06 1.26 +++ parser3/src/main/execute.C 2001/02/24 08:28:37 1.32 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.26 2001/02/23 11:53:06 paf Exp $ + $Id: execute.C,v 1.32 2001/02/24 08:28:37 paf Exp $ */ #include "pa_array.h" @@ -8,15 +8,19 @@ #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 #define PUSH(value) stack.push(value) #define POP() static_cast(stack.pop()) +#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", @@ -25,7 +29,6 @@ char *opcode_name[]={ "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", "GET_METHOD_FRAME", - "CREATE_JUNCTION", "STORE_PARAM", "CALL" }; @@ -33,7 +36,7 @@ char *opcode_name[]={ void dump(int level, const Array& ops) { if(0){ int size=ops.size(); - printf("size=%d\n", size); + //printf("size=%d\n", size); for(int i=0; i(ops.quick_get(++i)); dump(level+1, *local_ops); } } } -void Request::execute(Array& ops) { - if(0) { - puts("---------------------------"); +void Request::execute(const Array& ops) { + if(1) { + puts("source----------------------------"); dump(0, ops); - puts("---------------------------"); + puts("execution-------------------------"); } int size=ops.size(); - printf("size=%d\n", size); + //printf("size=%d\n", size); for(int i=0; i(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(), + 0, + root,self,rcontext,local_ops); + + Value *value=NEW VJunction(j); + PUSH(value); + break; + } + + // OP_WITH case OP_WITH_WRITE: { PUSH(wcontext); @@ -102,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()->as_string(); - Value *ncontext=POP(); - value->set_name(name); - ncontext->put_element(name, value); - break; - } - + // ... case OP_WRITE: { Value *value=POP(); @@ -141,10 +144,20 @@ 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); - wcontext=NEW WContext(pool(), 0 /* empty */); + wcontext=NEW WWrapper(pool(), 0 /* empty */); break; } case OP_REDUCE_EWPOOL: @@ -161,7 +174,7 @@ void Request::execute(Array& ops) { PUSH(rcontext); rcontext=ncontext; PUSH(wcontext); - wcontext=NEW WContext(pool(), ncontext); + wcontext=NEW WWrapper(pool(), ncontext); break; } case OP_REDUCE_RWPOOL: @@ -174,6 +187,50 @@ void Request::execute(Array& ops) { break; } + case OP_GET_METHOD_FRAME: + { + Value *value=POP(); + // [self/class?;params;local;code/native_code](name) + 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()); + //unless(method) method=operators.get_method[...;code/native_code](name) + VFrame *frame=NEW VFrame(pool(), *junction); + PUSH(frame); + break; + } + case OP_STORE_PARAM: + { + Value *value=POP(); + VFrame *frame=static_cast(stack[0]); + frame->store_param(value); + break; + } + + 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 + frame->set_self(self); + root=rcontext=wcontext=frame; + execute(frame->junction.method->code); + Value *value=wcontext->value(); + wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); + wcontext->write(value); + printf("<-returned"); + break; + } + + default: printf("\tTODO"); break; @@ -183,12 +240,28 @@ void Request::execute(Array& ops) { } Value *Request::get_element() { - String& name=POP()->as_string(); + 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"); + VFrame frame(pool(), *junction); + PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); + frame.set_self(self=junction->self); + root=junction->root; + rcontext=junction->rcontext; + wcontext=&frame; + execute(*junction->code); + value=wcontext->value(); + //value=wcontext->get_string(); + wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); + printf("<-ja returned"); + } + } else { value=NEW VUnknown(pool()); value->set_name(name); }