--- parser3/src/main/execute.C	2001/02/22 13:52:26	1.18
+++ parser3/src/main/execute.C	2001/02/23 11:53:06	1.26
@@ -1,17 +1,22 @@
 /*
-  $Id: execute.C,v 1.18 2001/02/22 13:52:26 paf Exp $
+  $Id: execute.C,v 1.26 2001/02/23 11:53:06 paf Exp $
 */
 
 #include "pa_array.h" 
 #include "code.h"
 #include "pa_request.h"
 #include "pa_vstring.h"
+#include "pa_vhash.h"
+#include "pa_vunknown.h"
 
 #include <stdio.h>
 
+#define PUSH(value) stack.push(value)
+#define POP() static_cast<Value *>(stack.pop())
+
 
 char *opcode_name[]={
-	"VALUE",  "CODE_ARRAY",
+	"STRING",  "CODE_ARRAY",
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
 	"EXPRESSION_EVAL",	"MODIFY_EVAL",
@@ -26,18 +31,30 @@ char *opcode_name[]={
 };
 
 void dump(int level, const Array& ops) {
+	if(0){
+		int size=ops.size();
+		printf("size=%d\n", size);
+		for(int i=0; i<size; i++) {
+			Operation op;
+			op.cast=ops.quick_get(i);
+			printf("%8X\n", op.cast);
+		}
+	}
+
 	int size=ops.size();
+	printf("size=%d\n", size);
 	for(int i=0; i<size; i++) {
-		int code=reinterpret_cast<int>(ops.quick_get(i));
-		printf("%*s%s", level*4, "", opcode_name[code]);
-
-		if(code==OP_VALUE) {
-			Value *value=static_cast<Value *>(ops.quick_get(++i));
-			printf(" \"%s\"", value->get_string()->cstr());
+		Operation op;
+		op.cast=ops.quick_get(i);
+		printf("%*s%s", level*4, "", opcode_name[op.code]);
+
+		if(op.code==OP_STRING) {
+			VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+			printf(" \"%s\"", vstring->get_string()->cstr());
 		}
 		printf("\n");
 
-		if(code==OP_CODE_ARRAY) {
+		if(op.code==OP_CODE_ARRAY) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 			dump(level+1, *local_ops);
 		}
@@ -52,47 +69,60 @@ void Request::execute(Array& ops) {
 	}
 
 	int size=ops.size();
+	printf("size=%d\n", size);
 	for(int i=0; i<size; i++) {
-		int code=reinterpret_cast<int>(ops.quick_get(i));
-		printf("%d:%s", stack.top(), opcode_name[code]);
+		Operation op;
+		op.cast=ops.quick_get(i);
+		printf("%d:%s", stack.top(), opcode_name[op.code]);
 
-		if(code==OP_CODE_ARRAY) {
+		if(op.code==OP_CODE_ARRAY) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 			//dump(level+1, *local_ops);
 		}
 		
-		switch(code) {
+		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: 
+			{
+				PUSH(root);
+				break;
+			}
+		case OP_WITH_SELF: 
+			{
+				PUSH(self);
 				break;
 			}
 			
-		case OP_VALUE:
+		case OP_STRING:
 			{
-				Value *value=static_cast<Value *>(ops.quick_get(++i));
-				printf(" \"%s\"", value->get_string()->cstr());
-				stack.push(value);
+				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+				printf(" \"%s\"", vstring->get_string()->cstr());
+				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;
 			}
@@ -100,7 +130,7 @@ void Request::execute(Array& ops) {
 		case OP_GET_ELEMENT:
 			{
 				Value *value=get_element();
-				stack.push(value);
+				PUSH(value);
 				break;
 			}
 
@@ -113,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;
@@ -134,9 +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 VUnknown(pool());
+		value->set_name(name);
+	}
 	return value;
 }
\ No newline at end of file