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

	(<<clammed.clisp>>): Remove.
	* clammed.boot.pamphlet: Push into package "BOOT".  Fix syntax.

4 files changed, 17 insertions, 16 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 610b45c3..44304a2e 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (clammed.$(FASLEXT)): New rule.
+	(<<clammed.clisp>>): Remove.
+	* clammed.boot.pamphlet: Push into package "BOOT".  Fix syntax.
+
 2007-11-16  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* compiler.boot ($coreDiagnosticFunctions): New.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index e79389ba..6e13a54b 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -677,6 +677,9 @@ info.$(FASLEXT): info.boot g-util.$(FASLEXT)
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -740,10 +743,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
 boot-pkg.$(FASLEXT): boot-pkg.lisp
 	$(BOOTSYS) -- --compile --output=$@ $<
 
-clammed.clisp: clammed.boot
-	@ echo 226 making $@ from $<
-	@ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS} 
-
 bookvol5.lisp: $(srcdir)/bookvol5.pamphlet
 	@ echo 298 making $@ from $<
 	$(axiom_build_document) --tangle=Interpreter --output=$@ $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index c178279e..f3c38e4f 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -824,14 +824,6 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
 	$(INSTALL_DATA) $< $@
 @
 
-\subsection{clammed.boot \cite{62}}
-
-<<clammed.clisp>>=
-clammed.clisp: clammed.boot
-	@ echo 226 making $@ from $<
-	@ echo '(old-boot::boot "clammed.boot")' | ${DEPSYS} 
-@
-
 \subsection{bookvol5.lsp}
 
 
@@ -1254,6 +1246,9 @@ info.$(FASLEXT): info.boot g-util.$(FASLEXT)
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -1317,8 +1312,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
 boot-pkg.$(FASLEXT): boot-pkg.lisp
 	$(BOOTSYS) -- --compile --output=$@ $<
 
-<<clammed.clisp>>
-
 <<bookvol5.lisp>>
 
 <<nrunopt.clisp>>
diff --git a/src/interp/clammed.boot.pamphlet b/src/interp/clammed.boot.pamphlet
index af4ea229..1027d7e9 100644
--- a/src/interp/clammed.boot.pamphlet
+++ b/src/interp/clammed.boot.pamphlet
@@ -45,6 +45,9 @@
 @
 <<*>>=
 <<license>>
+import '"g-timer"
+)package "BOOT"
+)eval BOOTTRAN::$bfClamming := true
 
 --% Functions on $clamList
 
@@ -125,10 +128,10 @@ isValidType form ==
     if # cl ^= # argl and GENSYMP last argl then argl:= DROP(-1,argl)
     # cl ^= # argl => nil
     cl:= replaceSharps(cl,form)
-    and/[isValid for x in argl for c in cl] where isValid ==
+    and/[isValid for x in argl for c in cl] where isValid() ==
       categoryForm?(c) =>
         evalCategory(x,MSUBSTQ(x,'_$,c)) and isValidType x
-      not GETDATABASE(opOf x,'CONSTRUCTORKIND) = 'domain
+      GETDATABASE(opOf x,'CONSTRUCTORKIND) ^= 'domain
 
 selectMms1(op,tar,args1,args2,$Coerce) ==
     -- for new compiler/old world compatibility, sometimes have to look