--- parser3/src/main/execute.C	2001/02/25 17:35:49	1.47
+++ parser3/src/main/execute.C	2001/03/08 16:54:27	1.77
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.47 2001/02/25 17:35:49 paf Exp $
+  $Id: execute.C,v 1.77 2001/03/08 16:54:27 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -11,6 +11,8 @@
 #include "pa_vcframe.h"
 #include "pa_vmframe.h"
 #include "pa_vobject.h"
+#include "pa_vdouble.h"
+#include "pa_vbool.h"
 
 #include <stdio.h>
 
@@ -20,17 +22,30 @@
 
 
 char *opcode_name[]={
-	"STRING",  "CODE",  "CLASS",
-	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
+	// literals
+	"VALUE",  "CODE__STORE_PARAM",
+
+	// actions
+	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
+	"GET_CLASS",
 	"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", "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"
 };
 
 void dump(int level, const Array& ops) {
@@ -51,28 +66,25 @@ 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_CLASS) {
-			VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
-			fprintf(stderr, " \"%s\"", vclass->name().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());
 		}
 		fprintf(stderr, "\n");
 
-		if(op.code==OP_CODE) {
+		if(op.code==OP_CODE__STORE_PARAM) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
 			dump(level+1, *local_ops);
 		}
 	}
+	fflush(stderr);
 }
 
 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();
@@ -80,39 +92,50 @@ 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_index(), opcode_name[op.code]); fflush(stderr);
 
 		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:
+		case OP_CODE__STORE_PARAM:
 			{
+				VMethodFrame *frame=static_cast<VMethodFrame *>(stack.top_value());
+				// code
 				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);
-				PUSH(value);
+				value->set_name(frame->name());
+
+				// store param
+				frame->store_param(value);
 				break;
 			}
-		case OP_CLASS:
+		case OP_GET_CLASS:
 			{
-				VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
-				fprintf(stderr, " \"%s\"", vclass->name().cstr());
-		        PUSH(vclass);
+				String& name=POP_NAME();
+				VClass *vclass=static_cast<VClass *>(classes().get(name));
+				if(!vclass) 
+					THROW(0,0,
+						&name,
+						": undefined class"); 
+
+				PUSH(vclass);
 				break;
 			}
 			
-			// OP_WITH
+		// OP_WITH
 		case OP_WITH_SELF: 
 			{
 				PUSH(self);
@@ -134,7 +157,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 			
-			// ...
+		// OTHER ACTIONS BUT WITHs
 		case OP_CONSTRUCT:
 			{
 				Value *value=POP();
@@ -144,11 +167,10 @@ 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();
-				wcontext->write(value);
+				wcontext->write(*value);
 				break;
 			}
 			
@@ -162,7 +184,7 @@ void Request::execute(const Array& ops)
 		case OP_GET_ELEMENT__WRITE:
 			{
 				Value *value=get_element();
-				wcontext->write(value);
+				wcontext->write(*value);
 				break;
 			}
 
@@ -193,33 +215,50 @@ 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();
-				// [self/class?;params;local;code/native_code](name)
+				// info: this one's always method-junction, not a code-junction
 				Junction *junction=value->get_junction();
 				if(!junction)
 					THROW(0,0,
 						&value->name(),
 						"type is '%s', can not call it (must be method or junction)",
 							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;
 			}
 		case OP_STORE_PARAM:
 			{
 				Value *value=POP();
-				VMethodFrame *frame=static_cast<VMethodFrame *>(stack[0]);
+				VMethodFrame *frame=static_cast<VMethodFrame *>(stack.top_value());
 				frame->store_param(value);
 				break;
 			}
@@ -235,25 +274,31 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext); 
 				
 				VClass *called_class=frame->junction.self.get_class();
-				// constructing?
-				if(wcontext->constructing()) {  // yes
-					// constructor call: $some(^class:method(..))
-					self=NEW VObject(pool(), *called_class);
-					frame->write(self);
-				} else {  // no
-					// context is object or class & is it my class or my parent's class?
-					VClass *read_class=rcontext->get_class();
-					if(read_class && read_class->is_or_derived_from(*called_class)) // yes
-						self=rcontext; // class dynamic call
-					else // no
-						self=&frame->junction.self; // static or simple dynamic call
-				}
+				// is context object or class & is it my class or my parent's class?
+				VClass *read_class=rcontext->get_class();
+				if(read_class && read_class->is_or_derived_from(*called_class)) // yes
+					self=rcontext; // class dynamic call
+				else // no, not me or relative of mine (total stranger)
+					if(wcontext->constructing()) {  // constructing?
+						// yes, constructor call: $some(^class:method(..))
+						self=NEW VObject(*called_class);
+						frame->write(*self);
+					} else 
+						self=&frame->junction.self; // no, static or simple dynamic call
+
 				frame->set_self(*self);
 				root=rcontext=wcontext=frame;
 				{
-					VAliased *aliased=reinterpret_cast<VAliased *>(self->get_aliased());
+					// take object or class from any wrappers
+					VAliased *aliased=self->get_aliased();
+					// substitute class alias to the class they are called AS
 					Temp_alias temp_alias(*aliased, *frame->junction.vclass);
-					execute(frame->junction.method->code);
+
+					Method& method=*frame->junction.method;
+					if(method.native_code) // native code?
+						(*method.native_code)(*this, frame->numbered_params()); // execute it
+					else // parser code
+						execute(*method.parser_code); // execute it
 				}
 				Value *value=wcontext->result();
 
