--- parser3/src/main/execute.C	2001/02/21 07:41:56	1.7
+++ parser3/src/main/execute.C	2001/03/08 10:13:26	1.67
@@ -1,54 +1,574 @@
 /*
-  $Id: execute.C,v 1.7 2001/02/21 07:41:56 paf Exp $
+  $Id: execute.C,v 1.67 2001/03/08 10:13:26 paf Exp $
 */
 
-#include "pa_array.h"
+#include "pa_array.h" 
 #include "code.h"
+#include "pa_request.h"
+#include "pa_vstring.h"
+#include "pa_vhash.h"
+#include "pa_vunknown.h"
+#include "pa_vcframe.h"
+#include "pa_vmframe.h"
+#include "pa_vobject.h"
+#include "pa_vdouble.h"
+#include "pa_vbool.h"
 
 #include <stdio.h>
 
+#define PUSH(value) stack.push(value)
+#define POP() static_cast<Value *>(stack.pop())
+#define POP_NAME() static_cast<Value *>(stack.pop())->as_string()
+
+
 char *opcode_name[]={
-	"STRING",
-	"CODE_ARRAY",
-	"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",
-	"CREATE_JUNCTION",
 	"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) {
-	if(!ops)
-		return;
+void dump(int level, const Array& ops) {
+	if(0){
+		int size=ops.size();
+		//fprintf(stderr, "size=%d\n", size);
+		for(int i=0; i<size; i++) {
+			Operation op;
+			op.cast=ops.quick_get(i);
+			fprintf(stderr, "%8X\n", op.cast);
+		}
+	}
 
-	int size=ops->size();
+	int size=ops.size();
+	//fprintf(stderr, "size=%d\n", size);
 	for(int i=0; i<size; i++) {
-		int code=reinterpret_cast<int>(ops->raw_get(i));
-		printf("%*s%s", level*4, "", opcode_name[code]);
+		Operation op;
+		op.cast=ops.quick_get(i);
+		fprintf(stderr, "%*s%s", level*4, "", opcode_name[op.code]);
+
+		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(code==OP_STRING) {
-			printf(" \"%s\"", static_cast<const String *>(ops->raw_get(++i))->cstr());
+		if(op.code==OP_CODE__STORE_PARAM) {
+			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
+			dump(level+1, *local_ops);
 		}
-		printf("\n");
+	}
+	fflush(stderr);
+}
+
+void Request::execute(const Array& ops) {
+	if(1) {
+		fputs("source----------------------------\n", stderr);
+		dump(0, ops);
+		fputs("execution-------------------------\n", stderr);
+	}
+
+	int size=ops.size();
+	//fprintf(stderr, "size=%d\n", size);
+	for(int i=0; i<size; i++) {
+		Operation op;
+		op.cast=ops.quick_get(i);
+		fprintf(stderr, "%d:%s", stack.top()+1, opcode_name[op.code]); fflush(stderr);
+
+		switch(op.code) {
+		// param in next instruction
+		case OP_VALUE:
+			{
+				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__STORE_PARAM:
+			{
+				VMethodFrame *frame=static_cast<VMethodFrame *>(stack[stack.top()]);
+				// 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, frame, frame, local_ops);
+				
+				Value *value=NEW VJunction(j);
+				value->set_name(frame->name());
+
+				// store param
+				frame->store_param(value);
+				break;
+			}
+		case OP_GET_CLASS:
+			{
+				String& name=POP_NAME();
+				VClass *vclass=static_cast<VClass *>(classes().get(name));
+				if(!vclass) 
+					THROW(0,0,
+						&name,
+						": undefined class"); 
 
-		if(code==OP_CODE_ARRAY) {
-			const Array *local_ops=reinterpret_cast<const Array *>(ops->raw_get(++i));
-			dump(level+1, local_ops);
+				PUSH(vclass);
+				break;
+			}
+			
+		// OP_WITH
+		case OP_WITH_SELF: 
+			{
+				PUSH(self);
+				break;
+			}
+		case OP_WITH_ROOT: 
+			{
+				PUSH(root);
+				break;
+			}
+		case OP_WITH_READ: 
+			{
+				PUSH(rcontext);
+				break;
+			}
+		case OP_WITH_WRITE: 
+			{
+				PUSH(wcontext);
+				break;
+			}
+			
+		// OTHER ACTIONS BUT WITHs
+		case OP_CONSTRUCT:
+			{
+				Value *value=POP();
+				String& name=POP_NAME();
+				Value *ncontext=POP();
+				value->set_name(name);
+				ncontext->put_element(name, value);
+				break;
+			}
+		case OP_WRITE:
+			{
+				Value *value=POP();
+				wcontext->write(value);
+				break;
+			}
+			
+		case OP_GET_ELEMENT:
+			{
+				Value *value=get_element();
+				PUSH(value);
+				break;
+			}
+
+		case OP_GET_ELEMENT__WRITE:
+			{
+				Value *value=get_element();
+				wcontext->write(value);
+				break;
+			}
+
+
+		case OP_CREATE_EWPOOL:
+			{
+				PUSH(wcontext);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */);
+				break;
+			}
+		case OP_REDUCE_EWPOOL:
+			{
+				Value *value=wcontext->result();
+				wcontext=static_cast<WContext *>(POP());
+				PUSH(value);
+				break;
+			}
+			
+		case OP_CREATE_RWPOOL:
+			{
+				Value *ncontext=POP();
+				PUSH(rcontext);
+				rcontext=ncontext;
+				PUSH(wcontext);
+				wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */);
+				break;
+			}
+		case OP_REDUCE_RWPOOL:
+			{
+				String *string=wcontext->get_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
+		case OP_GET_METHOD_FRAME:
+			{
+				Value *value=POP();
+				// [self/class?;params;local;code/native_code](name)
+				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]);
+				frame->store_param(value);
+				break;
+			}
+
+		case OP_CALL:
+			{
+				fprintf(stderr, "->\n");
+				VMethodFrame *frame=static_cast<VMethodFrame *>(POP());
+				frame->fill_unspecified_params();
+				PUSH(self);  
+				PUSH(root);  
+				PUSH(rcontext);  
+				PUSH(wcontext); 
+				
+				VClass *called_class=frame->junction.self.get_class();
+				// constructing?
+				if(wcontext->constructing()) {  // yes
+					// constructor call: $some(^class:method(..))
+					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();
+					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
+				}
+				frame->set_self(*self);
+				root=rcontext=wcontext=frame;
+				{
+					// 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);
+				}
+				Value *value=wcontext->result();
+
+				wcontext=static_cast<WContext *>(POP());  
+				rcontext=POP();  
+				root=POP();  
+				self=static_cast<VAliased *>(POP());
+
+				PUSH(value);
+				fprintf(stderr, "<-returned");
+				break;
+			}
+
+		// 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;
+			}
+		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());
+				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());
+				PUSH(value);
+				break;
+			}
+		case OP_DIV: 
+			{
+				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(), 
+					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: 
+			{
+				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;
+			}
+
+		default:
+			THROW(0,0,
+				0,
+				"unhandled '%s' opcode", opcode_name[op.code]); 
 		}
+		fprintf(stderr, "\n");
 	}
 }
 
-void execute(Pool *pool, const Array *ops) {
-	if(!ops)
-		return;
-
-	puts("---------------------------");
-	dump(0, ops);
-	puts("---------------------------");
+Value *Request::get_element() {
+	String& name=POP_NAME();
+	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);
+
+			// 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);
+			// 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;
 }