--- parser3/src/main/execute.C	2001/02/24 11:46:03	1.36
+++ parser3/src/main/execute.C	2001/02/25 09:42:04	1.40
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.36 2001/02/24 11:46:03 paf Exp $
+  $Id: execute.C,v 1.40 2001/02/25 09:42:04 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -10,6 +10,7 @@
 #include "pa_vunknown.h"
 #include "pa_vcframe.h"
 #include "pa_vmframe.h"
+#include "pa_vobject.h"
 
 #include <stdio.h>
 
@@ -19,7 +20,7 @@
 
 
 char *opcode_name[]={
-	"STRING",  "CODE",
+	"STRING",  "CODE",  "CLASS",
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"CONSTRUCT",
 	"EXPRESSION_EVAL",	"MODIFY_EVAL",
@@ -54,6 +55,10 @@ void dump(int level, const Array& ops) {
 			VString *vstring=static_cast<VString *>(ops.quick_get(++i));
 			printf(" \"%s\"", vstring->get_string()->cstr());
 		}
+		if(op.code==OP_CLASS) {
+			VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
+			printf(" \"%s\"", vclass->name()->cstr());
+		}
 		printf("\n");
 
 		if(op.code==OP_CODE) {
@@ -89,7 +94,8 @@ void Request::execute(const Array& ops)
 		case OP_CODE:
 			{
 				const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
-				printf(" (%d)", local_ops->size());
+				printf(" (%d)\n", local_ops->size());
+				dump(1, *local_ops);
 				Junction& j=*NEW Junction(pool(), 
 					*self,
 					0,
@@ -99,16 +105,18 @@ void Request::execute(const Array& ops)
 				PUSH(value);
 				break;
 			}
-			
-			// OP_WITH
-		case OP_WITH_WRITE: 
+		case OP_CLASS:
 			{
-				PUSH(wcontext);
+				VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
+				printf(" \"%s\"", vclass->name()->cstr());
+		        PUSH(vclass);
 				break;
 			}
-		case OP_WITH_READ: 
+			
+			// OP_WITH
+		case OP_WITH_SELF: 
 			{
-				PUSH(rcontext);
+				PUSH(self);
 				break;
 			}
 		case OP_WITH_ROOT: 
@@ -116,13 +124,28 @@ void Request::execute(const Array& ops)
 				PUSH(root);
 				break;
 			}
-		case OP_WITH_SELF: 
+		case OP_WITH_READ: 
 			{
-				PUSH(self);
+				PUSH(rcontext);
+				break;
+			}
+		case OP_WITH_WRITE: 
+			{
+				PUSH(wcontext);
 				break;
 			}
 			
 			// ...
+		case OP_CONSTRUCT:
+			{
+				Value *value=POP();
+				String& name=POP_NAME();
+				Value *ncontext=POP();
+				value->set_name(name);
+				ncontext->put_element(name, value);
+				break;
+			}
+			// TODO: OP_EXPRESSION_EVAL,	OP_MODIFY_EVAL,
 		case OP_WRITE:
 			{
 				Value *value=POP();
@@ -144,15 +167,6 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
-		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_CREATE_EWPOOL:
 			{
@@ -187,6 +201,7 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
+			// CALL
 		case OP_GET_METHOD_FRAME:
 			{
 				Value *value=POP();
@@ -195,8 +210,8 @@ void Request::execute(const Array& ops)
 				if(!junction)
 					THROW(0,0,
 						value->name(),
-						"is not a method or a junction (it is '%s'), can not call it",
-						value->type()); 
+						"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);
 				PUSH(frame);
@@ -216,11 +231,22 @@ void Request::execute(const Array& ops)
 				VMethodFrame *frame=static_cast<VMethodFrame *>(POP());
 				frame->fill_unspecified_params();
 				PUSH(self);  PUSH(root);  PUSH(rcontext);  PUSH(wcontext); 
-				//left_class=ncontext.get_class()
-				//right_class=frame.self.get_class()
-				//self=f(left_class[thoughts' food], right_self[junction], right_class[static], wcontext.value()[dynamic], new(right_class)[construct])
-				self=&frame->junction.self; // TODO: не всегда frame..self
+
+				VClass *called_class=frame->junction.self.get_class();
+				// variable already constructed?
+				if(wcontext->get_class()) { // yes
+					VClass *read_class=rcontext->get_class();
+					// is it me or one of my parents? 
+					if(read_class->is_or_derived_from(*called_class)) // yes
+						self=&frame->junction.self; // dynamic call
+					else // no
+						self=called_class; // static call
+				} else { // no, we have constructor call here: $some(^class:method(..))
+					self=NEW VObject(pool(), *called_class);
+					frame->write(self);
+				}
 				frame->set_self(self);
+
 				root=rcontext=wcontext=frame;
 				execute(frame->junction.method->code);
 				Value *value=wcontext->result();
@@ -230,7 +256,6 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
-
 		default:
 			printf("\tTODO");
 			break;