--- parser3/src/main/execute.C	2001/02/23 09:43:14	1.23
+++ parser3/src/main/execute.C	2001/02/23 11:53:06	1.26
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.23 2001/02/23 09:43:14 paf Exp $
+  $Id: execute.C,v 1.26 2001/02/23 11:53:06 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -11,6 +11,9 @@
 
 #include <stdio.h>
 
+#define PUSH(value) stack.push(value)
+#define POP() static_cast<Value *>(stack.pop())
+
 
 char *opcode_name[]={
 	"STRING",  "CODE_ARRAY",
@@ -80,22 +83,22 @@ void Request::execute(Array& ops) {
 		switch(op.code) {
 		case OP_WITH_WRITE: 
 			{
-				stack.push(wcontext);
+				PUSH(wcontext);
 				break;
 			}
 		case OP_WITH_READ: 
 			{
-				stack.push(rcontext);
+				PUSH(rcontext);
 				break;
 			}
 		case OP_WITH_ROOT: 
 			{
-				stack.push(root);
+				PUSH(root);
 				break;
 			}
 		case OP_WITH_SELF: 
 			{
-				stack.push(self);
+				PUSH(self);
 				break;
 			}
 			
@@ -103,22 +106,23 @@ void Request::execute(Array& ops) {
 			{
 				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
 				printf(" \"%s\"", vstring->get_string()->cstr());
-				stack.push(vstring);
+				PUSH(vstring);
 				break;
 			}
 			
 		case OP_CONSTRUCT:
 			{
-				Value *value=static_cast<Value *>(stack.pop());
-				VString *name=static_cast<VString *>(stack.pop());
-				Value *ncontext=static_cast<Value *>(stack.pop());
-				ncontext->put_element(*name, value);
+				Value *value=POP();
+				String& name=POP()->as_string();
+				Value *ncontext=POP();
+				value->set_name(name);
+				ncontext->put_element(name, value);
 				break;
 			}
 			
 		case OP_WRITE:
 			{
-				Value *value=static_cast<Value *>(stack.pop());
+				Value *value=POP();
 				wcontext->write(value);
 				break;
 			}
@@ -126,7 +130,7 @@ void Request::execute(Array& ops) {
 		case OP_GET_ELEMENT:
 			{
 				Value *value=get_element();
-				stack.push(value);
+				PUSH(value);
 				break;
 			}
 
@@ -139,18 +143,37 @@ void Request::execute(Array& ops) {
 
 		case OP_CREATE_EWPOOL:
 			{
-				stack.push(wcontext);
+				PUSH(wcontext);
 				wcontext=NEW WContext(pool(), 0 /* empty */);
 				break;
 			}
 		case OP_REDUCE_EWPOOL:
 			{
 				Value *value=wcontext->value();
-				wcontext=static_cast<WContext *>(stack.pop());
-				stack.push(value);
+				wcontext=static_cast<WContext *>(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<WContext *>(POP());
+				rcontext=POP();
+				PUSH(value);
+				break;
+			}
+
 		default:
 			printf("\tTODO");
 			break;
@@ -160,15 +183,14 @@ void Request::execute(Array& ops) {
 }
 
 Value *Request::get_element() {
-	VString *name=static_cast<VString *>(stack.pop());
-	Value *ncontext=static_cast<Value *>(stack.pop());
-	Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code)
+	String& name=POP()->as_string();
+	Value *ncontext=POP();
+	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