* Makefile.pamphlet (database.$(FASLEXT)): New rule.

	* database.boot.pamphlet: Push into package "BOOT".

7 files changed, 34 insertions, 28 deletions

diff --git a/configure b/configure
index 98fc1c36..95b8c7b6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-01.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-02.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.1.0-2007-11-01'
-PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-01'
+PACKAGE_VERSION='1.1.0-2007-11-02'
+PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-02'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1388,7 +1388,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.1.0-2007-11-01 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.1.0-2007-11-02 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1458,7 +1458,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-01:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-02:";;
    esac
   cat <<\_ACEOF
 
@@ -1562,7 +1562,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.1.0-2007-11-01
+OpenAxiom configure 1.1.0-2007-11-02
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1576,7 +1576,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.1.0-2007-11-01, which was
+It was created by OpenAxiom $as_me 1.1.0-2007-11-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -25198,7 +25198,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.1.0-2007-11-01, which was
+This file was extended by OpenAxiom $as_me 1.1.0-2007-11-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25247,7 +25247,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.1.0-2007-11-01
+OpenAxiom config.status 1.1.0-2007-11-02
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 125c3720..18782793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.1.0-2007-11-01], 
+AC_INIT([OpenAxiom], [1.1.0-2007-11-02], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 0b849f8b..480eb93b 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1010,7 +1010,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.1.0-2007-11-01], 
+AC_INIT([OpenAxiom], [1.1.0-2007-11-02], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index f74f3000..7be876a1 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (database.$(FASLEXT)): New rule.
+	* database.boot.pamphlet: Push into package "BOOT".
+
 2007-11-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (functor.$(FASLEXT)): New rule.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 97fac659..21e0258b 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -457,6 +457,10 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
+		cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -688,10 +692,6 @@ compiler.clisp: compiler.boot
 	@ echo 233 making $@ from $<
 	@ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
 
-database.clisp: database.boot
-	@ echo 243 making $@ from $<
-	@ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
-
 i-analy.clisp: i-analy.boot
 	@ echo 280 making $@ from $<
 	@ echo '(old-boot::boot "i-analy.boot")' | ${DEPSYS}
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 69abbb73..2f69125e 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1108,14 +1108,6 @@ compiler.clisp: compiler.boot
 	@ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
 @
 
-\subsection{database.boot \cite{67}}
-
-<<database.clisp>>=
-database.clisp: database.boot
-	@ echo 243 making $@ from $<
-	@ echo '(old-boot::boot "database.boot")' | ${DEPSYS}
-@
-
 \subsection{i-analy.boot}
 
 <<i-analy.clisp>>=
@@ -1556,6 +1548,10 @@ define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
+		cattable.$(FASLEXT) compat.$(FASLEXT) g-cndata.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -1767,8 +1763,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<compiler.clisp>>
 
-<<database.clisp>>
-
 <<i-analy.clisp>>
 
 <<i-code.clisp>>
diff --git a/src/interp/database.boot.pamphlet b/src/interp/database.boot.pamphlet
index f33d9333..03c15cd2 100644
--- a/src/interp/database.boot.pamphlet
+++ b/src/interp/database.boot.pamphlet
@@ -50,7 +50,14 @@
 <<*>>=
 <<license>>
 
-SETANDFILEQ($getUnexposedOperations,true)
+import '"nlib"
+import '"g-cndata"
+import '"clam"
+import '"cattable"
+import '"compat"
+)package "BOOT"
+
+$getUnexposedOperations := true
 
 --% Functions for manipulating MODEMAP DATABASE
 
@@ -258,7 +265,7 @@ orderPredTran(oldList,sig,skip) ==
   for pred in newList repeat
     if pred is ['isDomain,x,y] or x is ['ofCategory,x,y] then
       ids:= listOfPatternIds y
-      if and/[id in fullDependList for id in ids] then
+      if "and"/[id in fullDependList for id in ids] then
 	fullDependList:= insertWOC(x,fullDependList)
       fullDependList:= UNIONQ(fullDependList,ids)
 
@@ -271,7 +278,7 @@ orderPredTran(oldList,sig,skip) ==
 --pp answer
 
 isDomainSubst u == main where
-  main ==
+  main() ==
     u is [head,:tail] =>
       nhead :=
 	head is ['isDomain,x,y] => ['isDomain,x,fn(y,tail)]