--- parser3/src/main/execute.C	2001/02/22 13:33:28	1.17
+++ parser3/src/main/execute.C	2001/02/22 16:21:49	1.22
@@ -1,22 +1,23 @@
 /*
-  $Id: execute.C,v 1.17 2001/02/22 13:33:28 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",  "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 +33,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");
 
@@ -76,40 +73,35 @@ 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:
-			{
-				String *string=static_cast<String *>(stack.pop());
-				wcontext->write(string);
-				break;
-			}
-			
-		case OP_WRITE_VALUE:
+		case OP_WRITE:
 			{
 				Value *value=static_cast<Value *>(stack.pop());
 				wcontext->write(value);
@@ -123,7 +115,7 @@ void Request::execute(Array& ops) {
 				break;
 			}
 
-		case OP_GET_ELEMENT__WRITE_VALUE:
+		case OP_GET_ELEMENT__WRITE:
 			{
 				Value *value=get_element();
 				wcontext->write(value);
@@ -153,9 +145,14 @@ void Request::execute(Array& ops) {
 }
 
 Value *Request::get_element() {
-	String *name=static_cast<String *>(stack.pop());
+	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