--- parser3/src/main/execute.C 2001/02/24 11:20:33 1.34 +++ parser3/src/main/execute.C 2001/02/24 11:46:03 1.36 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.34 2001/02/24 11:20:33 paf Exp $ + $Id: execute.C,v 1.36 2001/02/24 11:46:03 paf Exp $ */ #include "pa_array.h" @@ -162,7 +162,7 @@ void Request::execute(const Array& ops) } case OP_REDUCE_EWPOOL: { - Value *value=wcontext->value_or_string(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); PUSH(value); break; @@ -223,7 +223,7 @@ void Request::execute(const Array& ops) frame->set_self(self); root=rcontext=wcontext=frame; execute(frame->junction.method->code); - Value *value=wcontext->value(); + Value *value=wcontext->result(); wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); wcontext->write(value); printf("<-returned"); @@ -246,7 +246,7 @@ Value *Request::get_element() { if(value) { Junction *junction=value->get_junction(); - if(junction && junction->code) { // is it a code junction? + if(junction && junction->code) { // is it a code-junction? // autocalc it printf("ja->\n"); PUSH(self); PUSH(root); PUSH(rcontext); PUSH(wcontext); @@ -257,11 +257,11 @@ Value *Request::get_element() { root=junction->root; rcontext=junction->rcontext; execute(*junction->code); - // CodeFrame soul: string writes intercepted - String *code_string_result=frame.get_string(); + // CodeFrame soul: + // string writes were intercepted + // returning them as the result of getting code-junction + value=NEW VString(frame.get_string()); wcontext=static_cast(POP()); rcontext=POP(); root=POP(); self=POP(); - // writing string result to current context - wcontext->write(code_string_result); printf("<-ja returned"); } } else {