--- parser3/src/main/execute.C	2001/02/22 12:43:55	1.16
+++ parser3/src/main/execute.C	2001/02/22 14:14:07	1.20
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.16 2001/02/22 12:43:55 paf Exp $
+  $Id: execute.C,v 1.20 2001/02/22 14:14:07 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -11,12 +11,12 @@
 
 
 char *opcode_name[]={
-	"STRING",  "VSTRING",  "CODE_ARRAY",
+	"STRING",  "CODE_ARRAY",
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
 	"EXPRESSION_EVAL",	"MODIFY_EVAL",
-	"WRITE_STRING",  "WRITE_VALUE",
-	"GET_ELEMENT",	"GET_ELEMENT__WRITE_VALUE",
+	"WRITE",
+	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
 	"CREATE_RWPOOL",	"REDUCE_RWPOOL",
 	"GET_METHOD_FRAME",
@@ -32,12 +32,8 @@ void dump(int level, const Array& ops) {
 		printf("%*s%s", level*4, "", opcode_name[code]);
 
 		if(code==OP_STRING) {
-			String *string=static_cast<String *>(ops.quick_get(++i));
-			printf(" \"%s\"", string->cstr());
-		}
-		if(code==OP_VSTRING) {
-			Value *value=static_cast<Value *>(ops.quick_get(++i));
-			printf(" \"%s\"", value->get_string()->cstr());
+			VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+			printf(" \"%s\"", vstring->get_string()->cstr());
 		}
 		printf("\n");
 
@@ -58,7 +54,7 @@ void Request::execute(Array& ops) {
 	int size=ops.size();
 	for(int i=0; i<size; i++) {
 		int code=reinterpret_cast<int>(ops.quick_get(i));
-		printf("%s", 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));
@@ -76,52 +72,65 @@ void Request::execute(Array& ops) {
 				stack.push(rcontext);
 				break;
 			}
-			
-		case OP_STRING:
+		case OP_WITH_ROOT: 
 			{
-				String *string=static_cast<String *>(ops.quick_get(++i));
-				printf(" \"%s\"", string->cstr());
-				stack.push(string);
+				stack.push(root);
+				break;
+			}
+		case OP_WITH_SELF: 
+			{
+				stack.push(self);
 				break;
 			}
 			
-		case OP_VSTRING:
+		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());
+				stack.push(vstring);
 				break;
 			}
 			
 		case OP_CONSTRUCT:
 			{
 				Value *value=static_cast<Value *>(stack.pop());
-				String *name=static_cast<String *>(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_STRING:
+		case OP_WRITE:
 			{
-				String *string=static_cast<String *>(stack.pop());
-				wcontext->write(string);
+				Value *value=static_cast<Value *>(stack.pop());
+				wcontext->write(value);
 				break;
 			}
 			
-		case OP_WRITE_VALUE:
+		case OP_GET_ELEMENT:
 			{
-				Value *value=static_cast<Value *>(stack.pop());
+				Value *value=get_element();
+				stack.push(value);
+				break;
+			}
+
+		case OP_GET_ELEMENT__WRITE:
+			{
+				Value *value=get_element();
 				wcontext->write(value);
 				break;
 			}
-			
-		case OP_GET_ELEMENT:
+
+		case OP_CREATE_EWPOOL:
 			{
-				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(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;
 			}
@@ -133,3 +142,11 @@ void Request::execute(Array& ops) {
 		printf("\n");
 	}
 }
+
+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, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ
+	return value;
+}
\ No newline at end of file