--- parser3/src/main/execute.C	2001/02/21 17:36:58	1.11
+++ parser3/src/main/execute.C	2001/02/22 16:21:49	1.22
@@ -1,17 +1,18 @@
 /*
-  $Id: execute.C,v 1.11 2001/02/21 17:36:58 paf Exp $
+  $Id: execute.C,v 1.22 2001/02/22 16:21:49 paf Exp $
 */
 
 #include "pa_array.h" 
 #include "code.h"
 #include "pa_request.h"
+#include "pa_vstring.h"
+#include "pa_vhash.h"
 
 #include <stdio.h>
 
 
 char *opcode_name[]={
-	"STRING",
-	"CODE_ARRAY",
+	"STRING",  "CODE_ARRAY",
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
 	"EXPRESSION_EVAL",	"MODIFY_EVAL",
@@ -32,7 +33,8 @@ void dump(int level, const Array& ops) {
 		printf("%*s%s", level*4, "", opcode_name[code]);
 
 		if(code==OP_STRING) {
-			printf(" \"%s\"", static_cast<const String *>(ops.quick_get(++i))->cstr());
+			VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+			printf(" \"%s\"", vstring->get_string()->cstr());
 		}
 		printf("\n");
 
@@ -44,57 +46,113 @@ void dump(int level, const Array& ops) {
 }
 
 void Request::execute(Array& ops) {
+	if(0) {
+		puts("---------------------------");
+		dump(0, ops);
+		puts("---------------------------");
+	}
+
 	int size=ops.size();
 	for(int i=0; i<size; i++) {
 		int code=reinterpret_cast<int>(ops.quick_get(i));
-		printf("%s\n", opcode_name[code]);
+		printf("%d:%s", stack.top(), opcode_name[code]);
 
 		if(code==OP_CODE_ARRAY) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 			//dump(level+1, *local_ops);
 		}
-
+		
 		switch(code) {
 		case OP_WITH_WRITE: 
 			{
-			stack.push(wcontext);
-			break;
+				stack.push(wcontext);
+				break;
 			}
-
+		case OP_WITH_READ: 
+			{
+				stack.push(rcontext);
+				break;
+			}
+		case OP_WITH_ROOT: 
+			{
+				stack.push(root);
+				break;
+			}
+		case OP_WITH_SELF: 
+			{
+				stack.push(self);
+				break;
+			}
+			
 		case OP_STRING:
 			{
-			String *string=static_cast<String *>(ops.quick_get(++i));
-			stack.push(string);
-			break;
+				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+				printf(" \"%s\"", vstring->get_string()->cstr());
+				stack.push(vstring);
+				break;
 			}
-
+			
 		case OP_CONSTRUCT:
 			{
-			Value *value=static_cast<Value *>(stack.pop());
-			String *name=static_cast<String *>(stack.pop());
-			Value *ncontext=static_cast<Value *>(stack.pop());
-			ncontext->put_element(*name, value);
-			break;
+				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);
+				break;
 			}
-
+			
+		case OP_WRITE:
+			{
+				Value *value=static_cast<Value *>(stack.pop());
+				wcontext->write(value);
+				break;
+			}
+			
 		case OP_GET_ELEMENT:
 			{
-			String *name=static_cast<String *>(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)
-			// name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ
-			stack.push(value);
-			break;
+				Value *value=get_element();
+				stack.push(value);
+				break;
 			}
 
+		case OP_GET_ELEMENT__WRITE:
+			{
+				Value *value=get_element();
+				wcontext->write(value);
+				break;
+			}
+
+		case OP_CREATE_EWPOOL:
+			{
+				stack.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);
+				break;
+			}
+			
 		default:
-			printf("\tTODO\n");
+			printf("\tTODO");
 			break;
 		}
+		printf("\n");
 	}
-
-	return;
-	puts("---------------------------");
-	dump(0, ops);
-	puts("---------------------------");
 }
+
+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)
+	// name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ
+
+	if(!value) {
+		value=NEW VHash(pool());
+		ncontext->put_element(*name, value);
+	}
+	return value;
+}
\ No newline at end of file