--- parser3/src/main/execute.C	2001/02/23 14:18:27	1.28
+++ parser3/src/main/execute.C	2001/02/23 21:59:07	1.31
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.28 2001/02/23 14:18:27 paf Exp $
+  $Id: execute.C,v 1.31 2001/02/23 21:59:07 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -9,6 +9,7 @@
 #include "pa_vhash.h"
 #include "pa_vunknown.h"
 #include "pa_vframe.h"
+#include "pa_wwrapper.h"
 
 #include <stdio.h>
 
@@ -64,7 +65,7 @@ void dump(int level, const Array& ops) {
 }
 
 void Request::execute(Array& ops) {
-	if(0) {
+	if(1) {
 		puts("---------------------------");
 		dump(0, ops);
 		puts("---------------------------");
@@ -146,7 +147,7 @@ void Request::execute(Array& ops) {
 		case OP_CREATE_EWPOOL:
 			{
 				PUSH(wcontext);
-				wcontext=NEW WContext(pool(), 0 /* empty */);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */);
 				break;
 			}
 		case OP_REDUCE_EWPOOL:
@@ -163,7 +164,7 @@ void Request::execute(Array& ops) {
 				PUSH(rcontext);
 				rcontext=ncontext;
 				PUSH(wcontext);
-				wcontext=NEW WContext(pool(), ncontext);
+				wcontext=NEW WWrapper(pool(), ncontext);
 				break;
 			}
 		case OP_REDUCE_RWPOOL:
@@ -178,16 +179,17 @@ void Request::execute(Array& ops) {
 
 		case OP_GET_METHOD_FRAME:
 			{
-				String& name=POP_SR();  // это бывает junction, не name
-				Value *ncontext=static_cast<Value *>(stack[0]);
+				Value *vjunction=POP();
 				// [self/class?;params;local;code/native_code](name)
-				Method *method=ncontext->get_method(name);
-				if(!method)
+				Junction *junction=vjunction->get_junction();
+
+				if(!junction)
 					THROW(0,0,
-						&name,
-						"method not found in %s", ncontext->name()->cstr());
+						vjunction->name(),
+						"not a method");
+
 				//unless(method) method=operators.get_method[...;code/native_code](name)
-				VFrame *frame=NEW VFrame(pool(), *method);
+				VFrame *frame=NEW VFrame(pool(), *junction);
 				PUSH(frame);
 				break;
 			}
@@ -199,6 +201,25 @@ void Request::execute(Array& ops) {
 				break;
 			}
 
+		case OP_CALL:
+			{
+				printf("->\n");
+				VFrame *frame=static_cast<VFrame *>(POP());
+				PUSH(root);  PUSH(self);  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;
+				frame->set_self(self);
+				root=rcontext=wcontext=frame;
+				execute(frame->junction.method->code);
+				Value *value=wcontext->value();
+				wcontext=static_cast<WContext *>(POP());  rcontext=POP();  self=POP();  root=POP();
+				wcontext->write(value);
+				printf("<-returned");
+				break;
+			}
+
 
 		default:
 			printf("\tTODO");