aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/interp/Makefile.in16
-rw-r--r--src/interp/Makefile.pamphlet45
-rw-r--r--src/interp/topics.boot16
4 files changed, 28 insertions, 53 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a9234d23..d4ac5bc8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2008-08-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/Makefile.pamphlet: Move warm.data.stanza to topics.boot.
+
+2008-08-11 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/obey.lisp: Remove.
* interp/Makefile.pamphlet (OBJS): Don't include obey.$(FASLEXT).
* interp/br-data.boot: Replace OBEY with runCommand.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index f0a8c728..0f4f7bc9 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -191,8 +191,7 @@ makeint.lisp: $(OBJS) ${OUTINTERP} \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${TRANOBJS} \
$(axiom_targetdir)/algebra/exposed.$(FASLEXT) \
- $(axiom_src_docdir)/msgs/s2-us.msgs \
- ../algebra/warm.data
+ $(axiom_src_docdir)/msgs/s2-us.msgs
@ echo 5 invoking make in `pwd` with parms:
@rm -f makeint.lisp
$(mkdir_p) $(axiom_target_datadir)/msgs
@@ -219,13 +218,11 @@ makeint.lisp: $(OBJS) ${OUTINTERP} \
@ echo '(in-package "BOOT")' >> makeint.lisp
@ touch ${TIMESTAMP}
@ echo '${YEARWEEK}' >> makeint.lisp
- @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
- @ echo '(in-package "BOOT")' >> makeint.lisp
- @ echo '(load "../algebra/warm.data")' >> makeint.lisp
- @ echo '(boot::|clearClams|)' >> makeint.lisp
+ @ echo '(build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
+ @ echo '(|clearClams|)' >> makeint.lisp
@ echo '#+:akcl (setq compiler::*suppress-compiler-notes* t)' >> makeint.lisp
@ echo '#+:akcl (si::gbc-time 0)' >> makeint.lisp
- @ echo '#+:GCL (gbc t)' >> makeint.lisp
+ @ echo '#+:GCL (si::gbc t)' >> makeint.lisp
${SAVESYS}: makeint.lisp
$(BOOTSYS) -- --system="$(AXIOM)/" \
@@ -460,11 +457,6 @@ sys-os.$(FASLEXT): types.$(FASLEXT) cfuns.$(FASLEXT)
types.$(FASLEXT): boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
-../algebra/warm.data: $(srcdir)/Makefile.pamphlet
- @ echo 2 building warm.data
- $(axiom_build_document) --tangle=warm.data --output=$@ $<
-
-
$(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex
@cp -p $< $@
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 3bd00794..4bfe1af0 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -311,38 +311,6 @@ exist.
@
-\section{The warm.data file}
-
-This is a file of commands that will be loaded into interpsys
-at the last minute. It execute functions that will likely be
-used in a running system so all of the required routines will
-be in the lisp image thus minimizing their startup time.
-<<warm.data.stanza>>=
-../algebra/warm.data: $(srcdir)/Makefile.pamphlet
- @ echo 2 building warm.data
- $(axiom_build_document) --tangle=warm.data --output=$@ $<
-
-@
-
-<<warm.data>>=
-(in-package "BOOT")
-(defparameter |$topicHash| (make-hash-table))
-(setf (gethash '|basic| |$topicHash|) 2)
-(setf (gethash '|algebraic| |$topicHash|) 4)
-(setf (gethash '|miscellaneous| |$topicHash|) 13)
-(setf (gethash '|extraction| |$topicHash|) 6)
-(setf (gethash '|conversion| |$topicHash|) 7)
-(setf (gethash '|hidden| |$topicHash|) 3)
-(setf (gethash '|extended| |$topicHash|) 1)
-(setf (gethash '|destructive| |$topicHash|) 5)
-(setf (gethash '|transformation| |$topicHash|) 10)
-(setf (gethash '|hyperbolic| |$topicHash|) 12)
-(setf (gethash '|construct| |$topicHash|) 9)
-(setf (gethash '|predicate| |$topicHash|) 8)
-(setf (gethash '|trignometric| |$topicHash|) 11)
-
-@
-
\section{UNUSED}
These files were in the interp distribution from NAG but have
@@ -377,8 +345,7 @@ makeint.lisp: $(OBJS) ${OUTINTERP} \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${TRANOBJS} \
$(axiom_targetdir)/algebra/exposed.$(FASLEXT) \
- $(axiom_src_docdir)/msgs/s2-us.msgs \
- ../algebra/warm.data
+ $(axiom_src_docdir)/msgs/s2-us.msgs
@ echo 5 invoking make in `pwd` with parms:
@rm -f makeint.lisp
$(mkdir_p) $(axiom_target_datadir)/msgs
@@ -405,13 +372,11 @@ makeint.lisp: $(OBJS) ${OUTINTERP} \
@ echo '(in-package "BOOT")' >> makeint.lisp
@ touch ${TIMESTAMP}
@ echo '${YEARWEEK}' >> makeint.lisp
- @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
- @ echo '(in-package "BOOT")' >> makeint.lisp
- @ echo '(load "../algebra/warm.data")' >> makeint.lisp
- @ echo '(boot::|clearClams|)' >> makeint.lisp
+ @ echo '(build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))))' >> makeint.lisp
+ @ echo '(|clearClams|)' >> makeint.lisp
@ echo '#+:akcl (setq compiler::*suppress-compiler-notes* t)' >> makeint.lisp
@ echo '#+:akcl (si::gbc-time 0)' >> makeint.lisp
- @ echo '#+:GCL (gbc t)' >> makeint.lisp
+ @ echo '#+:GCL (si::gbc t)' >> makeint.lisp
${SAVESYS}: makeint.lisp
$(BOOTSYS) -- --system="$(AXIOM)/" \
@@ -741,8 +706,6 @@ sys-os.$(FASLEXT): types.$(FASLEXT) cfuns.$(FASLEXT)
types.$(FASLEXT): boot-pkg.$(FASLEXT)
boot-pkg.$(FASLEXT): boot-pkg.lisp
-<<warm.data.stanza>>
-
<<DVI from pamphlet>>
@
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index 663970a9..afda0b98 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -64,6 +64,22 @@ $topicSynonyms := '(
$groupAssoc := '((extended . 1) (basic . 2) (hidden . 4))
+$topicHash := MAKE_-HASHTABLE "ID"
+SETF(GETHASH("basic",$topicHash),2)
+SETF(GETHASH("algebraic",$topicHash),4)
+SETF(GETHASH("miscellaneous",$topicHash),13)
+SETF(GETHASH("extraction",$topicHash),6)
+SETF(GETHASH("conversion",$topicHash),7)
+SETF(GETHASH("hidden",$topicHash),3)
+SETF(GETHASH("extended",$topicHash),1)
+SETF(GETHASH("destructive",$topicHash),5)
+SETF(GETHASH("transformation",$topicHash),10)
+SETF(GETHASH("hyperbolic",$topicHash),12)
+SETF(GETHASH("construct",$topicHash),9)
+SETF(GETHASH("predicate",$topicHash),8)
+SETF(GETHASH("trignometric",$topicHash),11)
+
+
--=======================================================================
-- Create Hashtable of Operation Properties
--=======================================================================
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-01 16:33:15 +0000