[Commit] nickle command.5c,1.17,1.18

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv11611

Modified Files:
	command.5c 
Log Message:
dont reload upper level libraries when loading lower level

Index: command.5c
===================================================================
RCS file: /local/src/CVS/nickle/command.5c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- command.5c	28 May 2003 21:20:06 -0000	1.17
+++ command.5c	28 May 2003 23:12:11 -0000	1.18
@@ -141,15 +141,19 @@
 	    for (int j = dim(name) - 1; j >= 0; j--)
 	    {
 		import_if_needed(name[j]);
-		string f = make_filename(name[j]);
-		if (!lex_library (f)) 
+		string[*] subname = (string[j+1]) { [k] = name[k] };
+		if (!valid_name (subname))
 		{
-		    File::fprintf (stderr,
-				   "Cannot load %s " +
-				   "file \"%s\", giving up.\n",
-				   autotype,
-				   f);
-		    return;
+		    string f = make_filename(name[j]);
+		    if (!lex_library (f)) 
+		    {
+			File::fprintf (stderr,
+				       "Cannot load %s " +
+				       "file \"%s\", giving up.\n",
+				       autotype,
+				       f);
+			return;
+		    }
 		}
 	    }
 	}