[Xsb-commits] CVS: XSB/syslib consult.P, 1.59, 1.60 consult.xwam, 1.48, 1.49

[David S. W. <dw...@us...>]

Update of /cvsroot/xsb/XSB/syslib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18968

Modified Files:
	consult.P consult.xwam 
Log Message:
Made consult load the file when given a filename with the .xwam extension.
Also improved error message when trying to compile a file with the .xwam extension.
This fixes something I broke when allowing xsb to compile source files with other 
than recognized extensions.


Index: consult.P
===================================================================
RCS file: /cvsroot/xsb/XSB/syslib/consult.P,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- consult.P	6 Oct 2006 21:24:34 -0000	1.59
+++ consult.P	25 Oct 2006 13:43:05 -0000	1.60
@@ -43,9 +43,12 @@
 compile0(Path, Options) :-
 	atom(Path),
 	search_module(Path, Dir, Mod, SExt, Base, _Obj),
-	SExt \== XSB_OBJ_EXTENSION_ATOM_SANS_DOT,
 	!,
-	compile_f(SExt, Base, Options, _, Mod, Dir).
+	(SExt \== XSB_OBJ_EXTENSION_ATOM_SANS_DOT
+	 ->	compile_f(SExt, Base, Options, _, Mod, Dir)
+	 ;	file_write0(STDERR, 'Cannot compile a file with .xwam extension'),
+		fail
+	).
 compile0(Path, _) :-
 	file_write0(STDERR, 'Cannot find the file/module '),
 	file_write0(STDERR, Path), file_nl(STDERR), fail.
@@ -267,7 +270,9 @@
 	str_cat(Base, XSB_OBJ_EXTENSION_ATOM, Obj).
 
 acceptable_extension('').
-acceptable_extension('P').
+%%acceptable_extension('P').
+acceptable_extension(XSB_SRC_EXTENSION_ATOM_SANS_DOT).
+acceptable_extension(XSB_OBJ_EXTENSION_ATOM_SANS_DOT).
 acceptable_extension('p').
 acceptable_extension('pl').
 acceptable_extension('c').

Index: consult.xwam
===================================================================
RCS file: /cvsroot/xsb/XSB/syslib/consult.xwam,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
Binary files /tmp/cvsnvP2Xw and /tmp/cvsSJHswz differ