[m-dev.] diff: map__lookup error message

[David Glen JEFFERY]

> > To accomodate this, this change implements a mechanism to override 
> > definitions of predicates for particular Prologs. This mechanism makes
> > explicit which .no or .ql files contain preds overriding others, and so
> > makes things a bit more robust.
> 
> > library/Mmakefile:
> > 	Set new environment variables, MERCURY_NU_OVERRIDDEN_LIB_OBJS or
> > 	MERCURY_SP_OVERRIDDEN_LIB_OBJS to be the files which are to be
> > 	linked, but contain definitions which override others.
> 
> Can I suggest adding these two explanations to the Mmakefile as well?

Instead, I've added similar explanations to the scripts msl.in and mnl.in, and
added documentation to the user guide. How does that seem?

--
Index: scripts//mnl.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/scripts/mnl.in,v
retrieving revision 1.7
diff -u -r1.7 mnl.in
--- mnl.in	1997/05/17 03:27:18	1.7
+++ mnl.in	1997/05/18 04:09:20
@@ -13,7 +13,15 @@
 #
 # Usage: mnl [-v|--verbose] [-d|--debug] [<nc link options>] files...
 #
-# Environment variables: MERCURY_LIB_DIR, MERCURY_LIB_OBJS
+# Environment variables:
+#       MERCURY_NU_LIB_DIR 
+#               the name of the directory containing the object files
+#       MERCURY_NU_LIB_OBJS
+#               the names of the object files
+#       MERCURY_NU_OVERRIDING_LIB_OBJS
+#               the names of the object files that contain definitions which
+#               should override others
+
 
 NULIBDIR=${MERCURY_NU_LIB_DIR=@LIBDIR@/nuprolog/@FULLARCH@}
 LIBRARY_OBJS=${MERCURY_NU_LIB_OBJS=" `cd $NULIBDIR; echo *.no` "}
Index: scripts//msl.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/scripts/msl.in,v
retrieving revision 1.11
diff -u -r1.11 msl.in
--- msl.in	1997/05/17 03:27:18	1.11
+++ msl.in	1997/05/18 04:08:36
@@ -17,7 +17,14 @@
 #	-v, --verbose
 #	-d, --debug
 #	-o, --output
-# Environment variables: MERCURY_SP_LIB_DIR, MERCURY_SP_LIB_OBJS
+# Environment variables: 
+#	MERCURY_SP_LIB_DIR 
+#		the name of the directory containing the object files
+#	MERCURY_SP_LIB_OBJS
+#		the names of the object files
+#	MERCURY_SP_OVERRIDING_LIB_OBJS 
+#		the names of the object files that contain definitions which
+#		should override others
 
 SPLIBDIR=${MERCURY_SP_LIB_DIR=@LIBDIR@/sicstus/@FULLARCH@}
 SP=${MERCURY_SICSTUS_PROLOG=$SPLIBDIR/library.sicstus.debug}
Index: scripts/doc//user_guide.texi
===================================================================
RCS file: /home/staff/zs/imp/mercury/doc/user_guide.texi,v
retrieving revision 1.85
diff -u -r1.85 user_guide.texi
--- user_guide.texi	1997/04/11 20:39:53	1.85
+++ user_guide.texi	1997/05/18 04:12:10
@@ -1952,6 +1952,26 @@
 library.
 
 @sp 1
+ at item MERCURY_NU_OVERRIDING_LIB_OBJS
+List of the NU-Prolog object files (@file{*.no}) for the Mercury
+library which override definitions given in @samp{MERCURY_NU_LIB_OBJS}.
+
+ at sp 1
+ at item MERCURY_SP_LIB_DIR
+Directory for the Sicstus-Prolog object files (@file{*.ql}) for the
+Sicstus-Prolog Mercury library.
+
+ at sp 1
+ at item MERCURY_SP_LIB_OBJS
+List of the Sicstus-Prolog object files (@file{*.ql}) for the Mercury
+library.
+
+ at sp 1
+ at item MERCURY_SP_OVERRIDING_LIB_OBJS
+List of the Sicstus-Prolog object files (@file{*.ql}) for the Mercury
+library which override definitions given in @samp{MERCURY_SP_LIB_OBJS}.
+
+ at sp 1
 @item MERCURY_COMPILER
 Filename of the Mercury Compiler.
 
--



love and cuddles,
dgj
-- 



This .sig deliberately left blank