aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-11-17 22:29:45 +0000
committerdos-reis <gdr@axiomatics.org>2007-11-17 22:29:45 +0000
commit016dfe5e315ee3ffb914813e68df4e5202dc7308 (patch)
tree909d365544e1ed84fd29955ca4802f6f9e3c536e /src
parent5a2a946a6650d258ab1f1364bdd77921ef0fb488 (diff)
downloadopen-axiom-016dfe5e315ee3ffb914813e68df4e5202dc7308.tar.gz
* Makefile.pamphlet (clammed.$(FASLEXT)): New rule.
(<<clammed.clisp>>): Remove. * clammed.boot.pamphlet: Push into package "BOOT". Fix syntax.
Diffstat (limited to 'src')
-rw-r--r--src/interp/ChangeLog6
-rw-r--r--src/interp/Makefile.in7
-rw-r--r--src/interp/Makefile.pamphlet13
-rw-r--r--src/interp/clammed.boot.pamphlet7
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