--- parser3/src/main/execute.C	2001/03/12 17:00:47	1.95
+++ parser3/src/main/execute.C	2001/03/12 22:21:02	1.98
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.95 2001/03/12 17:00:47 paf Exp $
+	$Id: execute.C,v 1.98 2001/03/12 22:21:02 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -128,6 +128,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_CLASS:
 			{
+				// maybe the do ^class:method[] call, remember the fact
+				wcontext->set_somebody_entered_some_class();
+
 				const String& name=POP_NAME();
 				VClass *vclass=static_cast<VClass *>(classes().get(name));
 				if(!vclass) 
@@ -308,8 +311,10 @@ void Request::execute(const Array& ops)
 				if(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)
-					if(wcontext->constructing()) {  // constructing?
-						// yes, constructor call: $some(^class:method(..))
+					if(
+						wcontext->constructing() && // constructing?
+						wcontext->somebody_entered_some_class()) { // ^class:method[..]?
+						// yes, this is a constructor call
 						if(called_class->name()==TABLE_CLASS_NAME)
 							self=NEW VTable(pool());
 						else
@@ -360,7 +365,7 @@ void Request::execute(const Array& ops)
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), ~static_cast<int>(operand->get_double()));
+				Value *value=NEW VDouble(pool(), ~(int)operand->get_double());
 				PUSH(value);
 				break;
 			}
@@ -426,8 +431,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) %
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() %
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -435,8 +440,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) &
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() &
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -444,8 +449,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) |
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() |
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -453,8 +458,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) ^
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() ^
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}