--- parser3/src/main/execute.C	2001/03/06 12:22:58	1.49
+++ parser3/src/main/execute.C	2001/03/06 14:09:36	1.51
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.49 2001/03/06 12:22:58 paf Exp $
+  $Id: execute.C,v 1.51 2001/03/06 14:09:36 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -25,9 +25,8 @@ char *opcode_name[]={
 	"STRING",  "CODE",  "CLASS",
 
 	// actions
-	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
+	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
-	"EXPRESSION_EVAL",	"MODIFY_EVAL",
 	"WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
@@ -35,7 +34,7 @@ char *opcode_name[]={
   	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"CALL"
+	"CALL",
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS",
@@ -85,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();
@@ -98,7 +97,7 @@ void Request::execute(const Array& ops)
 		fprintf(stderr, "%d:%s", stack.top(), opcode_name[op.code]);
 
 		switch(op.code) {
-			// param in next instruction
+		// param in next instruction
 		case OP_STRING:
 			{
 				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
@@ -127,7 +126,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-			// OP_WITH
+		// OP_WITH
 		case OP_WITH_SELF: 
 			{
 				PUSH(self);
@@ -149,7 +148,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-			// ...
+		// OTHER ACTIONS BUT WITHs
 		case OP_CONSTRUCT:
 			{
 				Value *value=POP();
@@ -159,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();
@@ -208,7 +206,7 @@ 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);
@@ -217,7 +215,7 @@ void Request::execute(const Array& ops)
 		case OP_CREATE_SWPOOL:
 			{
 				PUSH(wcontext);
-				wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */, false /* not constructing */);
 				break;
 			}
 		case OP_REDUCE_SWPOOL:
@@ -225,13 +223,13 @@ void Request::execute(const Array& ops)
 				// from "$a $b" part of expression taking only string value,
 				// ignoring any other content of wcontext
 				String *string=wcontext->get_string();
-				Value *value=NEW VString(*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();
@@ -269,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();
@@ -299,6 +296,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
+		// EXPRESSION
 		case OP_MUL: 
 			{
 				Value *b=POP();