--- parser3/src/main/execute.C 2001/02/22 13:52:26 1.18 +++ parser3/src/main/execute.C 2001/02/22 15:39:23 1.21 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.18 2001/02/22 13:52:26 paf Exp $ + $Id: execute.C,v 1.21 2001/02/22 15:39:23 paf Exp $ */ #include "pa_array.h" @@ -11,7 +11,7 @@ char *opcode_name[]={ - "VALUE", "CODE_ARRAY", + "STRING", "CODE_ARRAY", "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", "CONSTRUCT", "EXPRESSION_EVAL", "MODIFY_EVAL", @@ -31,9 +31,9 @@ void dump(int level, const Array& ops) { int code=reinterpret_cast(ops.quick_get(i)); printf("%*s%s", level*4, "", opcode_name[code]); - if(code==OP_VALUE) { - Value *value=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", value->get_string()->cstr()); + if(code==OP_STRING) { + VString *vstring=static_cast(ops.quick_get(++i)); + printf(" \"%s\"", vstring->get_string()->cstr()); } printf("\n"); @@ -72,12 +72,22 @@ void Request::execute(Array& ops) { stack.push(rcontext); break; } + case OP_WITH_ROOT: + { + stack.push(root); + break; + } + case OP_WITH_SELF: + { + stack.push(self); + break; + } - case OP_VALUE: + case OP_STRING: { - Value *value=static_cast(ops.quick_get(++i)); - printf(" \"%s\"", value->get_string()->cstr()); - stack.push(value); + VString *vstring=static_cast(ops.quick_get(++i)); + printf(" \"%s\"", vstring->get_string()->cstr()); + stack.push(vstring); break; } @@ -138,5 +148,8 @@ Value *Request::get_element() { Value *ncontext=static_cast(stack.pop()); Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code) // name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ + + if(!value) + value=NEW VString(pool()); return value; } \ No newline at end of file