--- parser3/src/main/execute.C	2001/03/08 13:13:41	1.70
+++ parser3/src/main/execute.C	2001/03/08 15:20:46	1.75
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.70 2001/03/08 13:13:41 paf Exp $
+  $Id: execute.C,v 1.75 2001/03/08 15:20:46 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -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(), 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());
@@ -258,7 +258,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 +274,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;
 				{
@@ -550,7 +549,7 @@ Value *Request::get_element() {
 	return value;
 }
 
-Value& Request::autocalc(Value& 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
@@ -560,17 +559,29 @@ Value& Request::autocalc(Value& value) {
 		PUSH(rcontext);  
 		PUSH(wcontext);
 		
-		// almost plain wwrapper about junction wcontext, 
-		// BUT intercepts string writes
-		VCodeFrame frame(pool(), *junction->wcontext);  wcontext=&frame;
+		WContext *frame;
+		if(make_string) {
+			// almost plain wwrapper about junction wcontext, 
+			// BUT intercepts string writes
+			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);
-		// CodeFrame soul:
-		//   string writes were intercepted
-		//   returning them as the result of getting code-junction
-		Value& result=*NEW VString(*frame.get_string());
+		Value *result;
+		if(make_string) {
+			// CodeFrame soul:
+			//   string writes were intercepted
+			//   returning them as the result of getting code-junction
+			result=NEW VString(*frame->get_string());
+		} else 
+			result=frame->result();
 		
 		wcontext=static_cast<WContext *>(POP());  
 		rcontext=POP();  
@@ -578,7 +589,7 @@ Value& Request::autocalc(Value& value) {
 		self=static_cast<VAliased *>(POP());
 		
 		fprintf(stderr, "<-ja returned");
-		return result;
+		return *result;
 	} else
 		return value;
 }