--- parser3/src/main/execute.C	2001/03/08 16:54:27	1.77
+++ parser3/src/main/execute.C	2001/03/10 15:17:47	1.86
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.77 2001/03/08 16:54:27 paf Exp $
+  $Id: execute.C,v 1.86 2001/03/10 15:17:47 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -28,8 +28,8 @@ char *opcode_name[]={
 	// actions
 	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
-	"CONSTRUCT",
-	"WRITE",
+	"CONSTRUCT_VALUE",  "CONSTRUCT_DOUBLE",
+	"WRITE",  "STRING__WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
 	"CREATE_RWPOOL",	"REDUCE_RWPOOL",
@@ -66,7 +66,7 @@ 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_VALUE) {
+		if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) {
 			Value *value=static_cast<Value *>(ops.quick_get(++i));
 			fprintf(stderr, " \"%s\" %s", value->get_string()->cstr(), value->type());
 		}
@@ -92,7 +92,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_index(), opcode_name[op.code]); fflush(stderr);
+		fprintf(stderr, "%d:%s", stack.top_index()+1, opcode_name[op.code]); fflush(stderr);
 
 		switch(op.code) {
 		// param in next instruction
@@ -116,7 +116,7 @@ void Request::execute(const Array& ops)
 					root, frame, frame, local_ops);
 				
 				Value *value=NEW VJunction(j);
-				value->set_name(frame->name());
+				///value->set_name(frame->name());
 
 				// store param
 				frame->store_param(value);
@@ -124,7 +124,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_CLASS:
 			{
-				String& name=POP_NAME();
+				const String& name=POP_NAME();
 				VClass *vclass=static_cast<VClass *>(classes().get(name));
 				if(!vclass) 
 					THROW(0,0,
@@ -158,19 +158,35 @@ void Request::execute(const Array& ops)
 			}
 			
 		// OTHER ACTIONS BUT WITHs
-		case OP_CONSTRUCT:
+		case OP_CONSTRUCT_VALUE:
 			{
 				Value *value=POP();
-				String& name=POP_NAME();
+				const String& name=POP_NAME();
 				Value *ncontext=POP();
-				value->set_name(name);
 				ncontext->put_element(name, value);
+				value->set_name(name);
+				break;
+			}
+		case OP_CONSTRUCT_EXPR:
+			{
+				Value *value=POP();
+				const String& name=POP_NAME();
+				Value *ncontext=POP();
+				ncontext->put_element(name, value->get_expr_result());
+				value->set_name(name);
 				break;
 			}
 		case OP_WRITE:
 			{
 				Value *value=POP();
-				wcontext->write(*value);
+				write(*value);
+				break;
+			}
+		case OP_STRING__WRITE:
+			{
+				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
+				fprintf(stderr, " \"%s\"", vstring->value().cstr());
+				write(vstring->value());
 				break;
 			}
 			
@@ -184,7 +200,7 @@ void Request::execute(const Array& ops)
 		case OP_GET_ELEMENT__WRITE:
 			{
 				Value *value=get_element();
-				wcontext->write(*value);
+				write(*value);
 				break;
 			}
 
@@ -214,8 +230,12 @@ void Request::execute(const Array& ops)
 			}
 		case OP_REDUCE_RWPOOL:
 			{
-				String *string=wcontext->get_string();
-				Value *value=string?NEW VString(*string):NEW VString(pool());
+				const String *string=wcontext->get_string();
+				Value *value;
+				if(string)
+					value=NEW VString(*string);
+				else
+					value=NEW VUnknown(pool());
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
@@ -231,8 +251,12 @@ 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=string?NEW VString(*string):NEW VString(pool());
+				const String *string=wcontext->get_string();
+				Value *value;
+				if(string)
+					value=NEW VString(*string);
+				else
+					NEW VUnknown(pool());
 				wcontext=static_cast<WContext *>(POP());
 				PUSH(value);
 				break;
@@ -281,8 +305,10 @@ void Request::execute(const Array& ops)
 				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);
+						self=NEW VObject(pool(), *called_class);
+						frame->write(*self, 
+							String::Untaint_lang::NO  // not used, always an object, not string
+						);
 					} else 
 						self=&frame->junction.self; // no, static or simple dynamic call
 
@@ -295,9 +321,10 @@ void Request::execute(const Array& ops)
 					Temp_alias temp_alias(*aliased, *frame->junction.vclass);
 
 					Method& method=*frame->junction.method;
-					if(method.native_code) // native code?
+					if(method.native_code) { // native code?
+						method.check_actual_numbered_params(frame->numbered_params());
 						(*method.native_code)(*this, frame->numbered_params()); // execute it
-					else // parser code
+					} else // parser code
 						execute(*method.parser_code); // execute it
 				}
 				Value *value=wcontext->result();
