--- parser3/src/main/execute.C 2001/02/21 17:36:58 1.11 +++ parser3/src/main/execute.C 2001/02/22 08:16:31 1.14 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.11 2001/02/21 17:36:58 paf Exp $ + $Id: execute.C,v 1.14 2001/02/22 08:16:31 paf Exp $ */ #include "pa_array.h" @@ -15,8 +15,8 @@ char *opcode_name[]={ "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", - "WRITE", - "GET_ELEMENT", "GET_ELEMENT__WRITE", + "WRITE_STRING", "WRITE_VALUE", + "GET_ELEMENT", "GET_ELEMENT__WRITE_VALUE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", "GET_METHOD_FRAME", @@ -32,7 +32,8 @@ void dump(int level, const Array& ops) { printf("%*s%s", level*4, "", opcode_name[code]); if(code==OP_STRING) { - printf(" \"%s\"", static_cast(ops.quick_get(++i))->cstr()); + const String *string=static_cast(ops.quick_get(++i)); + printf(" \"%s\"", string->cstr()); } printf("\n"); @@ -44,6 +45,12 @@ void dump(int level, const Array& ops) { } void Request::execute(Array& ops) { + if(1) { + puts("---------------------------"); + dump(0, ops); + puts("---------------------------"); + } + int size=ops.size(); for(int i=0; i(ops.quick_get(i)); @@ -53,48 +60,57 @@ void Request::execute(Array& ops) { const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); //dump(level+1, *local_ops); } - + switch(code) { case OP_WITH_WRITE: { - stack.push(wcontext); - break; + stack.push(wcontext); + break; } - + case OP_STRING: { - String *string=static_cast(ops.quick_get(++i)); - stack.push(string); - break; + String *string=static_cast(ops.quick_get(++i)); + stack.push(string); + break; } - + case OP_CONSTRUCT: { - Value *value=static_cast(stack.pop()); - String *name=static_cast(stack.pop()); - Value *ncontext=static_cast(stack.pop()); - ncontext->put_element(*name, value); - break; + Value *value=static_cast(stack.pop()); + String *name=static_cast(stack.pop()); + Value *ncontext=static_cast(stack.pop()); + ncontext->put_element(*name, value); + break; } - - case OP_GET_ELEMENT: + + case OP_WRITE_STRING: { - String *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) - // name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ - stack.push(value); - break; + String *string=static_cast(stack.pop()); + wcontext->write(string); + break; } - + + case OP_WRITE_VALUE: + { + Value *value=static_cast(stack.pop()); + wcontext->write(value); + break; + } + + /*case OP_GET_ELEMENT: + { + String *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) + // name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ + stack.push(value); + break; + }*/ + default: printf("\tTODO\n"); break; } } - - return; - puts("---------------------------"); - dump(0, ops); - puts("---------------------------"); }