--- parser3/src/main/execute.C	2001/02/23 10:17:29	1.24
+++ parser3/src/main/execute.C	2001/02/23 14:18:27	1.28
@@ -1,5 +1,5 @@
 /*
-  $Id: execute.C,v 1.24 2001/02/23 10:17:29 paf Exp $
+  $Id: execute.C,v 1.28 2001/02/23 14:18:27 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -8,11 +8,13 @@
 #include "pa_vstring.h"
 #include "pa_vhash.h"
 #include "pa_vunknown.h"
+#include "pa_vframe.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[]={
@@ -33,7 +35,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);
@@ -42,7 +44,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);
@@ -69,7 +71,7 @@ void Request::execute(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);
@@ -113,9 +115,10 @@ void Request::execute(Array& ops) {
 		case OP_CONSTRUCT:
 			{
 				Value *value=POP();
-				Value *name=POP();
+				String& name=POP_SR();
 				Value *ncontext=POP();
-				ncontext->put_element(*name, value);
+				value->set_name(name);
+				ncontext->put_element(name, value);
 				break;
 			}
 			
@@ -149,11 +152,54 @@ void Request::execute(Array& ops) {
 		case OP_REDUCE_EWPOOL:
 			{
 				Value *value=wcontext->value();
-				wcontext=static_cast<WContext *>(stack.pop());
+				wcontext=static_cast<WContext *>(POP());
 				PUSH(value);
 				break;
 			}
 			
+		case OP_CREATE_RWPOOL:
+			{
+				Value *ncontext=POP();
+				PUSH(rcontext);
+				rcontext=ncontext;
+				PUSH(wcontext);
+				wcontext=NEW WContext(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;
+			}
+
+
 		default:
 			printf("\tTODO");
 			break;
@@ -163,15 +209,14 @@ void Request::execute(Array& ops) {
 }
 
 Value *Request::get_element() {
-	Value *name=POP();
+	String& name=POP_SR();
 	Value *ncontext=POP();
-	Value *value=ncontext->get_element(*name); // name áûâàåò method, òîãäà âûäà¸ò new junction(ÀÂÒÎÂÛ×ÈÑËßÒÜ=false, root,self,rcontext,wcontext,code)
+	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