--- parser3/src/main/execute.C	2001/02/25 18:02:12	1.48
+++ parser3/src/main/execute.C	2001/03/06 14:32:19	1.52
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.48 2001/02/25 18:02:12 paf Exp $
+  $Id: execute.C,v 1.52 2001/03/06 14:32:19 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -11,6 +11,7 @@
 #include "pa_vcframe.h"
 #include "pa_vmframe.h"
 #include "pa_vobject.h"
+#include "pa_vdouble.h"
 
 #include <stdio.h>
 
@@ -20,17 +21,30 @@
 
 
 char *opcode_name[]={
-	"STRING",  "CODE",  "CLASS",
-	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
+	// literals
+	"VALUE",  "CODE",  "CLASS",
+
+	// actions
+	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
-	"EXPRESSION_EVAL",	"MODIFY_EVAL",
 	"WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
 	"CREATE_RWPOOL",	"REDUCE_RWPOOL",
+  	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"CALL"
+	"CALL",
+
+	// expression ops: unary
+	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS",
+	// expression ops: binary
+	"SUB", "ADD", "MUL", "DIV", "MOD",
+	"BIN_AND", "BIN_OR",
+	"LOG_AND", "LOG_OR",
+	"NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE",
+	"STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE",
+	"XOR"
 };
 
 void dump(int level, const Array& ops) {
@@ -51,9 +65,9 @@ void dump(int level, const Array& ops) {
 		op.cast=ops.quick_get(i);
 		fprintf(stderr, "%*s%s", level*4, "", opcode_name[op.code]);
 
-		if(op.code==OP_STRING) {
-			VString *vstring=static_cast<VString *>(ops.quick_get(++i));
-			fprintf(stderr, " \"%s\"", vstring->get_string()->cstr());
+		if(op.code==OP_VALUE) {
+			Value *value=static_cast<Value *>(ops.quick_get(++i));
+			fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type());
 		}
 		if(op.code==OP_CLASS) {
 			VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
@@ -70,9 +84,9 @@ void dump(int level, const Array& ops) {
 
 void Request::execute(const Array& ops) {
 	if(1) {
-		fputs("source----------------------------", stderr);
+		fputs("source----------------------------\n", stderr);
 		dump(0, ops);
-		fputs("execution-------------------------", stderr);
+		fputs("execution-------------------------\n", stderr);
 	}
 
 	int size=ops.size();
@@ -83,12 +97,12 @@ void Request::execute(const Array& ops)
 		fprintf(stderr, "%d:%s", stack.top(), opcode_name[op.code]);
 
 		switch(op.code) {
-			// param in next instruction
-		case OP_STRING:
+		// param in next instruction
+		case OP_VALUE:
 			{
-				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
-				fprintf(stderr, " \"%s\"", vstring->get_string()->cstr());
-				PUSH(vstring);
+				Value *value=static_cast<Value *>(ops.quick_get(++i));
+				fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type());
+				PUSH(value);
 				break;
 			}
 		case OP_CODE:
@@ -112,7 +126,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-			// OP_WITH
+		// OP_WITH
 		case OP_WITH_SELF: 
 			{
 				PUSH(self);
@@ -134,7 +148,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-			// ...
+		// OTHER ACTIONS BUT WITHs
 		case OP_CONSTRUCT:
 			{
 				Value *value=POP();
@@ -144,7 +158,6 @@ void Request::execute(const Array& ops)
 				ncontext->put_element(name, value);
 				break;
 			}
-			// TODO: OP_EXPRESSION_EVAL,	OP_MODIFY_EVAL,
 		case OP_WRITE:
 			{
 				Value *value=POP();
@@ -193,14 +206,30 @@ void Request::execute(const Array& ops)
 		case OP_REDUCE_RWPOOL:
 			{
 				String *string=wcontext->get_string();
-				Value *value=NEW VString(*string);
+				Value *value=string?NEW VString(*string):NEW VString(pool());
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
 				break;
 			}
+		case OP_CREATE_SWPOOL:
+			{
+				PUSH(wcontext);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */);
+				break;
+			}
+		case OP_REDUCE_SWPOOL:
+			{
+				// from "$a $b" part of expression taking only string value,
+				// ignoring any other content of wcontext
+				String *string=wcontext->get_string();
+				Value *value=string?NEW VString(*string):NEW VString(pool());
+				wcontext=static_cast<WContext *>(POP());
+				PUSH(value);
+				break;
+			}
 
-			// CALL
+		// CALL
 		case OP_GET_METHOD_FRAME:
 			{
 				Value *value=POP();
@@ -238,8 +267,7 @@ void Request::execute(const Array& ops)
 				// constructing?
 				if(wcontext->constructing()) {  // yes
 					// constructor call: $some(^class:method(..))
-					self=NEW VObject(pool(), *called_class);
-					frame->write(self);
+					frame->write(self=NEW VObject(pool(), *called_class));
 				} else {  // no
 					// context is object or class & is it my class or my parent's class?
 					VClass *read_class=rcontext->get_class();
@@ -268,6 +296,18 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
+		// EXPRESSION
+		case OP_MUL: 
+			{
+				Value *b=POP();
+				Value *a=POP();
+				Value *value=NEW VDouble(pool(), 
+					a->get_double() *
+					b->get_double());
+				PUSH(value);
+				break;
+			}
+
 		default:
 			fprintf(stderr, "\tTODO");
 			break;