--- parser3/src/main/execute.C	2001/03/08 13:42:32	1.71
+++ parser3/src/main/execute.C	2001/03/09 08:28:34	1.81
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.71 2001/03/08 13:42:32 paf Exp $
+  $Id: execute.C,v 1.81 2001/03/09 08:28:34 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -28,7 +28,7 @@ char *opcode_name[]={
 	// actions
 	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
-	"CONSTRUCT",
+	"CONSTRUCT_VALUE",  "CONSTRUCT_DOUBLE",
 	"WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
@@ -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()+1, 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
@@ -105,7 +105,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_CODE__STORE_PARAM:
 			{
-				VMethodFrame *frame=static_cast<VMethodFrame *>(stack[stack.top()]);
+				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());
@@ -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);
@@ -158,13 +158,22 @@ void Request::execute(const Array& ops)
 			}
 			
 		// OTHER ACTIONS BUT WITHs
-		case OP_CONSTRUCT:
+		case OP_CONSTRUCT_VALUE:
 			{
 				Value *value=POP();
 				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();
+				String& name=POP_NAME();
+				Value *ncontext=POP();
+				ncontext->put_element(name, value->get_expr_result());
+				value->set_name(name);
 				break;
 			}
 		case OP_WRITE:
@@ -215,7 +224,11 @@ void Request::execute(const Array& ops)
 		case OP_REDUCE_RWPOOL:
 			{
 				String *string=wcontext->get_string();
-				Value *value=string?NEW VString(*string):NEW VString(pool());
+				Value *value;
+				if(string)
+					value=NEW VString(*string);
+				else
+					value=NEW VUnknown(pool());
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
@@ -232,7 +245,11 @@ 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());
+				Value *value;
+				if(string)
+					value=NEW VString(*string);
+				else
+					NEW VUnknown(pool());
 				wcontext=static_cast<WContext *>(POP());
 				PUSH(value);
 				break;
@@ -258,7 +275,7 @@ void Request::execute(const Array& ops)
 		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;
 			}
@@ -274,19 +291,18 @@ 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(pool(), *called_class);
+						frame->write(*self);
+					} else 
+						self=&frame->junction.self; // no, static or simple dynamic call
+
 				frame->set_self(*self);
 				root=rcontext=wcontext=frame;
 				{
@@ -296,9 +312,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();
@@ -324,8 +341,7 @@ void Request::execute(const Array& ops)
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), 
-					~static_cast<int>(operand->get_double()));
+				Value *value=NEW VDouble(pool(), ~static_cast<int>(operand->get_double()));
 				PUSH(value);
 				break;
 			}
@@ -543,10 +559,13 @@ Value *Request::get_element() {
 	Value *ncontext=POP();
 	Value *value=ncontext->get_element(name);
 
-	// autocalc possible code-junction
-	value=value?&autocalc(*value, true/*make_string*/):NEW VUnknown(pool());
+	if(value)
+		value=&autocalc(*value); // autocalc possible code-junction
+	else {
+		value=NEW VUnknown(pool());
+		value->set_name(name);
+	}
 
-	value->set_name(name);
 	return value;
 }
 
@@ -594,7 +613,3 @@ Value& Request::autocalc(Value& value, b
 	} else
 		return value;
 }
-
-void Request::write(Value& avalue) {
-	wcontext->write(avalue);
-}
\ No newline at end of file