--- parser3/src/main/execute.C	2001/02/24 14:20:51	1.37
+++ parser3/src/main/execute.C	2001/02/25 14:23:32	1.43
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.37 2001/02/24 14:20:51 paf Exp $
+  $Id: execute.C,v 1.43 2001/02/25 14:23:32 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,6 +105,13 @@ void Request::execute(const Array& ops)
 				PUSH(value);
 				break;
 			}
+		case OP_CLASS:
+			{
+				VClass *vclass=static_cast<VClass *>(ops.quick_get(++i));
+				printf(" \"%s\"", vclass->name().cstr());
+		        PUSH(vclass);
+				break;
+			}
 			
 			// OP_WITH
 		case OP_WITH_SELF: 
@@ -158,7 +171,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:
@@ -175,13 +188,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);
@@ -196,9 +209,9 @@ void Request::execute(const Array& ops)
 				Junction *junction=value->get_junction();
 				if(!junction)
 					THROW(0,0,
-						value->name(),
-						"is not a method or a junction (it is '%s'), can not call it",
-						value->type()); 
+						&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)
 				VMethodFrame *frame=NEW VMethodFrame(pool(), *junction);
 				PUSH(frame);
@@ -218,11 +231,19 @@ 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();
+				// constructing?
+				if(wcontext->constructing()) {  // yes
+					// constructor call: $some(^class:method(..))
+					self=NEW VObject(pool(), *called_class);
+					frame->write(self);
+				} else {  // no
+					// static or dynamic call
+					self=&frame->junction.self;
+				}
 				frame->set_self(self);
+
 				root=rcontext=wcontext=frame;
 				execute(frame->junction.method->code);
 				Value *value=wcontext->result();
@@ -232,7 +253,6 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
-
 		default:
 			printf("\tTODO");
 			break;
@@ -262,7 +282,7 @@ 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());
+			value=NEW VString(*frame.get_string());
 			wcontext=static_cast<WContext *>(POP());  rcontext=POP();  root=POP();  self=POP();
 			printf("<-ja returned");
 		}