--- parser3/src/main/execute.C 2001/02/20 19:21:13 1.2 +++ parser3/src/main/execute.C 2001/02/21 17:53:02 1.13 @@ -1,12 +1,14 @@ /* - $Id: execute.C,v 1.2 2001/02/20 19:21:13 paf Exp $ + $Id: execute.C,v 1.13 2001/02/21 17:53:02 paf Exp $ */ -#include "pa_array.h" +#include "pa_array.h" #include "code.h" +#include "pa_request.h" #include + char *opcode_name[]={ "STRING", "CODE_ARRAY", @@ -14,7 +16,6 @@ char *opcode_name[]={ "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", "WRITE", - "REPLACE_RESULT", "GET_ELEMENT", "GET_ELEMENT__WRITE", "CREATE_EWPOOL", "REDUCE_EWPOOL", "CREATE_RWPOOL", "REDUCE_RWPOOL", @@ -24,32 +25,85 @@ char *opcode_name[]={ "CALL" }; -void dump(int level, const Array *ops) { - if(!ops) - return; - - int size=ops->size(); +void dump(int level, const Array& ops) { + int size=ops.size(); for(int i=0; i(ops->raw_get(i)); + int code=reinterpret_cast(ops.quick_get(i)); printf("%*s%s", level*4, "", opcode_name[code]); if(code==OP_STRING) { - printf(" \"%s\"", static_cast(ops->raw_get(++i))->cstr()); + const String *string=static_cast(ops.quick_get(++i)); + printf(" \"%s\"", string->cstr()); } printf("\n"); if(code==OP_CODE_ARRAY) { - const Array *local_ops=reinterpret_cast(ops->raw_get(++i)); - dump(level=1, local_ops); + const Array *local_ops=reinterpret_cast(ops.quick_get(++i)); + dump(level+1, *local_ops); } } } -void execute(Pool *pool, const Array *ops) { - if(!ops) - return; - - puts("---------------------------"); - dump(0, ops); - puts("---------------------------"); +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)); + printf("%s\n", opcode_name[code]); + + if(code==OP_CODE_ARRAY) { + 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; + } + + case OP_STRING: + { + 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; + } + + /*case OP_WRITE: + { + 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; + } + } }