--- parser3/src/main/execute.C	2001/04/28 08:43:57	1.149
+++ parser3/src/main/execute.C	2001/05/11 17:45:10	1.155
@@ -5,11 +5,11 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.149 2001/04/28 08:43:57 paf Exp $
+	$Id: execute.C,v 1.155 2001/05/11 17:45:10 parser Exp $
 */
 
 #include "pa_config_includes.h"
-#include "code.h"
+#include "pa_opcode.h"
 #include "pa_array.h" 
 #include "pa_request.h"
 #include "pa_vstring.h"
@@ -221,6 +221,10 @@ void Request::execute(const Array& ops)
 			{
 				Value *value=POP();
 				write_assign_lang(*value);
+
+				// forget the fact they've entered some ^object.method[].
+				// see OP_GET_ELEMENT
+				wcontext->clear_somebody_entered_some_object();
 				break;
 			}
 		case OP_WRITE_EXPR_RESULT:
@@ -239,6 +243,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;
@@ -357,12 +364,18 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext); 
 				
 				VStateless_class *called_class=frame->junction.self.get_class();
+				// not ^name.method call and
 				// is context object or class & is it my class or my parent's class?
 				VStateless_class *read_class=rcontext->get_class();
-				if(read_class && read_class->is_or_derived_from(*called_class)) // yes
+				if(
+					!wcontext->somebody_entered_some_object() && 
+					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(frame->is_constructor) {
+					// were are constructing something and
+					// our constructor is just method call
+					if(frame->is_constructor && 
+						wcontext->somebody_entered_some_object()==1) {
 						// this is a constructor call
 						// some stateless_object creatable derivates
 						if(Value *value=called_class->create_new_value(pool()))
@@ -389,7 +402,7 @@ void Request::execute(const Array& ops)
 						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(
+							method.check_actual_numbered_params(pool(),
 								frame->junction.self, 
 								frame->name(), frame->numbered_params());
 							(*method.native_code)(
@@ -427,7 +440,7 @@ void Request::execute(const Array& ops)
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), ~(int)operand->as_double());
+				Value *value=NEW VDouble(pool(), ~operand->as_int());
 				PUSH(value);
 				break;
 			}
@@ -449,7 +462,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *operand=POP();
 				const char *path=operand->as_string().cstr();
-				Value *value=NEW VBool(pool(), info.uri && strcmp(path, info.uri)<=0);
+				Value *value=NEW VBool(pool(), 
+					info.uri && strncmp(path, info.uri, strlen(path))==0);
 				PUSH(value);
 				break;
 			}
@@ -503,8 +517,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->as_double() %
-					(int)b->as_double());
+					a->as_int() %
+					b->as_int());
 				PUSH(value);
 				break;
 			}
@@ -512,8 +526,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->as_double() &
-					(int)b->as_double());
+					a->as_int() &
+					b->as_int());
 				PUSH(value);
 				break;
 			}
@@ -521,8 +535,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->as_double() |
-					(int)b->as_double());
+					a->as_int() |
+					b->as_int());
 				PUSH(value);
 				break;
 			}
@@ -530,8 +544,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					(int)a->as_double() ^
-					(int)b->as_double());
+					a->as_int() ^
+					b->as_int());
 				PUSH(value);
 				break;
 			}