--- parser3/src/main/execute.C	2001/07/25 10:12:13	1.184
+++ parser3/src/main/execute.C	2001/08/02 08:58:59	1.189
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.184 2001/07/25 10:12:13 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.189 2001/08/02 08:58:59 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -24,7 +24,7 @@ static const char *RCSId="$Id: execute.C
 
 //#define DEBUG_EXECUTE
 
-const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
+const uint ANTI_ENDLESS_EXECUTE_RECOURSION=400;
 
 #ifdef DEBUG_EXECUTE
 char *opcode_name[]={
@@ -32,7 +32,7 @@ char *opcode_name[]={
 	"VALUE",  "CURLY_CODE__STORE_PARAM",  "EXPR_CODE__STORE_PARAM",
 
 	// actions
-	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
+	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
 	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
@@ -41,7 +41,7 @@ char *opcode_name[]={
   	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"CALL",
+	"PREPARE_TO_CONSTRUCT_OBJECT",	"CALL",
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
@@ -117,11 +117,12 @@ void Request::execute(const Array& ops)
 	debug_printf(pool(), "execution-------------------------\n");
 #endif
 
-	int size=ops.quick_size();
+	//int size=ops.quick_size();
 	//debug_printf(pool(), "size=%d\n", size);
-	for(int i=0; i<size; i++) {
+	for(int i=0; i<ops.size(); i++) {
 		Operation op;
-		op.cast=ops.quick_get(i);
+		//op.cast=ops.quick_get(i);
+		op.cast=ops.get(i);
 #ifdef DEBUG_EXECUTE
 		debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]);
 #endif
@@ -184,14 +185,14 @@ void Request::execute(const Array& ops)
 			}
 			
 		// OP_WITH
-		case OP_WITH_SELF: 
+		case OP_WITH_ROOT:
 			{
-				PUSH(self);
+				PUSH(root);
 				break;
 			}
-		case OP_WITH_ROOT: 
+		case OP_WITH_SELF: 
 			{
-				PUSH(root);
+				PUSH(self);
 				break;
 			}
 		case OP_WITH_READ: 
@@ -295,7 +296,7 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext);
 				PUSH((void *)flang);
 				flang=String::UL_PASS_APPENDED;
-				wcontext=NEW WWrapper(pool(), 0 /*empty*/, true /*constructing*/);
+				wcontext=NEW WWrapper(pool(), 0 /*empty*/);
 				break;
 			}
 		case OP_REDUCE_EWPOOL:
@@ -310,7 +311,7 @@ void Request::execute(const Array& ops)
 		case OP_CREATE_SWPOOL:
 			{
 				PUSH(wcontext);
-				wcontext=NEW WWrapper(pool(), 0 /*empty*/, false /*not constructing*/);
+				wcontext=NEW WWrapper(pool(), 0 /*empty*/);
 				break;
 			}
 		case OP_REDUCE_SWPOOL:
@@ -338,18 +339,12 @@ void Request::execute(const Array& ops)
 				//	not a code-junction
 				Junction *junction=value->get_junction();
 				if(!junction)
-					THROW(0,0,
+					THROW(0, 0,
 						&value->name(),
 						"(%s) not a method or junction, can not call it",
 							value->type()); 
 
-				bool is_constructor=
-					wcontext->constructing() && // constructing?
-					wcontext->somebody_entered_some_class(); // ^class:method[..]?
-				if(is_constructor)
-					wcontext->constructing(false);
-
-				VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction, is_constructor);
+				VMethodFrame *frame=NEW VMethodFrame(pool(), value->name(), *junction);
 				PUSH(frame);
 				break;
 			}
@@ -361,6 +356,11 @@ void Request::execute(const Array& ops)
 				break;
 			}
 
+		case OP_PREPARE_TO_CONSTRUCT_OBJECT:
+			{
+				wcontext->constructing(true);
+				break;
+			}
 		case OP_CALL:
 			{
 #ifdef DEBUG_EXECUTE
@@ -374,32 +374,39 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext); 
 				
 				VStateless_class *called_class=frame->junction.self.get_class();
-				// not ^name.method call, name:method call; and
-				// is context object or class & is it my class or my parent's class and?
-				VStateless_class *read_class=rcontext->get_class();
-				if(
-					!(wcontext->somebody_entered_some_object() &&
-					!wcontext->somebody_entered_some_class()) && 
-					read_class && read_class->is_or_derived_from(*called_class)) // yes
-					self=rcontext; // class dynamic call
-				else // no, not me or relative of mine (total stranger)
-					// were are constructing something and
-					// our constructor is just method call and
-					// not static-only-method call
-					if(frame->is_constructor && 
-						wcontext->somebody_entered_some_object()==1 &&
-						frame->junction.method->call_type!=Method::CT_STATIC) {
+				if(wcontext->constructing()) {
+					wcontext->constructing(false);
+					if(frame->junction.method->call_type!=Method::CT_STATIC) {
 						// this is a constructor call
-						// some stateless_object creatable derivates
-						if(Value *value=called_class->create_new_value(pool()))
+
+						if(Value *value=called_class->create_new_value(pool())) {
+							// some stateless_object creatable derivates
 							self=value;
-						else // stateful object
+						} else {
+							// stateful object
 							self=NEW VObject(pool(), *called_class);
+						}
 						frame->write(*self, 
 							String::UL_CLEAN  // not used, always an object, not string
 						);
-					} else 
-						self=&frame->junction.self; // no, static or simple dynamic call
+					} else
+						THROW(0, 0,
+							&frame->name(),
+							"method is static and can not be used as constructor");
+				} else {
+					// this is not constructor call
+
+					// not ^name.method call, name:method call; and
+					// is context object or class & is it my class or my parent's class and?
+					VStateless_class *read_class=rcontext->get_class();
+					if(
+						!(wcontext->somebody_entered_some_object() &&
+						!wcontext->somebody_entered_some_class()) && 
+						read_class && read_class->is_or_derived_from(*called_class)) // yes
+						self=rcontext; // dynamic call
+					else // no, not me or relative of mine (=total stranger)
+						self=&frame->junction.self; // static call
+				}
 
 				frame->set_self(*self);
 				root=rcontext=wcontext=frame;
@@ -776,7 +783,7 @@ Value& Request::process(Value& value, co
 			frame=NEW VCodeFrame(pool(), *junction->wcontext);  
 		} else {
 			// plain wwrapper
-			frame=NEW WWrapper(pool(), 0/*empty*/, false/*not constructing*/);
+			frame=NEW WWrapper(pool(), 0/*empty*/);
 		}
 		
 		//frame->set_name(value.name());
@@ -818,7 +825,7 @@ const String *Request::execute_method(Va
 	
 	// initialize contexts
 	root=rcontext=self=&aself;
-	wcontext=NEW WWrapper(pool(), &aself, false /*not constructing*/);
+	wcontext=NEW WWrapper(pool(), &aself);
 	
 	// execute!	
 	execute(*method.parser_code);
@@ -846,7 +853,7 @@ const String *Request::execute_virtual_m
 		if(Junction *junction=value->get_junction())
 			if(const Method *method=junction->method) 
 				return execute_method(aself, *method, return_cstr);
-
+			
 	return 0;
 }