--- parser3/src/main/execute.C	2001/02/21 17:53:02	1.13
+++ parser3/src/main/execute.C	2001/02/22 12:43:55	1.16
@@ -1,22 +1,22 @@
 /*
-  $Id: execute.C,v 1.13 2001/02/21 17:53:02 paf Exp $
+  $Id: execute.C,v 1.16 2001/02/22 12:43:55 paf Exp $
 */
 
 #include "pa_array.h" 
 #include "code.h"
 #include "pa_request.h"
+#include "pa_vstring.h"
 
 #include <stdio.h>
 
 
 char *opcode_name[]={
-	"STRING",
-	"CODE_ARRAY",
+	"STRING",  "VSTRING",  "CODE_ARRAY",
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
 	"EXPRESSION_EVAL",	"MODIFY_EVAL",
-	"WRITE",
-	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
+	"WRITE_STRING",  "WRITE_VALUE",
+	"GET_ELEMENT",	"GET_ELEMENT__WRITE_VALUE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
 	"CREATE_RWPOOL",	"REDUCE_RWPOOL",
 	"GET_METHOD_FRAME",
@@ -32,9 +32,13 @@ void dump(int level, const Array& ops) {
 		printf("%*s%s", level*4, "", opcode_name[code]);
 
 		if(code==OP_STRING) {
-			const String *string=static_cast<const String *>(ops.quick_get(++i));
+			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());
+		}
 		printf("\n");
 
 		if(code==OP_CODE_ARRAY) {
@@ -45,7 +49,7 @@ void dump(int level, const Array& ops) {
 }
 
 void Request::execute(Array& ops) {
-	if(1) {
+	if(0) {
 		puts("---------------------------");
 		dump(0, ops);
 		puts("---------------------------");
@@ -54,7 +58,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\n", opcode_name[code]);
+		printf("%s", opcode_name[code]);
 
 		if(code==OP_CODE_ARRAY) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
@@ -67,14 +71,28 @@ void Request::execute(Array& ops) {
 				stack.push(wcontext);
 				break;
 			}
+		case OP_WITH_READ: 
+			{
+				stack.push(rcontext);
+				break;
+			}
 			
 		case OP_STRING:
 			{
 				String *string=static_cast<String *>(ops.quick_get(++i));
+				printf(" \"%s\"", string->cstr());
 				stack.push(string);
 				break;
 			}
 			
+		case OP_VSTRING:
+			{
+				Value *value=static_cast<Value *>(ops.quick_get(++i));
+				printf(" \"%s\"", value->get_string()->cstr());
+				stack.push(value);
+				break;
+			}
+			
 		case OP_CONSTRUCT:
 			{
 				Value *value=static_cast<Value *>(stack.pop());
@@ -84,14 +102,21 @@ void Request::execute(Array& ops) {
 				break;
 			}
 			
-		/*case OP_WRITE:
+		case OP_WRITE_STRING:
+			{
+				String *string=static_cast<String *>(stack.pop());
+				wcontext->write(string);
+				break;
+			}
+			
+		case OP_WRITE_VALUE:
 			{
 				Value *value=static_cast<Value *>(stack.pop());
-				wcontext.write(value);
+				wcontext->write(value);
 				break;
-			}*/
+			}
 			
-		/*case OP_GET_ELEMENT:
+		case OP_GET_ELEMENT:
 			{
 				String *name=static_cast<String *>(stack.pop());
 				Value *ncontext=static_cast<Value *>(stack.pop());
@@ -99,11 +124,12 @@ void Request::execute(Array& ops) {
 				// name бывает имя junction, тогда или оставляет в покое, или вычисляет в зависимости от флага АВТОВЫЧИСЛЯТЬ
 				stack.push(value);
 				break;
-			}*/
+			}
 			
 		default:
-			printf("\tTODO\n");
+			printf("\tTODO");
 			break;
 		}
+		printf("\n");
 	}
 }