aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/ChangeLog5
-rw-r--r--src/boot/tokens.boot.pamphlet3
-rw-r--r--src/input/ChangeLog4
-rw-r--r--src/input/lexp.input.pamphlet26
-rw-r--r--src/interp/ChangeLog23
-rw-r--r--src/interp/Makefile.in115
-rw-r--r--src/interp/Makefile.pamphlet145
-rw-r--r--src/interp/as.boot.pamphlet71
-rw-r--r--src/interp/ax.boot.pamphlet5
-rw-r--r--src/interp/bc-matrix.boot1
-rw-r--r--src/interp/bc-misc.boot.pamphlet3
-rw-r--r--src/interp/bc-solve.boot.pamphlet6
-rw-r--r--src/interp/bc-util.boot.pamphlet1
-rw-r--r--src/interp/clam.boot.pamphlet2
-rw-r--r--src/interp/format.boot.pamphlet41
-rw-r--r--src/interp/g-util.boot.pamphlet2
-rw-r--r--src/interp/setq.lisp1
-rw-r--r--src/interp/spad.lisp1
-rw-r--r--src/interp/sys-constants.boot3
19 files changed, 245 insertions, 213 deletions
diff --git a/src/boot/ChangeLog b/src/boot/ChangeLog
index a22d37e0..56258d27 100644
--- a/src/boot/ChangeLog
+++ b/src/boot/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * tokens.boot.pamphlet: SHOEEQ and Old Boot EQUAL are know to
+ be semantically equivalent.
+
2007-10-13 Gabriel Dos Reis <gdr@cs.tamu.edu>
* ast.boot.pamphlet (bfGetOldBootName): New.
diff --git a/src/boot/tokens.boot.pamphlet b/src/boot/tokens.boot.pamphlet
index 482729a8..4f2405c1 100644
--- a/src/boot/tokens.boot.pamphlet
+++ b/src/boot/tokens.boot.pamphlet
@@ -461,7 +461,7 @@ for i in [ _
["MINUS", "SPADDIFFERENCE"], _
["SLASH", "QUOTIENT"], _
["=", "EQUAL"], _
- ["SHOEEQ", "BOOT-EQUAL"], _
+ ["SHOEEQ", "EQUAL"], _
["ASSOC", "assoc"], _
["DELETE", "delete"], _
["GET", "GETL"], _
@@ -484,6 +484,7 @@ for i in [ _
for i in [ _
"LT", "LE", _
"GT", "GE", _
+ "SHOENE", _
"TIMES", "PLUS", _
"MINUS", "function",_
"PAIRP"
diff --git a/src/input/ChangeLog b/src/input/ChangeLog
index 20632c1e..d35a63d9 100644
--- a/src/input/ChangeLog
+++ b/src/input/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * lexp.input.pamphlet: Fix indentation thinko.
+
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (TESTSYS): Tidy.
diff --git a/src/input/lexp.input.pamphlet b/src/input/lexp.input.pamphlet
index f8af5761..4f70d158 100644
--- a/src/input/lexp.input.pamphlet
+++ b/src/input/lexp.input.pamphlet
@@ -12,19 +12,19 @@
<<*>>=
)cl all
- a: Symbol := 'a
- b: Symbol := 'b
- coef := Fraction(Integer)
- group := LieExponentials(Symbol, coef, 3)
- lpoly := LiePolynomial(Symbol, coef)
- poly := XPBWPolynomial(Symbol, coef)
- ea := exp(a::lpoly)$group
- eb := exp(b::lpoly)$group
- g: group := ea*eb
- g :: poly
- log(g)$group
- g1: group := inv(g)
- g*g1
+a: Symbol := 'a
+b: Symbol := 'b
+coef := Fraction(Integer)
+group := LieExponentials(Symbol, coef, 3)
+lpoly := LiePolynomial(Symbol, coef)
+poly := XPBWPolynomial(Symbol, coef)
+ea := exp(a::lpoly)$group
+eb := exp(b::lpoly)$group
+g: group := ea*eb
+g :: poly
+log(g)$group
+g1: group := inv(g)
+g*g1
@
\eject
\begin{thebibliography}{99}
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 4bcaf00e..794f83d8 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,26 @@
+2007-10-14 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Compile Boot code with --boot=old.
+ (bc-solve.$(FASLEXT)): New rule.
+ (bc-matrix.$(FASLEXT)): Likewise.
+ (bc-misc.$(FASLEXT)): Likewise.
+ (bc-util.$(FASLEXT)): Likewise.
+ (ax.$(FASLEXT)): Likewise.
+ (as.$(FASLEXT)): Likewise.
+ (<<as.clisp>>): Remove.
+ (<<ax.clisp>>): Likewise.
+ (<<bc-misc.clisp>>): Likewise.
+ (<<bc-solve.clisp>>): Likewise.
+ (<<format.clisp>>): Likewise.
+ * as.boot.pamphlet: Push into package "BOOT". Fix syntax.
+ * ax.boot.pamphlet: Likewise.
+ * bc-matrix.boot.pamphlet: Import "bc-util".
+ * bc-solve.boot.pamphlet: Make compilable by bootsys.
+ * bc-util.boot.pamphlet: Import "ht-util".
+ * format.boot.pamphlet: Make compilable by bootsys.
+ * g-util.boot.pamphlet (freeOfShapVars): Use union.
+ * setq.lisp (BLANK): Move definition to sys-constant.boot.
+
2007-10-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (${DEPSYS}): Depend on g-util.$(FASLEXT).
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 9d742924..2bc50802 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -405,28 +405,51 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
$(INSTALL) $< $@
## HyperDoc
+bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-misc.$(FASLEXT): bc-misc.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-util.$(FASLEXT): bc-util.boot ht-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
ht-root.$(FASLEXT): ht-root.boot ht-util.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
hypertex.$(FASLEXT): hypertex.boot boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## OpenAxiom's interpreter.
profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+
+format.$(FASLEXT): format.boot macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+## Interface with the Aldor compiler.
+ax.$(FASLEXT): ax.boot as.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+as.$(FASLEXT): as.boot macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
##
@@ -446,11 +469,11 @@ rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
## The old parser component roughtly is:
##
-parse.$(FASLEXT): parse.clisp postpar.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+parse.$(FASLEXT): parse.boot postpar.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-postpar.$(FASLEXT): postpar.clisp postprop.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+postpar.$(FASLEXT): postpar.boot postprop.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
postprop.$(FASLEXT): postprop.lisp macros.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
@@ -491,58 +514,58 @@ macros.$(FASLEXT): macros.lisp sys-macros.$(FASLEXT)
## posit.boot cparse.boot format.boot cstream.boot
##
-cparse.$(FASLEXT): cparse.clisp ptrees.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-ptrees.$(FASLEXT): ptrees.clisp posit.$(FASLEXT) serror.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-pile.$(FASLEXT): pile.clisp scan.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+pile.$(FASLEXT): pile.boot scan.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-scan.$(FASLEXT): scan.clisp incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+scan.$(FASLEXT): scan.boot incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-incl.$(FASLEXT): incl.clisp cstream.$(FASLEXT) cformat.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+incl.$(FASLEXT): incl.boot cstream.$(FASLEXT) cformat.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-cformat.$(FASLEXT): cformat.clisp unlisp.$(FASLEXT) posit.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cformat.$(FASLEXT): cformat.boot unlisp.$(FASLEXT) posit.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
serror.$(FASLEXT): serror.boot posit.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-posit.$(FASLEXT): posit.clisp sys-macros.$(FASLEXT) astr.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+posit.$(FASLEXT): posit.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-astr.$(FASLEXT): astr.clisp boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+astr.$(FASLEXT): astr.boot boot-pkg.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## General support and utilities.
g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-cndata.$(FASLEXT): g-cndata.boot sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
sys-macros.$(FASLEXT): sys-macros.lisp diagnostics.$(FASLEXT) \
union.$(FASLEXT)
@@ -577,22 +600,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
$(BOOTSYS) -- --compile --output=$@ $<
-as.clisp: as.boot
- @ echo 417 making $@ from $<
- @ echo '(old-boot::boot "as.boot")' | ${DEPSYS}
-
-ax.clisp: ax.boot
- @ echo 463 making $@ $<
- @ echo '(old-boot::boot "ax.boot")' | ${DEPSYS}
-
-bc-misc.clisp: bc-misc.boot
- @ echo 428 making $@ from $<
- @ echo '(old-boot::boot "bc-misc.boot")' | ${DEPSYS}
-
-bc-solve.clisp: bc-solve.boot
- @ echo 432 making $@ from $<
- @ echo '(old-boot::boot "bc-solve.boot")' | ${DEPSYS}
-
br-con.clisp: br-con.boot
@ echo 467 making $@ from $<
@ echo '(old-boot::boot "br-con.boot")' | ${DEPSYS}
@@ -663,10 +670,6 @@ define.clisp: define.boot
@ echo 247 making $@ from $<
@ echo '(old-boot::boot "define.boot")' | ${DEPSYS}
-format.clisp: format.boot
- @ echo 250 making $@ from $<
- @ echo '(old-boot::boot "format.boot")' | ${DEPSYS}
-
fortcall.clisp: fortcall.boot
@ echo 55 making $@ from $<
@ echo '(progn (old-boot::boot "fortcall.boot"))' | ${DEPSYS}
@@ -798,7 +801,7 @@ setvart.clisp: setvart.boot
buildom.$(FASLEXT): buildom.boot sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 9843fcc5..eac7db36 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1188,14 +1188,6 @@ define.clisp: define.boot
@ echo '(old-boot::boot "define.boot")' | ${DEPSYS}
@
-\subsection{format.boot}
-
-<<format.clisp>>=
-format.clisp: format.boot
- @ echo 250 making $@ from $<
- @ echo '(old-boot::boot "format.boot")' | ${DEPSYS}
-@
-
\subsection{functor.boot}
<<functor.clisp>>=
@@ -1459,30 +1451,6 @@ setvart.clisp: setvart.boot
@ echo '(old-boot::boot "setvart.boot")' | ${DEPSYS}
@
-\subsection{as.boot}
-
-<<as.clisp>>=
-as.clisp: as.boot
- @ echo 417 making $@ from $<
- @ echo '(old-boot::boot "as.boot")' | ${DEPSYS}
-@
-
-\subsection{bc-misc.boot}
-
-<<bc-misc.clisp>>=
-bc-misc.clisp: bc-misc.boot
- @ echo 428 making $@ from $<
- @ echo '(old-boot::boot "bc-misc.boot")' | ${DEPSYS}
-@
-
-\subsection{bc-solve.boot}
-
-<<bc-solve.clisp>>=
-bc-solve.clisp: bc-solve.boot
- @ echo 432 making $@ from $<
- @ echo '(old-boot::boot "bc-solve.boot")' | ${DEPSYS}
-@
-
\subsection{record.boot}
<<record.clisp>>=
@@ -1491,14 +1459,6 @@ record.clisp: record.boot
@ echo '(old-boot::boot "record.boot")' | ${DEPSYS}
@
-\subsection{ax.boot}
-
-<<ax.clisp>>=
-ax.clisp: ax.boot
- @ echo 463 making $@ $<
- @ echo '(old-boot::boot "ax.boot")' | ${DEPSYS}
-@
-
\subsection{br-con.boot}
<<br-con.clisp>>=
@@ -1655,28 +1615,51 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
$(INSTALL) $< $@
## HyperDoc
+bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-misc.$(FASLEXT): bc-misc.boot bc-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+bc-util.$(FASLEXT): bc-util.boot ht-util.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
ht-root.$(FASLEXT): ht-root.boot ht-util.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
hypertex.$(FASLEXT): hypertex.boot boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## OpenAxiom's interpreter.
profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+
+format.$(FASLEXT): format.boot macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+## Interface with the Aldor compiler.
+ax.$(FASLEXT): ax.boot as.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+as.$(FASLEXT): as.boot macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
##
@@ -1696,11 +1679,11 @@ rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
## The old parser component roughtly is:
##
-parse.$(FASLEXT): parse.clisp postpar.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+parse.$(FASLEXT): parse.boot postpar.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-postpar.$(FASLEXT): postpar.clisp postprop.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+postpar.$(FASLEXT): postpar.boot postprop.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
postprop.$(FASLEXT): postprop.lisp macros.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
@@ -1741,58 +1724,58 @@ macros.$(FASLEXT): macros.lisp sys-macros.$(FASLEXT)
## posit.boot cparse.boot format.boot cstream.boot
##
-cparse.$(FASLEXT): cparse.clisp ptrees.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-ptrees.$(FASLEXT): ptrees.clisp posit.$(FASLEXT) serror.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-pile.$(FASLEXT): pile.clisp scan.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+pile.$(FASLEXT): pile.boot scan.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-scan.$(FASLEXT): scan.clisp incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+scan.$(FASLEXT): scan.boot incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-incl.$(FASLEXT): incl.clisp cstream.$(FASLEXT) cformat.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+incl.$(FASLEXT): incl.boot cstream.$(FASLEXT) cformat.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-cformat.$(FASLEXT): cformat.clisp unlisp.$(FASLEXT) posit.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cformat.$(FASLEXT): cformat.boot unlisp.$(FASLEXT) posit.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
serror.$(FASLEXT): serror.boot posit.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
-posit.$(FASLEXT): posit.clisp sys-macros.$(FASLEXT) astr.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+posit.$(FASLEXT): posit.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
-astr.$(FASLEXT): astr.clisp boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+astr.$(FASLEXT): astr.boot boot-pkg.$(FASLEXT)
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
## General support and utilities.
g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
g-cndata.$(FASLEXT): g-cndata.boot sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
sys-macros.$(FASLEXT): sys-macros.lisp diagnostics.$(FASLEXT) \
union.$(FASLEXT)
@@ -1827,14 +1810,6 @@ vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
$(BOOTSYS) -- --compile --output=$@ $<
-<<as.clisp>>
-
-<<ax.clisp>>
-
-<<bc-misc.clisp>>
-
-<<bc-solve.clisp>>
-
<<br-con.clisp>>
<<br-data.clisp>>
@@ -1868,8 +1843,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
<<define.clisp>>
-<<format.clisp>>
-
<<fortcall.clisp>>
<<functor.clisp>>
@@ -1935,7 +1908,7 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp
<<warm.data.stanza>>
buildom.$(FASLEXT): buildom.boot sys-macros.$(FASLEXT)
- $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+ $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
<<DVI from pamphlet>>
diff --git a/src/interp/as.boot.pamphlet b/src/interp/as.boot.pamphlet
index 38c36548..d7a4cdc1 100644
--- a/src/interp/as.boot.pamphlet
+++ b/src/interp/as.boot.pamphlet
@@ -64,6 +64,9 @@ but was changed to:
<<*>>=
<<license>>
+import '"macros"
+)package "BOOT"
+
--global hash tables for new compiler
$docHash := MAKE_-HASH_-TABLE()
$conHash := MAKE_-HASH_-TABLE()
@@ -220,7 +223,7 @@ asGetExports(kind, conform, catform) ==
u := asCategoryParts(kind, conform, catform, true) or return nil
-- ensure that signatures are lists
[[op, sigpred] for [op,sig,:pred] in CDDR u] where
- sigpred ==
+ sigpred() ==
pred :=
pred = "T" => nil
pred
@@ -243,7 +246,7 @@ getAttributesFromCATEGORY catform ==
nil
displayDatabase x == main where
- main ==
+ main() ==
for y in
'(CONSTRUCTORFORM CONSTRUCTORKIND _
CONSTRUCTORMODEMAP _
@@ -257,9 +260,10 @@ displayDatabase x == main where
MODEMAPS _
SOURCEFILE _
DOCUMENTATION) repeat fn(x,y)
- fn(x,y) ==
- sayBrightly ['"----------------- ",y,'" --------------------"]
- pp GETDATABASE(x,y)
+ where
+ fn(x,y) ==
+ sayBrightly ['"----------------- ",y,'" --------------------"]
+ pp GETDATABASE(x,y)
-- For some reason Dick has modified as.boot to convert the
-- identifier |0| or |1| to an integer in the list of operations.
@@ -726,7 +730,7 @@ asyCosigType u ==
error false
asyAbbreviation(id,n) == chk(id,main) where --> n = number of arguments
- main ==
+ main() ==
a := createAbbreviation id => a
name := PNAME id
-- #name < 8 => INTERN UPCASE name
@@ -1134,7 +1138,7 @@ hput(table,name,value) ==
-- NB: This is categoryParts, but with the kind supplied by
-- an arguments
asCategoryParts(kind,conform,category,:options) == main where
- main ==
+ main() ==
cons? := IFCAR options --means to include constructors as well
$attrlist: local := nil
$oplist : local := nil
@@ -1149,31 +1153,32 @@ asCategoryParts(kind,conform,category,:options) == main where
tvl := TAKE(#rest conform,$TriangleVariableList)
res := SUBLISLIS($FormalMapVariableList,tvl,res)
res
- build(item,pred) ==
- item is ['SIGNATURE,op,sig,:.] => $oplist := [[opOf op,sig,:pred],:$oplist]
- --note: opOf is needed!!! Bug in compiler puts in (One) and (Zero)
- item is ['ATTRIBUTE,attr] =>
- constructor? opOf attr =>
- $conslist := [[attr,:pred],:$conslist]
- nil
- opOf attr = 'nothing => 'skip
- $attrlist := [[opOf attr,IFCDR attr,:pred],:$attrlist]
- item is ['TYPE,op,type] =>
- $oplist := [[op,[type],:pred],:$oplist]
- item is ['IF,pred1,s1,s2] =>
- build(s1,quickAnd(pred,pred1))
- s2 => build(s2,quickAnd(pred,['NOT,pred1]))
- item is ['PROGN,:r] => for x in r repeat build(x,pred)
- item in '(noBranch) => 'ok
- null item => 'ok
- systemError '"build error"
- exportsOf(target) ==
- target is ['CATEGORY,.,:r] => r
- target is ['Join,:r,f] =>
- for x in r repeat $conslist := [[x,:true],:$conslist]
- exportsOf f
- $conslist := [[target,:true],:$conslist]
- nil
+ where
+ build(item,pred) ==
+ item is ['SIGNATURE,op,sig,:.] => $oplist := [[opOf op,sig,:pred],:$oplist]
+ --note: opOf is needed!!! Bug in compiler puts in (One) and (Zero)
+ item is ['ATTRIBUTE,attr] =>
+ constructor? opOf attr =>
+ $conslist := [[attr,:pred],:$conslist]
+ nil
+ opOf attr = 'nothing => 'skip
+ $attrlist := [[opOf attr,IFCDR attr,:pred],:$attrlist]
+ item is ['TYPE,op,type] =>
+ $oplist := [[op,[type],:pred],:$oplist]
+ item is ['IF,pred1,s1,s2] =>
+ build(s1,quickAnd(pred,pred1))
+ s2 => build(s2,quickAnd(pred,['NOT,pred1]))
+ item is ['PROGN,:r] => for x in r repeat build(x,pred)
+ item in '(noBranch) => 'ok
+ null item => 'ok
+ systemError '"build error"
+ exportsOf(target) ==
+ target is ['CATEGORY,.,:r] => r
+ target is ['Join,:r,f] =>
+ for x in r repeat $conslist := [[x,:true],:$conslist]
+ exportsOf f
+ $conslist := [[target,:true],:$conslist]
+ nil
--============================================================================
-- Dead Code (for a very odd value of 'dead')
@@ -1201,7 +1206,7 @@ asyTypeJoinPartExport x ==
asyTypeJoinStack r ==
al := [[[x while r is [[x, :q],:s] and p = q and (r := s; true)],:p]
while r is [[.,:p],:.]]
- result := "append"/[fn for [y,:p] in al] where fn ==
+ result := "append"/[fn for [y,:p] in al] where fn() ==
p => [['IF,asyTypeMakePred p,:y]]
y
result
diff --git a/src/interp/ax.boot.pamphlet b/src/interp/ax.boot.pamphlet
index 2234b1eb..1063d366 100644
--- a/src/interp/ax.boot.pamphlet
+++ b/src/interp/ax.boot.pamphlet
@@ -107,6 +107,9 @@ axFormatPred pred ==
<<*>>=
<<license>>
+import '"as"
+)package "BOOT"
+
$stripTypes := false
$pretendFlag := false
$defaultFlag := false
@@ -298,7 +301,7 @@ axFormatOpList ops == ['Sequence,:[axFormatOp o for o in ops]]
axOpTran(name) ==
ATOM name =>
name = 'elt => 'apply
- name = 'setelt => 'set!
+ name = 'setelt => 'set_!
name = 'SEGMENT => ".."
name = 1 => '_1
name = 0 => '_0
diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot
index bf1d349c..64d6ffb9 100644
--- a/src/interp/bc-matrix.boot
+++ b/src/interp/bc-matrix.boot
@@ -30,6 +30,7 @@
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import '"bc-util"
)package "BOOT"
-- Basic Command matrix entry
diff --git a/src/interp/bc-misc.boot.pamphlet b/src/interp/bc-misc.boot.pamphlet
index 8e879add..776273a1 100644
--- a/src/interp/bc-misc.boot.pamphlet
+++ b/src/interp/bc-misc.boot.pamphlet
@@ -46,6 +46,9 @@
<<*>>=
<<license>>
+import '"bc-util"
+)package "BOOT"
+
--Hypertex commands other than solve and matrix
bcDrawIt2(ind,a,b) == STRCONC('"{}",ind,'"=",a,'"{}..",b,'"{}")
diff --git a/src/interp/bc-solve.boot.pamphlet b/src/interp/bc-solve.boot.pamphlet
index 56314441..78735cf1 100644
--- a/src/interp/bc-solve.boot.pamphlet
+++ b/src/interp/bc-solve.boot.pamphlet
@@ -46,6 +46,10 @@
<<*>>=
<<license>>
+import '"bc-matrix"
+import '"bc-misc"
+)package "BOOT"
+
-- HyperTeX basic Solve Command
$systemType := nil
$numberOfEquations := 0
@@ -343,7 +347,7 @@ finalExactRequest(equations,unknowns) ==
sayBrightly '" (3) more information on the meaning of the output"
tt := bcQueryInteger(1,3,true)
tt=1 => sayBrightly '"Bye Bye"
- tt=2 => moreExactSolution(equations,unknowns,flag)
+-- tt=2 => moreExactSolution(equations,unknowns,flag)
tt=3 => explainExact(equations,unknowns)
bcLinearSolveEqnsGen htPage ==
diff --git a/src/interp/bc-util.boot.pamphlet b/src/interp/bc-util.boot.pamphlet
index af732000..831563d6 100644
--- a/src/interp/bc-util.boot.pamphlet
+++ b/src/interp/bc-util.boot.pamphlet
@@ -46,6 +46,7 @@
<<*>>=
<<license>>
+import '"ht-util"
)package "BOOT"
bcFinish(name,arg,:args) == bcGen bcMkFunction(name,arg,args)
diff --git a/src/interp/clam.boot.pamphlet b/src/interp/clam.boot.pamphlet
index d811c00a..ea1679d2 100644
--- a/src/interp/clam.boot.pamphlet
+++ b/src/interp/clam.boot.pamphlet
@@ -434,7 +434,7 @@ clearHashReferenceCounts() ==
x.cacheType='hash_-table => CLRHASH eval x.cacheName
remHashEntriesWith0Count $hashTable ==
- MAPHASH(fn,$hashTable) where fn(key,obj) ==
+ MAPHASH(function fn,$hashTable) where fn(key,obj) ==
CAR obj = 0 => HREM($hashTable,key) --free store
nil
diff --git a/src/interp/format.boot.pamphlet b/src/interp/format.boot.pamphlet
index e4c83a31..5f8da182 100644
--- a/src/interp/format.boot.pamphlet
+++ b/src/interp/format.boot.pamphlet
@@ -46,6 +46,9 @@
<<*>>=
<<license>>
+import '"macros"
+)package "BOOT"
+
--% Functions for display formatting system objects
-- some of these are redundant and should be compacted
@@ -196,21 +199,22 @@ reportOpSymbol op1 ==
isFreeFunctionFromMm(mm) or isExposedConstructor getDomainFromMm(mm) => mmsE := [mm,:mmsE]
mmsU := [mm,:mmsU]
if mmsE then
- sayMms(op,mmsE,'"exposed") where
- sayMms(op,mms,label) ==
- m := # mms
- sayMSG
- m = 1 =>
- ['"There is one",:bright label,'"function called",
- :bright op,'":"]
- ['"There are ",m,:bright label,'"functions called",
- :bright op,'":"]
- for mm in mms for i in 1.. repeat
- sayModemapWithNumber(mm,i)
+ sayMms(op,mmsE,'"exposed")
if mmsU then
if mmsE then sayNewLine()
sayMms(op,mmsU,'"unexposed")
nil
+ where
+ sayMms(op,mms,label) ==
+ m := # mms
+ sayMSG
+ m = 1 =>
+ ['"There is one",:bright label,'"function called",
+ :bright op,'":"]
+ ['"There are ",m,:bright label,'"functions called",
+ :bright op,'":"]
+ for mm in mms for i in 1.. repeat
+ sayModemapWithNumber(mm,i)
formatOpType (form:=[op,:argl]) ==
null argl => unabbrev op
@@ -229,7 +233,7 @@ formatOperationAlistEntry (entry:= [op,:modemaps]) ==
formatOperation([[op,sig],.,[fn,.,n]],domain) ==
opSigString := formatOpSignature(op,sig)
- INTEGERP n and Undef = KAR domain.n =>
+ INTEGERP n and function Undef = KAR domain.n =>
if INTEGERP $commentedOps then $commentedOps := $commentedOps + 1
concat(" --",opSigString)
opSigString
@@ -505,7 +509,7 @@ formatJoinKey(r,key) ==
concat(opString,catString)
'"?? unknown mkCategory format ??"
-- otherwise we have the CATEGORY form
- "append"/[fn for x in r] where fn ==
+ "append"/[fn for x in r] where fn() ==
x is ['SIGNATURE,op,sig] => concat("%l",formatOpSignature(op,sig))
x is ['ATTRIBUTE,a] => concat("%l",formatAttribute a)
x
@@ -544,16 +548,17 @@ tuple2String argl ==
then string := STRCONC('"_"",string,'"_"")
else string :=
ATOM string => object2String string
- [f x for x in string] where
- f x ==
- ATOM x => object2String x
- -- [f CAR x,:f CDR x]
- [f y for y in x]
+ [f x for x in string]
for x in rest argl repeat
if x in '("failed" "nil" "prime" "sqfr" "irred") then
x := STRCONC('"_"",x,'"_"")
string:= concat(string,concat(",",f x))
string
+ where
+ f x ==
+ ATOM x => object2String x
+ -- [f CAR x,:f CDR x]
+ [f y for y in x]
script2String s ==
null s => '"" -- just to be safe
diff --git a/src/interp/g-util.boot.pamphlet b/src/interp/g-util.boot.pamphlet
index fc247aee..1b5b9f38 100644
--- a/src/interp/g-util.boot.pamphlet
+++ b/src/interp/g-util.boot.pamphlet
@@ -230,7 +230,7 @@ freeOfSharpVars x ==
listOfSharpVars x ==
atom x => (isSharpVarWithNum x => LIST x; nil)
- setUnion(listOfSharpVars first x,listOfSharpVars rest x)
+ union(listOfSharpVars first x,listOfSharpVars rest x)
listOfPatternIds x ==
isPatternVar x => [x]
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index bc9908ac..2a182dba 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -176,7 +176,6 @@
(SETQ $MARGIN 3)
(SETQ *TALLPAR NIL)
(SETQ ALLSTAR NIL)
-(SETQ BLANK " ")
(SETQ COLON ":")
(SETQ COMMA ",")
(SETQ DASH "-")
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index b1735557..c2008754 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -489,7 +489,6 @@
(defvar LITTLEI '|i|)
(defvar *TALLPAR NIL)
(defvar ALLSTAR NIL)
-(defvar BLANK " ")
(defvar PLUSS "+")
(defvar PERIOD ".")
(defvar SLASH "/")
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index 7e15b01f..adca0eca 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -578,3 +578,6 @@ _*ATTRIBUTES_* ==
additiveValuation unitsKnown canonicalUnitNormal
multiplicativeValuation finiteAggregate shallowlyMutable
commutative)
+
++++
+BLANK == '" "
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 10:48:36 +0000