--- parser3/src/main/execute.C 2001/02/23 10:17:29 1.24 +++ parser3/src/main/execute.C 2001/02/23 11:53:06 1.26 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.24 2001/02/23 10:17:29 paf Exp $ + $Id: execute.C,v 1.26 2001/02/23 11:53:06 paf Exp $ */ #include "pa_array.h" @@ -113,9 +113,10 @@ void Request::execute(Array& ops) { case OP_CONSTRUCT: { Value *value=POP(); - Value *name=POP(); + String& name=POP()->as_string(); Value *ncontext=POP(); - ncontext->put_element(*name, value); + value->set_name(name); + ncontext->put_element(name, value); break; } @@ -149,11 +150,30 @@ void Request::execute(Array& ops) { case OP_REDUCE_EWPOOL: { Value *value=wcontext->value(); - wcontext=static_cast(stack.pop()); + wcontext=static_cast(POP()); PUSH(value); break; } + case OP_CREATE_RWPOOL: + { + Value *ncontext=POP(); + PUSH(rcontext); + rcontext=ncontext; + PUSH(wcontext); + wcontext=NEW WContext(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; + } + default: printf("\tTODO"); break; @@ -163,15 +183,14 @@ void Request::execute(Array& ops) { } Value *Request::get_element() { - Value *name=POP(); + String& name=POP()->as_string(); Value *ncontext=POP(); - Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code) + 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