--- parser3/src/main/execute.C 2001/02/22 16:21:49 1.22 +++ parser3/src/main/execute.C 2001/02/23 21:59:07 1.31 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.22 2001/02/22 16:21:49 paf Exp $ + $Id: execute.C,v 1.31 2001/02/23 21:59:07 paf Exp $ */ #include "pa_array.h" @@ -7,9 +7,16 @@ #include "pa_request.h" #include "pa_vstring.h" #include "pa_vhash.h" +#include "pa_vunknown.h" +#include "pa_vframe.h" +#include "pa_wwrapper.h" #include +#define PUSH(value) stack.push(value) +#define POP() static_cast(stack.pop()) +#define POP_SR() static_cast(stack.pop())->as_string() + char *opcode_name[]={ "STRING", "CODE_ARRAY", @@ -27,18 +34,30 @@ char *opcode_name[]={ }; void dump(int level, const Array& ops) { + if(0){ + int size=ops.size(); + //printf("size=%d\n", size); + for(int i=0; i(ops.quick_get(i)); - printf("%*s%s", level*4, "", opcode_name[code]); + Operation op; + op.cast=ops.quick_get(i); + printf("%*s%s", level*4, "", opcode_name[op.code]); - if(code==OP_STRING) { + if(op.code==OP_STRING) { VString *vstring=static_cast(ops.quick_get(++i)); printf(" \"%s\"", vstring->get_string()->cstr()); } printf("\n"); - if(code==OP_CODE_ARRAY) { + if(op.code==OP_CODE_ARRAY) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); dump(level+1, *local_ops); } @@ -46,41 +65,43 @@ void dump(int level, const Array& ops) { } void Request::execute(Array& ops) { - if(0) { + if(1) { puts("---------------------------"); dump(0, ops); puts("---------------------------"); } int size=ops.size(); + //printf("size=%d\n", size); for(int i=0; i(ops.quick_get(i)); - printf("%d:%s", stack.top(), opcode_name[code]); + Operation op; + op.cast=ops.quick_get(i); + printf("%d:%s", stack.top(), opcode_name[op.code]); - if(code==OP_CODE_ARRAY) { + if(op.code==OP_CODE_ARRAY) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); //dump(level+1, *local_ops); } - switch(code) { + switch(op.code) { case OP_WITH_WRITE: { - stack.push(wcontext); + PUSH(wcontext); break; } case OP_WITH_READ: { - stack.push(rcontext); + PUSH(rcontext); break; } case OP_WITH_ROOT: { - stack.push(root); + PUSH(root); break; } case OP_WITH_SELF: { - stack.push(self); + PUSH(self); break; } @@ -88,22 +109,23 @@ void Request::execute(Array& ops) { { VString *vstring=static_cast(ops.quick_get(++i)); printf(" \"%s\"", vstring->get_string()->cstr()); - stack.push(vstring); + PUSH(vstring); break; } case OP_CONSTRUCT: { - Value *value=static_cast(stack.pop()); - VString *name=static_cast(stack.pop()); - Value *ncontext=static_cast(stack.pop()); - ncontext->put_element(*name, value); + 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=static_cast(stack.pop()); + Value *value=POP(); wcontext->write(value); break; } @@ -111,7 +133,7 @@ void Request::execute(Array& ops) { case OP_GET_ELEMENT: { Value *value=get_element(); - stack.push(value); + PUSH(value); break; } @@ -124,18 +146,81 @@ void Request::execute(Array& ops) { case OP_CREATE_EWPOOL: { - stack.push(wcontext); - wcontext=NEW WContext(pool(), 0 /* empty */); + PUSH(wcontext); + wcontext=NEW WWrapper(pool(), 0 /* empty */); break; } case OP_REDUCE_EWPOOL: { Value *value=wcontext->value(); - wcontext=static_cast(stack.pop()); - stack.push(value); + wcontext=static_cast(POP()); + PUSH(value); break; } + case OP_CREATE_RWPOOL: + { + Value *ncontext=POP(); + PUSH(rcontext); + rcontext=ncontext; + PUSH(wcontext); + wcontext=NEW WWrapper(pool(), ncontext); + break; + } + case OP_REDUCE_RWPOOL: + { + String *string=wcontext->get_string(); + Value *value=NEW VString(string); + wcontext=static_cast(POP()); + rcontext=POP(); + PUSH(value); + break; + } + + case OP_GET_METHOD_FRAME: + { + Value *vjunction=POP(); + // [self/class?;params;local;code/native_code](name) + Junction *junction=vjunction->get_junction(); + + if(!junction) + THROW(0,0, + vjunction->name(), + "not a method"); + + //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()); + PUSH(root); PUSH(self); 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; + frame->set_self(self); + root=rcontext=wcontext=frame; + execute(frame->junction.method->code); + Value *value=wcontext->value(); + wcontext=static_cast(POP()); rcontext=POP(); self=POP(); root=POP(); + wcontext->write(value); + printf("<-returned"); + break; + } + + default: printf("\tTODO"); break; @@ -145,14 +230,14 @@ void Request::execute(Array& ops) { } Value *Request::get_element() { - VString *name=static_cast(stack.pop()); - Value *ncontext=static_cast(stack.pop()); - Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code) + String& name=POP_SR(); + Value *ncontext=POP(); + Value *value=ncontext->get_element(name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code) // name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ if(!value) { - value=NEW VHash(pool()); - ncontext->put_element(*name, value); + value=NEW VUnknown(pool()); + value->set_name(name); } return value; } \ No newline at end of file