--- parser3/src/main/execute.C	2001/03/06 15:30:49	1.54
+++ parser3/src/main/execute.C	2001/03/08 09:13:33	1.64
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.54 2001/03/06 15:30:49 paf Exp $
+  $Id: execute.C,v 1.64 2001/03/08 09:13:33 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -41,11 +41,10 @@ char *opcode_name[]={
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS",
 	// expression ops: binary
 	"SUB", "ADD", "MUL", "DIV", "MOD",
-	"BIN_AND", "BIN_OR",
-	"LOG_AND", "LOG_OR",
+	"BIN_AND", "BIN_OR", "BIN_XOR",
+	"LOG_AND", "LOG_OR", "LOG_XOR",
 	"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"
+	"STR_LT", "STR_GT", "STR_LE", "STR_GE", "STR_EQ", "STR_NE"
 };
 
 void dump(int level, const Array& ops) {
@@ -81,6 +80,7 @@ void dump(int level, const Array& ops) {
 			dump(level+1, *local_ops);
 		}
 	}
+	fflush(stderr);
 }
 
 void Request::execute(const Array& ops) {
@@ -95,7 +95,7 @@ void Request::execute(const Array& ops)
 	for(int i=0; i<size; i++) {
 		Operation op;
 		op.cast=ops.quick_get(i);
-		fprintf(stderr, "%d:%s", stack.top(), opcode_name[op.code]);
+		fprintf(stderr, "%d:%s", stack.top()+1, opcode_name[op.code]); fflush(stderr);
 
 		switch(op.code) {
 		// param in next instruction
@@ -108,14 +108,17 @@ void Request::execute(const Array& ops)
 			}
 		case OP_CODE:
 			{
+				VMethodFrame *frame=static_cast<VMethodFrame *>(stack[stack.top()]);
 				const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 				fprintf(stderr, " (%d)\n", local_ops->size());
 				dump(1, *local_ops);
+				
 				Junction& j=*NEW Junction(pool(), 
 					*self, 0, 0,
-					root,rcontext,wcontext,local_ops);
+					root, frame, frame, local_ops);
 				
 				Value *value=NEW VJunction(j);
+				value->set_name(frame->name());
 				PUSH(value);
 				break;
 			}
@@ -243,6 +246,7 @@ void Request::execute(const Array& ops)
 							value->type()); 
 				//unless(method) method=operators.get_method[...;code/native_code](name)
 				VMethodFrame *frame=NEW VMethodFrame(pool(), *junction);
+				frame->set_name(junction->self.name());
 				PUSH(frame);
 				break;
 			}
@@ -292,71 +296,224 @@ void Request::execute(const Array& ops)
 				rcontext=POP();  
 				root=POP();  
 				self=static_cast<VAliased *>(POP());
-				wcontext->write(value);
+
+				PUSH(value);
 				fprintf(stderr, "<-returned");
 				break;
 			}
 
-		// EXPRESSION
-		case OP_ADD: 
+		// expression ops: unary
+		case OP_NEG:
+			{
+				Value *operand=POP();
+				Value *value=NEW VDouble(pool(), -operand->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_INV:
 			{
-				Value *b=POP();
-				Value *a=POP();
+				Value *operand=POP();
 				Value *value=NEW VDouble(pool(), 
-					a->get_double() +
-					b->get_double());
+					~static_cast<int>(operand->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NOT:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(pool(), !operand->get_bool());
+				PUSH(value);
+				break;
+			}
+		case OP_DEF:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(pool(), operand->get_defined());
+				PUSH(value);
+				break;
+			}
+		case OP_IN:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(pool(), true/*TODO*/);
+				PUSH(value);
+				break;
+			}
+		case OP_FEXISTS:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(pool(), true/*TODO*/);
 				PUSH(value);
 				break;
 			}
+
+		// expression ops: binary
 		case OP_SUB: 
 			{
-				Value *b=POP();
-				Value *a=POP();
-				Value *value=NEW VDouble(pool(), 
-					a->get_double() -
-					b->get_double());
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), a->get_double() - b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_ADD: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), a->get_double() + b->get_double());
 				PUSH(value);
 				break;
 			}
 		case OP_MUL: 
 			{
-				Value *b=POP();
-				Value *a=POP();
-				Value *value=NEW VDouble(pool(), 
-					a->get_double() *
-					b->get_double());
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), a->get_double() * b->get_double());
 				PUSH(value);
 				break;
 			}
 		case OP_DIV: 
 			{
-				Value *b=POP();
-				Value *a=POP();
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), a->get_double() / b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_MOD: 
+			{
+				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					a->get_double() /
-					b->get_double());
+					static_cast<int>(a->get_double()) %
+					static_cast<int>(b->get_double()));
 				PUSH(value);
 				break;
 			}
-		case OP_NEG:
+		case OP_BIN_AND:
 			{
-				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), -operand->get_double());
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), 
+					static_cast<int>(a->get_double()) &
+					static_cast<int>(b->get_double()));
 				PUSH(value);
 				break;
 			}
-		case OP_INV:
+		case OP_BIN_OR:
 			{
-				Value *operand=POP();
+				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					~static_cast<int>(operand->get_double()));
+					static_cast<int>(a->get_double()) |
+					static_cast<int>(b->get_double()));
 				PUSH(value);
 				break;
 			}
-		case OP_NOT:
+		case OP_BIN_XOR:
 			{
-				Value *operand=POP();
-				Value *value=NEW VBool(pool(), !operand->get_bool());
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(pool(), 
+					static_cast<int>(a->get_double()) ^
+					static_cast<int>(b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_LOG_AND:
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_bool() && b->get_bool());
+				PUSH(value);
+				break;
+			}
+		case OP_LOG_OR:
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_bool() || b->get_bool());
+				PUSH(value);
+				break;
+			}
+		case OP_LOG_XOR:
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_bool() ^ b->get_bool());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_LT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() < b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_GT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() > b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_LE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() <= b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_GE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() >= b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_EQ: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() == b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_NE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->get_double() != b->get_double());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_LT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() < b->as_string());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_GT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() > b->as_string());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_LE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() <= b->as_string());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_GE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() >= b->as_string());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_EQ: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() == b->as_string());
+				PUSH(value);
+				break;
+			}
+		case OP_STR_NE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(pool(), a->as_string() != b->as_string());
 				PUSH(value);
 				break;
 			}
@@ -400,11 +557,12 @@ Value *Request::get_element() {
 			rcontext=POP();  
 			root=POP();  
 			self=static_cast<VAliased *>(POP());
+
 			fprintf(stderr, "<-ja returned");
 		}
-	} else {
+	} else
 		value=NEW VUnknown(pool());
-		value->set_name(name);
-	}
+
+	value->set_name(name);
 	return value;
 }