--- parser3/src/main/execute.C	2001/03/27 16:35:54	1.128
+++ parser3/src/main/execute.C	2001/04/03 05:23:41	1.136
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.128 2001/03/27 16:35:54 paf Exp $
+	$Id: execute.C,v 1.136 2001/04/03 05:23:41 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -21,6 +21,7 @@
 #include "pa_vdouble.h"
 #include "pa_vbool.h"
 #include "pa_vtable.h"
+#include "pa_vfile.h"
 
 #include <stdio.h>
 
@@ -73,7 +74,7 @@ void log_printf(Pool& pool, const char *
 
 void dump(Pool& pool, int level, const Array& ops) {
 	if(0){
-		int size=ops.size();
+		int size=ops.quick_size();
 		//log_printf(pool, "size=%d\n", size);
 		for(int i=0; i<size; i++) {
 			Operation op;
@@ -82,18 +83,22 @@ void dump(Pool& pool, int level, const A
 		}
 	}
 
-	int size=ops.size();
+	int size=ops.quick_size();
 	//log_printf(pool, "size=%d\n", size);
 	for(int i=0; i<size; i++) {
 		Operation op;
 		op.cast=ops.quick_get(i);
-		log_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]);
 
 		if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) {
 			Value *value=static_cast<Value *>(ops.quick_get(++i));
-			log_printf(pool, " \"%s\" %s", value->get_string()->cstr(), value->type());
+			log_printf(pool, 
+				"%*s%s"
+				" \"%s\" %s", 
+				level*4, "", opcode_name[op.code],
+				value->get_string()->cstr(), value->type());
+			continue;
 		}
-		log_printf(pool, "\n");
+		log_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]);
 
 		if(op.code==OP_CURLY_CODE__STORE_PARAM || op.code==OP_EXPR_CODE__STORE_PARAM) {
 			const Array *local_ops=reinterpret_cast<const Array *>(ops.quick_get(++i));
@@ -109,7 +114,7 @@ void Request::execute(const Array& ops)
 		log_printf(pool(), "execution-------------------------\n");
 	}
 
-	int size=ops.size();
+	int size=ops.quick_size();
 	//log_printf(pool(), "size=%d\n", size);
 	for(int i=0; i<size; i++) {
 		Operation op;
@@ -134,16 +139,27 @@ void Request::execute(const Array& ops)
 				log_printf(pool(), " (%d)\n", local_ops->size());
 				dump(pool(), 1, *local_ops);
 				
+				// when called method of some object, specifying object literally,
+				// e.g ^t.menu, code of curly params must be executed 
+				// in r/w context of that object.
+				// otherwise in current r/w context.
+				//
 				// when they evaluate expression parameter,
 				// the object expression result
 				// does not need to be written into calling frame
 				// it must go into any expressions using that parameter
 				// hence, zeroing junction.wcontext being created
-				// later, in .process would test that field 
+				// later, in .process we would test that field 
 				// in decision "which wwrapper to use"
 				Junction& j=*NEW Junction(pool(), 
 					*self, 0, 0,
-					root, frame, op.code==OP_EXPR_CODE__STORE_PARAM?0:frame, local_ops);
+					root, 
+					wcontext->somebody_entered_some_object()>1?
+						&frame->junction.self /* ^t.menu{} */:rcontext/* ^if() */, 
+					op.code==OP_EXPR_CODE__STORE_PARAM?
+						0:wcontext->somebody_entered_some_object()>1?
+							frame/* ^t.menu{} */:wcontext/* ^if() */, 
+					local_ops);
 				
 				Value *value=NEW VJunction(j);
 
@@ -153,7 +169,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_CLASS:
 			{
-				// maybe the do ^class:method[] call, remember the fact
+				// maybe they do ^class:method[] call, remember the fact
 				wcontext->set_somebody_entered_some_class();
 
 				const String& name=POP_NAME();
@@ -230,6 +246,9 @@ void Request::execute(const Array& ops)
 			
 		case OP_GET_ELEMENT:
 			{
+				// maybe they do ^object.method[] call, remember the fact
+				wcontext->inc_somebody_entered_some_object();
+
 				Value *value=get_element();
 				PUSH(value);
 				break;
@@ -350,10 +369,12 @@ void Request::execute(const Array& ops)
 						// some stateless_object derivates with constructors
 						if(called_class==table_class)
 							self=NEW VTable(pool());
+						else if(called_class==file_class)
+							self=NEW VFile(pool());
 						else // stateful object
 							self=NEW VObject(pool(), *called_class);
 						frame->write(*self, 
-							String::UL_NO  // not used, always an object, not string
+							String::UL_CLEAN  // not used, always an object, not string
 						);
 					} else 
 						self=&frame->junction.self; // no, static or simple dynamic call
@@ -366,15 +387,26 @@ void Request::execute(const Array& ops)
 					Temp_alias temp_alias(*self->get_aliased(), *frame->junction.vclass);
 
 					const Method& method=*frame->junction.method;
-					if(method.native_code) { // native code?
-						method.check_actual_numbered_params(
-							frame->junction.self, 
-							frame->name(), frame->numbered_params());
-						(*method.native_code)(
-							*this, 
-							frame->name(), frame->numbered_params()); // execute it
-					} else // parser code
-						execute(*method.parser_code); // execute it
+					Method::Call_type call_type=
+						called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC;
+					if(
+						method.call_type==Method::CT_ANY ||
+						method.call_type==call_type) // allowed call type?
+						if(method.native_code) { // native code?
+							method.check_actual_numbered_params(
+								frame->junction.self, 
+								frame->name(), frame->numbered_params());
+							(*method.native_code)(
+								*this, 
+								frame->name(), frame->numbered_params()); // execute it
+						} else // parser code
+							execute(*method.parser_code); // execute it
+					else
+						THROW(0, 0,
+							&frame->name(),
+							"is not allowed to be called %s", 
+								call_type==Method::CT_STATIC?"statically":"dynamically");
+
 				}
 				Value *value=wcontext->result();
 
@@ -617,7 +649,6 @@ void Request::execute(const Array& ops)
 				0,
 				"unhandled '%s' opcode", opcode_name[op.code]); 
 		}
-		log_printf(pool(), "\n");
 	}
 }
 
@@ -655,7 +686,7 @@ Value& Request::process(Value& value, co
 		PUSH(self);  
 		PUSH(root);  
 		PUSH(rcontext);  
-			PUSH(wcontext);
+		PUSH(wcontext);
 		
 		WContext *frame;
 		// for expression method params