--- parser3/src/main/execute.C	2001/04/11 15:45:50	1.145
+++ parser3/src/main/execute.C	2001/05/04 11:08:09	1.151
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.145 2001/04/11 15:45:50 paf Exp $
+	$Id: execute.C,v 1.151 2001/05/04 11:08:09 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -49,7 +49,7 @@ char *opcode_name[]={
 	"CALL",
 
 	// expression ops: unary
-	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS",
+	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
 	// expression ops: binary
 	"SUB", "ADD", "MUL", "DIV", "MOD",
 	"BIN_AND", "BIN_OR", "BIN_XOR",
@@ -140,26 +140,18 @@ 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 we would test that field 
+				// hence, we zero junction.wcontext here, and later
+				// in .process we would test that field 
 				// in decision "which wwrapper to use"
 				Junction& j=*NEW Junction(pool(), 
 					*self, 0, 0,
 					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()*/, 
+					rcontext, 
+					op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
 					local_ops);
 				
 				Value *value=NEW VJunction(j);
@@ -229,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:
@@ -284,8 +280,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *ncontext=POP();
 				PUSH(rcontext);
-				rcontext=ncontext;
 				PUSH(wcontext);
+				rcontext=ncontext;
 				wcontext=NEW WWrapper(pool(), ncontext, false /*not constructing*/);
 				break;
 			}
@@ -368,20 +364,19 @@ 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) {
 						// this is a constructor call
-						// 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 if(called_class==image_class)
-							self=NEW VImage(pool());
+						// some stateless_object creatable derivates
+						if(Value *value=called_class->create_new_value(pool()))
+							self=value;
 						else // stateful object
 							self=NEW VObject(pool(), *called_class);
 						frame->write(*self, 
@@ -464,7 +459,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;
 			}
@@ -476,6 +472,14 @@ void Request::execute(const Array& ops)
 				PUSH(value);
 				break;
 			}
+		case OP_DEXISTS:
+			{
+				Value *operand=POP();
+				Value *value=NEW VBool(pool(), 
+					dir_readable(absolute(operand->as_string())));
+				PUSH(value);
+				break;
+			}
 
 		// expression ops: binary
 		case OP_SUB: 
@@ -666,14 +670,14 @@ void Request::execute(const Array& ops)
 Value *Request::get_element() {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
-	Value *value=ncontext->get_element(name);
-	if(!value)
-		if(Method* method=OP.get_method(name)) { // operator?
-			// as if that method were in self and we have normal dynamic method here
-			Junction& junction=*NEW Junction(pool(), 
-				*self, self->get_class(), method, 0,0,0,0);
-			value=NEW VJunction(junction);
-		}
+	Value *value;
+	if(Method* method=OP.get_method(name)) { // operator?
+		// as if that method were in self and we have normal dynamic method here
+		Junction& junction=*NEW Junction(pool(), 
+			*self, self->get_class(), method, 0,0,0,0);
+		value=NEW VJunction(junction);
+	} else
+		value=ncontext->get_element(name);
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {