src/algebra/

2007-11-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (mostlyclean-local): Remove stamp files and
	strap/ directory too.
	(clean-local): Remove database directories too.


src/interpreter/
2007-11-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (nrungo.$(FASLEXT)): New rule.
	(nruntime.$(FASLEXT)): Likewise.
	(<<nrungo.clisp>>): Remove.
	(<<nruntime.clisp>>): Likewise.
	* nrungo.boot.pamphlet: Push into package "BOOT".  Fix syntax.
	* nruntime.boot.pamphlet: Push into package "BOOT".

8 files changed, 40 insertions, 29 deletions

diff --git a/src/algebra/ChangeLog b/src/algebra/ChangeLog
index 3e0ecfe4..c04a0f3c 100644
--- a/src/algebra/ChangeLog
+++ b/src/algebra/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (mostlyclean-local): Remove stamp files and
+	strap/ directory too.
+	(clean-local): Remove database directories too.
+
 2007-10-22  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* mkfunc.spad.pamphlet (InputForm$interpret): Use objNew.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index f9dc2f60..f3bf33bc 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1141,8 +1141,11 @@ bootstrap-stamp: $(axiom_algebra_bootstrap_objects)
 mostlyclean-local:
 	@ -rm -f $(OUT)/*.$(OBJEXT)
 	@ -rm -rf *.NRLIB
+	rm -rf strap
+	rm -f *stamp
 
 clean-local: mostlyclean-local
+	rm -rf *.DAASE
 
 distclean-local: clean-local
 
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index b9c956c6..45e3ed77 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -2284,8 +2284,11 @@ check:
 mostlyclean-local:
 	@ -rm -f $(OUT)/*.$(OBJEXT)
 	@ -rm -rf *.NRLIB
+	rm -rf strap
+	rm -f *stamp
 
 clean-local: mostlyclean-local
+	rm -rf *.DAASE
 
 distclean-local: clean-local
 
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 9309fc94..5700dbcf 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-10  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (nrungo.$(FASLEXT)): New rule.
+	(nruntime.$(FASLEXT)): Likewise.
+	(<<nrungo.clisp>>): Remove.
+	(<<nruntime.clisp>>): Likewise.
+	* nrungo.boot.pamphlet: Push into package "BOOT".  Fix syntax.
+	* nruntime.boot.pamphlet: Push into package "BOOT".
+
 2007-11-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (i-toplev.$(FASLEXT)): New rule.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 29cd5263..fd8f1b66 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -484,6 +484,12 @@ compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \
 			modemap.$(FASLEXT) pathname.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -745,14 +751,6 @@ nrunfast.clisp: nrunfast.boot
 	@ echo 356 making $@ from $<
 	@ echo '(old-boot::boot "nrunfast.boot")' | ${DEPSYS}
 
-nrungo.clisp: nrungo.boot
-	@ echo 359 making $@ from $<
-	@ echo '(old-boot::boot "nrungo.boot")' | ${DEPSYS}
-
-nruntime.clisp: nruntime.boot
-	@ echo 362 making $@ from $<
-	@ echo '(old-boot::boot "nruntime.boot")' | ${DEPSYS}
-
 nrunopt.clisp: nrunopt.boot
 	@ echo 365 making $@ from $<
 	@ echo '(old-boot::boot "nrunopt.boot")' | ${DEPSYS}
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 5689459a..bdaffb89 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -857,22 +857,6 @@ nrunfast.clisp: nrunfast.boot
 	@ echo '(old-boot::boot "nrunfast.boot")' | ${DEPSYS}
 @
 
-\subsection{nrungo.boot}
-
-<<nrungo.clisp>>=
-nrungo.clisp: nrungo.boot
-	@ echo 359 making $@ from $<
-	@ echo '(old-boot::boot "nrungo.boot")' | ${DEPSYS}
-@
-
-\subsection{nruntime.boot}
-
-<<nruntime.clisp>>=
-nruntime.clisp: nruntime.boot
-	@ echo 362 making $@ from $<
-	@ echo '(old-boot::boot "nruntime.boot")' | ${DEPSYS}
-@
-
 \subsection{nrunopt.boot}
 
 <<nrunopt.clisp>>=
@@ -1157,6 +1141,12 @@ compiler.$(FASLEXT): compiler.boot category.$(FASLEXT) c-util.$(FASLEXT) \
 			modemap.$(FASLEXT) pathname.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -1396,10 +1386,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
 
 <<nrunfast.clisp>>
 
-<<nrungo.clisp>>
-
-<<nruntime.clisp>>
-
 <<nrunopt.clisp>>
 
 <<setvart.clisp>>
diff --git a/src/interp/nrungo.boot.pamphlet b/src/interp/nrungo.boot.pamphlet
index f0ecf57f..96f7aaa0 100644
--- a/src/interp/nrungo.boot.pamphlet
+++ b/src/interp/nrungo.boot.pamphlet
@@ -46,6 +46,9 @@
 <<*>>=
 <<license>>
 
+import '"c-util"
+)package "BOOT"
+
 --=======================================================
 --             Lookup From Interpreter
 --=======================================================
@@ -213,7 +216,7 @@ lookupInCategories(op,sig,dom,dollar) ==
   nsig := MSUBST(dom.0,dollar.0,sig)
   r := or/[lookupInDomainVector(op,nsig,
                    eval EQSUBSTLIST(valueList,varList,catform),dollar)
-        for catform in catformList | pred] where pred ==
+        for catform in catformList | pred] where pred() ==
    (table := HGET($Slot1DataBase,first catform)) and
       (u := LASSQ(op,table))  --compare without checking predicates
          and (v := or/[rest x for x in u | #sig = #x.0])
diff --git a/src/interp/nruntime.boot.pamphlet b/src/interp/nruntime.boot.pamphlet
index c2d809d1..eaa39365 100644
--- a/src/interp/nruntime.boot.pamphlet
+++ b/src/interp/nruntime.boot.pamphlet
@@ -46,6 +46,9 @@
 <<*>>=
 <<license>>
 
+import '"c-util"
+)package "BOOT"
+
 unloadOneConstructor(cnam,fn) ==
     REMPROP(cnam,'LOADED)
     SETF(SYMBOL_-FUNCTION cnam,mkAutoLoad(fn, cnam))