--- parser3/src/main/execute.C	2001/03/06 15:02:48	1.53
+++ parser3/src/main/execute.C	2001/03/07 08:27:10	1.57
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.53 2001/03/06 15:02:48 paf Exp $
+  $Id: execute.C,v 1.57 2001/03/07 08:27:10 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -12,6 +12,7 @@
 #include "pa_vmframe.h"
 #include "pa_vobject.h"
 #include "pa_vdouble.h"
+#include "pa_vbool.h"
 
 #include <stdio.h>
 
@@ -40,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) {
@@ -110,6 +110,11 @@ void Request::execute(const Array& ops)
 				const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 				fprintf(stderr, " (%d)\n", local_ops->size());
 				dump(1, *local_ops);
+				// TODO: rcontext junction должен быть контекстом вызываемого объекта
+				// чтобы вот эти конструкции орудовали одними полями внутри {}  :
+				//   $var{$field}
+				//   ^var.menu{$field}
+				// поскольку они суть одно и то же, и так удобнее
 				Junction& j=*NEW Junction(pool(), 
 					*self, 0, 0,
 					root,rcontext,wcontext,local_ops);
@@ -296,23 +301,48 @@ void Request::execute(const Array& ops)
 				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 *operand=POP();
+				Value *value=NEW VDouble(pool(), 
+					~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;
+			}
+		//todo: def in fexists
+
+		// expression ops: binary
+		case OP_SUB: 
 			{
 				Value *b=POP();
 				Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					a->get_double() +
+					a->get_double() -
 					b->get_double());
 				PUSH(value);
 				break;
 			}
-		case OP_SUB: 
+		case OP_ADD: 
 			{
 				Value *b=POP();
 				Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					a->get_double() -
+					a->get_double() +
 					b->get_double());
 				PUSH(value);
 				break;
@@ -337,6 +367,151 @@ void Request::execute(const Array& ops)
 				PUSH(value);
 				break;
 			}
+		case OP_MOD: 
+			{
+				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_BIN_AND:
+			{
+				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_BIN_OR:
+			{
+				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_BIN_XOR:
+			{
+				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:
+		case OP_STR_GT:
+		case OP_STR_LE: 
+		case OP_STR_GE: 
+		case OP_STR_EQ:
+		case OP_STR_NE:
+			{
+				Value *b=POP();
+				Value *a=POP();
+				Value *value=NEW VBool(pool(), 
+					/*a->get_string() @
+					b->get_string()*/false);
+				PUSH(value);
+				break;
+			}
 
 		default:
 			fprintf(stderr, "\tTODO");