--- parser3/src/main/execute.C	2001/02/23 09:43:14	1.23
+++ parser3/src/main/execute.C	2001/02/23 17:48:00	1.30
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.23 2001/02/23 09:43:14 paf Exp $
+  $Id: execute.C,v 1.30 2001/02/23 17:48:00 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -8,9 +8,15 @@
 #include "pa_vstring.h"
 #include "pa_vhash.h"
 #include "pa_vunknown.h"
+#include "pa_vframe.h"
+#include "pa_wwrapper.h"
 
 #include <stdio.h>
 
+#define PUSH(value) stack.push(value)
+#define POP() static_cast<Value *>(stack.pop())
+#define POP_SR() static_cast<Value *>(stack.pop())->as_string()
+
 
 char *opcode_name[]={
 	"STRING",  "CODE_ARRAY",
@@ -30,7 +36,7 @@ char *opcode_name[]={
 void dump(int level, const Array& ops) {
 	if(0){
 		int size=ops.size();
-		printf("size=%d\n", size);
+		//printf("size=%d\n", size);
 		for(int i=0; i<size; i++) {
 			Operation op;
 			op.cast=ops.quick_get(i);
@@ -39,7 +45,7 @@ void dump(int level, const Array& ops) {
 	}
 
 	int size=ops.size();
-	printf("size=%d\n", size);
+	//printf("size=%d\n", size);
 	for(int i=0; i<size; i++) {
 		Operation op;
 		op.cast=ops.quick_get(i);
@@ -59,14 +65,14 @@ void dump(int level, const Array& ops) {
 }
 
 void Request::execute(Array& ops) {
-	if(0) {
+	if(1) {
 		puts("---------------------------");
 		dump(0, ops);
 		puts("---------------------------");
 	}
 
 	int size=ops.size();
-	printf("size=%d\n", size);
+	//printf("size=%d\n", size);
 	for(int i=0; i<size; i++) {
 		Operation op;
 		op.cast=ops.quick_get(i);
@@ -80,22 +86,22 @@ void Request::execute(Array& ops) {
 		switch(op.code) {
 		case OP_WITH_WRITE: 
 			{
-				stack.push(wcontext);
+				PUSH(wcontext);
 				break;
 			}
 		case OP_WITH_READ: 
 			{
-				stack.push(rcontext);
+				PUSH(rcontext);
 				break;
 			}
 		case OP_WITH_ROOT: 
 			{
-				stack.push(root);
+				PUSH(root);
 				break;
 			}
 		case OP_WITH_SELF: 
 			{
-				stack.push(self);
+				PUSH(self);
 				break;
 			}
 			
@@ -103,22 +109,23 @@ void Request::execute(Array& ops) {
 			{
 				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
 				printf(" \"%s\"", vstring->get_string()->cstr());
-				stack.push(vstring);
+				PUSH(vstring);
 				break;
 			}
 			
 		case OP_CONSTRUCT:
 			{
-				Value *value=static_cast<Value *>(stack.pop());
-				VString *name=static_cast<VString *>(stack.pop());
-				Value *ncontext=static_cast<Value *>(stack.pop());
-				ncontext->put_element(*name, value);
+				Value *value=POP();
+				String& name=POP_SR();
+				Value *ncontext=POP();
+				value->set_name(name);
+				ncontext->put_element(name, value);
 				break;
 			}
 			
 		case OP_WRITE:
 			{
-				Value *value=static_cast<Value *>(stack.pop());
+				Value *value=POP();
 				wcontext->write(value);
 				break;
 			}
@@ -126,7 +133,7 @@ void Request::execute(Array& ops) {
 		case OP_GET_ELEMENT:
 			{
 				Value *value=get_element();
-				stack.push(value);
+				PUSH(value);
 				break;
 			}
 
@@ -139,18 +146,81 @@ void Request::execute(Array& ops) {
 
 		case OP_CREATE_EWPOOL:
 			{
-				stack.push(wcontext);
-				wcontext=NEW WContext(pool(), 0 /* empty */);
+				PUSH(wcontext);
+				wcontext=NEW WWrapper(pool(), 0 /* empty */);
 				break;
 			}
 		case OP_REDUCE_EWPOOL:
 			{
 				Value *value=wcontext->value();
-				wcontext=static_cast<WContext *>(stack.pop());
-				stack.push(value);
+				wcontext=static_cast<WContext *>(POP());
+				PUSH(value);
 				break;
 			}
 			
+		case OP_CREATE_RWPOOL:
+			{
+				Value *ncontext=POP();
+				PUSH(rcontext);
+				rcontext=ncontext;
+				PUSH(wcontext);
+				wcontext=NEW WWrapper(pool(), ncontext);
+				break;
+			}
+		case OP_REDUCE_RWPOOL:
+			{
+				String *string=wcontext->get_string();
+				Value *value=NEW VString(string);
+				wcontext=static_cast<WContext *>(POP());
+				rcontext=POP();
+				PUSH(value);
+				break;
+			}
+
+		case OP_GET_METHOD_FRAME:
+			{
+				String& name=POP_SR();  // ýòî áûâàåò junction, íå name
+				Value *ncontext=static_cast<Value *>(stack[0]);
+				// [self/class?;params;local;code/native_code](name)
+				Method *method=ncontext->get_method(name);
+				if(!method)
+					THROW(0,0,
+						&name,
+						"method not found in %s", ncontext->name()->cstr());
+				//unless(method) method=operators.get_method[...;code/native_code](name)
+				VFrame *frame=NEW VFrame(pool(), *method);
+				PUSH(frame);
+				break;
+			}
+		case OP_STORE_PARAM:
+			{
+				Value *value=POP();
+				VFrame *frame=static_cast<VFrame *>(stack[0]);
+				frame->store_param(value);
+				break;
+			}
+
+		case OP_CALL:
+			{
+				printf("->\n");
+				VFrame *frame=static_cast<VFrame *>(POP());
+				Value *ncontext=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=rcontext;
+				frame->set_self(self);
+				root=rcontext=wcontext=frame;
+				execute(frame->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");
 			break;
@@ -160,15 +230,14 @@ void Request::execute(Array& ops) {
 }
 
 Value *Request::get_element() {
-	VString *name=static_cast<VString *>(stack.pop());
-	Value *ncontext=static_cast<Value *>(stack.pop());
-	Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code)
+	String& name=POP_SR();
+	Value *ncontext=POP();
+	Value *value=ncontext->get_element(name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code)
 	// name áûâàåò èìÿ junction, òîãäà èëè îñòàâëÿåò â ïîêîå, èëè âû÷èñëÿåò â çàâèñèìîñòè îò ôëàãà ÀÂÒÎÂÛ×ÈÑËßÒÜ
 
 	if(!value) {
-//		value=NEW VHash(pool());
-//		ncontext->put_element(*name, value);
 		value=NEW VUnknown(pool());
+		value->set_name(name);
 	}
 	return value;
 }
\ No newline at end of file