--- parser3/src/main/execute.C	2001/02/25 10:11:50	1.41
+++ parser3/src/main/execute.C	2001/02/25 16:36:12	1.45
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.41 2001/02/25 10:11:50 paf Exp $
+  $Id: execute.C,v 1.45 2001/02/25 16:36:12 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -57,7 +57,7 @@ void dump(int level, const Array& ops) {
 		}
 		if(op.code==OP_CLASS) {
 			VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
-			printf(" \"%s\"", vclass->name()->cstr());
+			printf(" \"%s\"", vclass->name().cstr());
 		}
 		printf("\n");
 
@@ -97,8 +97,7 @@ void Request::execute(const Array& ops)
 				printf(" (%d)\n", local_ops->size());
 				dump(1, *local_ops);
 				Junction& j=*NEW Junction(pool(), 
-					*self,
-					0,
+					*self, 0, 0,
 					root,rcontext,wcontext,local_ops);
 				
 				Value *value=NEW VJunction(j);
@@ -108,7 +107,7 @@ void Request::execute(const Array& ops)
 		case OP_CLASS:
 			{
 				VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
-				printf(" \"%s\"", vclass->name()->cstr());
+				printf(" \"%s\"", vclass->name().cstr());
 		        PUSH(vclass);
 				break;
 			}
@@ -171,7 +170,7 @@ void Request::execute(const Array& ops)
 		case OP_CREATE_EWPOOL:
 			{
 				PUSH(wcontext);
-				wcontext=NEW WWrapper(pool(), 0 /* empty */);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */, true /* constructing */);
 				break;
 			}
 		case OP_REDUCE_EWPOOL:
@@ -188,13 +187,13 @@ void Request::execute(const Array& ops)
 				PUSH(rcontext);
 				rcontext=ncontext;
 				PUSH(wcontext);
-				wcontext=NEW WWrapper(pool(), ncontext);
+				wcontext=NEW WWrapper(pool(), ncontext, false /* not constructing */);
 				break;
 			}
 		case OP_REDUCE_RWPOOL:
 			{
 				String *string=wcontext->get_string();
-				Value *value=NEW VString(string);
+				Value *value=NEW VString(*string);
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
@@ -209,7 +208,7 @@ void Request::execute(const Array& ops)
 				Junction *junction=value->get_junction();
 				if(!junction)
 					THROW(0,0,
-						value->name(),
+						&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)
@@ -230,24 +229,35 @@ void Request::execute(const Array& ops)
 				printf("->\n");
 				VMethodFrame *frame=static_cast<VMethodFrame *>(POP());
 				frame->fill_unspecified_params();
-				PUSH(self);  PUSH(root);  PUSH(rcontext);  PUSH(wcontext); 
-
+				PUSH(self);  
+				PUSH(root);  
+				PUSH(rcontext);  
+				PUSH(wcontext); 
+				
 				VClass *called_class=frame->junction.self.get_class();
-				// variable already constructed?
-				if(wcontext->get_class()) { // yes
-					// static or dynamic call
-					self=&frame->junction.self;
-				} else { // no
+				// constructing?
+				if(wcontext->constructing()) {  // yes
 					// constructor call: $some(^class:method(..))
 					self=NEW VObject(pool(), *called_class);
-					frame->write(self); 
+					frame->write(self);
+				} else {  // no
+					// 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=reinterpret_cast<VAliased *>(rcontext); // class dynamic call
+					else // no
+						self=&frame->junction.self; // static or simple dynamic call
 				}
-				frame->set_self(self);
-
+				frame->set_self(*self);
+				
 				root=rcontext=wcontext=frame;
 				execute(frame->junction.method->code);
 				Value *value=wcontext->result();
-				wcontext=static_cast<WContext *>(POP());  rcontext=POP();  root=POP();  self=POP();
+
+				wcontext=static_cast<WContext *>(POP());  
+				rcontext=POP();  
+				root=POP();  
+				self=static_cast<VAliased *>(POP());
 				wcontext->write(value);
 				printf("<-returned");
 				break;
@@ -271,7 +281,11 @@ Value *Request::get_element() {
 		if(junction && junction->code) { // is it a code-junction?
 			// autocalc it
 			printf("ja->\n");
-			PUSH(self);  PUSH(root);  PUSH(rcontext);  PUSH(wcontext);
+			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;
@@ -282,8 +296,12 @@ Value *Request::get_element() {
 			// 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=POP();
+			value=NEW VString(*frame.get_string());
+
+			wcontext=static_cast<WContext *>(POP());  
+			rcontext=POP();  
+			root=POP();  
+			self=static_cast<VAliased *>(POP());
 			printf("<-ja returned");
 		}
 	} else {