@@ -316,44 +343,42 @@ void Request::execute(const Array& ops)
 		case OP_NEG:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(*NEW Double(pool(), 
-					-operand->get_double()));
+				Value *value=NEW VDouble(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())));
+				Value *value=NEW VDouble(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()));
+				Value *value=NEW VBool(pool(), !operand->get_bool());
 				PUSH(value);
 				break;
 			}
 		case OP_DEF:
 			{
 				Value *operand=POP();
-				Value *value=NEW VBool(*NEW Bool(pool(), operand->get_defined()));
+				Value *value=NEW VBool(pool(), operand->get_defined());
 				PUSH(value);
 				break;
 			}
 		case OP_IN:
 			{
 				Value *operand=POP();
-				Value *value=NEW VBool(*NEW Bool(pool(), true/*TODO*/));
+				Value *value=NEW VBool(pool(), true/*TODO*/);
 				PUSH(value);
 				break;
 			}
 		case OP_FEXISTS:
 			{
 				Value *operand=POP();
-				Value *value=NEW VBool(*NEW Bool(pool(), true/*TODO*/));
+				Value *value=NEW VBool(pool(), true/*TODO*/);
 				PUSH(value);
 				break;
 			}
@@ -362,173 +387,169 @@ void Request::execute(const Array& ops)
 		case OP_SUB: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(*NEW Double(pool(), 
-					a->get_double() - b->get_double()));
+				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(*NEW Double(pool(), 
-					a->get_double() + b->get_double()));
+				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(*NEW Double(pool(), 
-					a->get_double() * b->get_double()));
+				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(*NEW Double(pool(), 
-					a->get_double() / b->get_double()));
+				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(*NEW Double(pool(), 
+				Value *value=NEW VDouble(pool(), 
 					static_cast<int>(a->get_double()) %
-					static_cast<int>(b->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(), 
+				Value *value=NEW VDouble(pool(), 
 					static_cast<int>(a->get_double()) &
-					static_cast<int>(b->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(), 
+				Value *value=NEW VDouble(pool(), 
 					static_cast<int>(a->get_double()) |
-					static_cast<int>(b->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(), 
+				Value *value=NEW VDouble(pool(), 
 					static_cast<int>(a->get_double()) ^
-					static_cast<int>(b->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()));
+				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(*NEW Bool(pool(), a->get_bool() || b->get_bool()));
+				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(*NEW Bool(pool(), a->get_bool() ^ b->get_bool()));
+				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(*NEW Bool(pool(), a->get_double() < b->get_double()));
+				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(*NEW Bool(pool(), a->get_double() > b->get_double()));
+				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(*NEW Bool(pool(), a->get_double() <= b->get_double()));
+				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(*NEW Bool(pool(), a->get_double() >= b->get_double()));
+				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(*NEW Bool(pool(), a->get_double() == b->get_double()));
+				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(*NEW Bool(pool(), a->get_double() != b->get_double()));
+				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(*NEW Bool(pool(), a->as_string() < b->as_string()));
+				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(*NEW Bool(pool(), a->as_string() > b->as_string()));
+				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(*NEW Bool(pool(), a->as_string() <= b->as_string()));
+				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(*NEW Bool(pool(), a->as_string() >= b->as_string()));
+				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(*NEW Bool(pool(), a->as_string() == b->as_string()));
+				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(*NEW Bool(pool(), a->as_string() != b->as_string()));
+				Value *value=NEW VBool(pool(), a->as_string() != b->as_string());
 				PUSH(value);
 				break;
 			}
@@ -543,12 +564,12 @@ void Request::execute(const Array& ops)
 }
 
 Value *Request::get_element() {
-	String& name=POP_NAME();
+	const String& name=POP_NAME();
 	Value *ncontext=POP();
 	Value *value=ncontext->get_element(name);
 
 	if(value)
-		value=&autocalc(*value); // autocalc possible code-junction
+		value=&autocalc(*value, &name); // autocalc possible code-junction
 	else {
 		value=NEW VUnknown(pool());
 		value->set_name(name);
@@ -557,7 +578,7 @@ Value *Request::get_element() {
 	return value;
 }
 
-Value& Request::autocalc(Value& value, bool make_string) {
+Value& Request::autocalc(Value& value, const String *name, bool make_string) {
 	Junction *junction=value.get_junction();
 	if(junction && junction->code) { // is it a code-junction?
 		// autocalc it
@@ -590,6 +611,8 @@ Value& Request::autocalc(Value& value, b
 			result=NEW VString(*frame->get_string());
 		} else 
 			result=frame->result();
+		if(name)
+			result->set_name(*name);
 		
 		wcontext=static_cast<WContext *>(POP());  
 		rcontext=POP();  
@@ -602,6 +625,41 @@ Value& Request::autocalc(Value& value, b
 		return value;
 }
 
-void Request::write(Value& avalue) {
-	wcontext->write(avalue);
-}
\ No newline at end of file
+char *Request::execute_static(VClass& vclass, String& method_name, bool return_cstr) {
+	Value *value=vclass.get_element(method_name);
+	if(value) { // found some 'METHOD_NAME' element
+		Junction *junction=value->get_junction();
+		if(junction) {// it even has junction!
+			const Method *method=junction->method;
+			if(method) { // and junction is method-junction! call it
+				PUSH(self);  
+				PUSH(root);  
+				PUSH(rcontext);  
+				PUSH(wcontext);
+				
+				// initialize contexts
+				root=rcontext=self=&vclass;
+				wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */);
+				
+				// execute!	
+				execute(*method->parser_code);
+				
+				// result
+				char *result;
+				if(return_cstr)
+					result=wcontext->get_string()->cstr(); // chars
+				else
+					result=0; // ignore result
+
+				wcontext=static_cast<WContext *>(POP());  
+				rcontext=POP();  
+				root=POP();  
+				self=static_cast<VAliased *>(POP());
+
+				// return
+				return result;
+			}
+		}
+	}
+	return 0;
+}