@@ -261,14 +306,237 @@ 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 ops: unary
+		case OP_NEG:
+			{
+				Value *operand=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					-operand->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_INV:
+			{
+				Value *operand=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					~static_cast<int>(operand->get_double())));
+				PUSH(value);
+				break;
+			}
+		case OP_NOT:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), !operand->get_bool()));
+				PUSH(value);
+				break;
+			}
+		case OP_DEF:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), operand->get_defined()));
+				PUSH(value);
+				break;
+			}
+		case OP_IN:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), true/*TODO*/));
+				PUSH(value);
+				break;
+			}
+		case OP_FEXISTS:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), true/*TODO*/));
+				PUSH(value);
+				break;
+			}
+
+		// expression ops: binary
+		case OP_SUB: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					a->get_double() - b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_ADD: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					a->get_double() + b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_MUL: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					a->get_double() * b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_DIV: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(*NEW Double(pool(), 
+					a->get_double() / b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_MOD: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VDouble(*NEW Double(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(*NEW Double(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(*NEW Double(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(*NEW Double(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(*NEW Bool(pool(), a->get_bool() && b->get_bool()));
+				PUSH(value);
+				break;
+			}
+		case OP_LOG_OR:
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_bool() || b->get_bool()));
+				PUSH(value);
+				break;
+			}
+		case OP_LOG_XOR:
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_bool() ^ b->get_bool()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_LT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() < b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_GT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() > b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_LE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() <= b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_GE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() >= b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_EQ: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() == b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_NUM_NE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->get_double() != b->get_double()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_LT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() < b->as_string()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_GT: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() > b->as_string()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_LE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() <= b->as_string()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_GE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() >= b->as_string()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_EQ: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() == b->as_string()));
+				PUSH(value);
+				break;
+			}
+		case OP_STR_NE: 
+			{
+				Value *b=POP();  Value *a=POP();
+				Value *value=NEW VBool(*NEW Bool(pool(), a->as_string() != b->as_string()));
+				PUSH(value);
+				break;
+			}
+
 		default:
-			fprintf(stderr, "\tTODO");
-			break;
+			THROW(0,0,
+				0,
+				"unhandled '%s' opcode", opcode_name[op.code]); 
 		}
 		fprintf(stderr, "\n");
 	}
@@ -279,37 +547,61 @@ Value *Request::get_element() {
 	Value *ncontext=POP();
 	Value *value=ncontext->get_element(name);
 
-	if(value) {
-		Junction *junction=value->get_junction();
-		if(junction && junction->code) { // is it a code-junction?
-			// autocalc it
-			fprintf(stderr, "ja->\n");
-			PUSH(self);  
-			PUSH(root);  
-			PUSH(rcontext);  
-			PUSH(wcontext);
+	if(value)
+		value=&autocalc(*value); // autocalc possible code-junction
+	else {
+		value=NEW VUnknown(pool());
+		value->set_name(name);
+	}
 
+	return value;
+}
+
+Value& Request::autocalc(Value& value, bool make_string) {
+	Junction *junction=value.get_junction();
+	if(junction && junction->code) { // is it a code-junction?
+		// autocalc it
+		fprintf(stderr, "ja->\n");
+		PUSH(self);  
+		PUSH(root);  
+		PUSH(rcontext);  
+		PUSH(wcontext);
+		
+		WContext *frame;
+		if(make_string) {
 			// almost plain wwrapper about junction wcontext, 
 			// BUT intercepts string writes
-			VCodeFrame frame(pool(), *junction->wcontext);  wcontext=&frame;
-			self=&junction->self;
-			root=junction->root;
-			rcontext=junction->rcontext;
-			execute(*junction->code);
+			frame=NEW VCodeFrame(pool(), *junction->wcontext);  
+		} else {
+			// plain wwrapper
+			frame=NEW WWrapper(pool(), 0 /* empty */, false /*not constructing*/);
+		}
+		
+		wcontext=frame;
+		self=&junction->self;
+		root=junction->root;
+		rcontext=junction->rcontext;
+		execute(*junction->code);
+		Value *result;
+		if(make_string) {
 			// CodeFrame soul:
 			//   string writes were intercepted
 			//   returning them as the result of getting code-junction
-			value=NEW VString(*frame.get_string());
-
-			wcontext=static_cast<WContext *>(POP());  
-			rcontext=POP();  
-			root=POP();  
-			self=static_cast<VAliased *>(POP());
-			fprintf(stderr, "<-ja returned");
-		}
-	} else {
-		value=NEW VUnknown(pool());
-		value->set_name(name);
-	}
-	return value;
+			result=NEW VString(*frame->get_string());
+		} else 
+			result=frame->result();
+		
+		wcontext=static_cast<WContext *>(POP());  
+		rcontext=POP();  
+		root=POP();  
+		self=static_cast<VAliased *>(POP());
+		
+		fprintf(stderr, "<-ja returned");
+		return *result;
+	} else
+		return value;
 }
+
+void Request::write(Value& avalue) {
+	wcontext->write(avalue);
+}
\ No newline at end of file