aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/interp/ChangeLog26
-rw-r--r--src/interp/Makefile.in57
-rw-r--r--src/interp/Makefile.pamphlet57
-rw-r--r--src/interp/bootlex.lisp2
-rw-r--r--src/interp/compiler.boot.pamphlet2
-rw-r--r--src/interp/daase.lisp.pamphlet4
-rw-r--r--src/interp/util.lisp.pamphlet111
7 files changed, 87 insertions, 172 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index dafb881e..16ab6fa7 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,31 @@
2007-09-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ Fix SF/1792002
+ * util.lisp.pamphlet (build-interpsys): Lose parse-files,
+ comp-files and browse-files parameters. Don't set AutoLoad
+ properties for those files anymore.
+ (parse-functions): Remove definition.
+ (comp-functions): Likewise.
+ (browse-functions): Likewise.
+ (|tr|): Don't call |oldCompilerAutoloadOnceTrigger| and
+ |browserAutloadOnceTrigger| anymore.
+ * daase.lisp.pamphlet (make-databases): Don't call
+ |oldCompilerAutoloadOnceTrigger| anymore.
+ * compiler.boot.pamphlet (compileSpad2Cmd): Don't call
+ oldParserAutoloadOnceTrigger anymore.
+ * bootlex.lisp (|oldParserAutoloadOnceTrigger|): Remove.
+ * Makefile.pamphlet (OBJS): Include $(OPOBJS), $(OCOBJS) and
+ $(BROBJS).
+ (OPOBJS): Objects are not in autoload directory anymore.
+ (OCOBJS): Likewise.
+ (BROBJS): Likewise.
+ (makeint.lisp): Remove explicit dependency on $(OCOBJS), $(OPOBJS)
+ and $(BROBJS). Don't call build-interpsys with those arguments
+ anymore.
+ * Makefile.in: Regenerate.
+
+2007-09-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* i-spec1.boot.pamphlet (mkAndApplyZippedPredicates): Fix typo.
(mkIterZippedFun): Use indexList, not the global $indexVars.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 84eb57ba..2e94d9af 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -104,7 +104,10 @@ OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \
template.$(FASLEXT) termrw.$(FASLEXT) \
trace.$(FASLEXT) \
union.$(FASLEXT) daase.$(FASLEXT) \
- fortcall.$(FASLEXT)
+ fortcall.$(FASLEXT) \
+ $(OPOBJS) \
+ $(OCOBJS) \
+ $(BROBJS)
interpsys_modules = $(patsubst %.$(FASLEXT), "%", $(OBJS))
@@ -145,35 +148,35 @@ INOBJS= varini.$(FASLEXT) \
IN_modules = $(patsubst %.$(FASLEXT), "%", $(INOBJS))
# These are autloaded old parser files
-OPOBJS= ${AUTO}/parsing.$(FASLEXT) ${AUTO}/bootlex.$(FASLEXT) \
- ${AUTO}/def.$(FASLEXT) \
- ${AUTO}/fnewmeta.$(FASLEXT) ${AUTO}/metalex.$(FASLEXT) \
- ${AUTO}/parse.$(FASLEXT) ${AUTO}/postpar.$(FASLEXT) \
- ${AUTO}/postprop.$(FASLEXT) ${AUTO}/preparse.$(FASLEXT)
+OPOBJS= parsing.$(FASLEXT) bootlex.$(FASLEXT) \
+ def.$(FASLEXT) \
+ fnewmeta.$(FASLEXT) metalex.$(FASLEXT) \
+ parse.$(FASLEXT) postpar.$(FASLEXT) \
+ postprop.$(FASLEXT) preparse.$(FASLEXT)
autoload_objects += $(OPBJS)
-OCOBJS= ${AUTO}/apply.$(FASLEXT) ${AUTO}/c-doc.$(FASLEXT) \
- ${AUTO}/c-util.$(FASLEXT) ${AUTO}/profile.$(FASLEXT) \
- ${AUTO}/category.$(FASLEXT) ${AUTO}/compiler.$(FASLEXT) \
- ${AUTO}/define.$(FASLEXT) ${AUTO}/functor.$(FASLEXT) \
- ${AUTO}/info.$(FASLEXT) ${AUTO}/iterator.$(FASLEXT) \
- ${AUTO}/modemap.$(FASLEXT) ${AUTO}/nruncomp.$(FASLEXT) \
- ${AUTO}/package.$(FASLEXT) ${AUTO}/htcheck.$(FASLEXT) \
- ${AUTO}/xruncomp.$(FASLEXT)
+OCOBJS= apply.$(FASLEXT) c-doc.$(FASLEXT) \
+ c-util.$(FASLEXT) profile.$(FASLEXT) \
+ category.$(FASLEXT) compiler.$(FASLEXT) \
+ define.$(FASLEXT) functor.$(FASLEXT) \
+ info.$(FASLEXT) iterator.$(FASLEXT) \
+ modemap.$(FASLEXT) nruncomp.$(FASLEXT) \
+ package.$(FASLEXT) htcheck.$(FASLEXT) \
+ xruncomp.$(FASLEXT)
autoload_objects += $(OCOBJS)
-BROBJS= ${AUTO}/bc-matrix.$(FASLEXT) \
- ${AUTO}/bc-misc.$(FASLEXT) ${AUTO}/bc-solve.$(FASLEXT) \
- ${AUTO}/bc-util.$(FASLEXT) \
- ${AUTO}/ht-util.$(FASLEXT) ${AUTO}/htsetvar.$(FASLEXT) \
- ${AUTO}/ht-root.$(FASLEXT) \
- ${AUTO}/br-con.$(FASLEXT) \
- ${AUTO}/br-data.$(FASLEXT) ${AUTO}/showimp.$(FASLEXT) \
- ${AUTO}/br-op1.$(FASLEXT) ${AUTO}/br-op2.$(FASLEXT) \
- ${AUTO}/br-search.$(FASLEXT) ${AUTO}/br-util.$(FASLEXT) \
- ${AUTO}/topics.$(FASLEXT) ${AUTO}/br-prof.$(FASLEXT) \
- ${AUTO}/br-saturn.$(FASLEXT)
+BROBJS= bc-matrix.$(FASLEXT) \
+ bc-misc.$(FASLEXT) bc-solve.$(FASLEXT) \
+ bc-util.$(FASLEXT) \
+ ht-util.$(FASLEXT) htsetvar.$(FASLEXT) \
+ ht-root.$(FASLEXT) \
+ br-con.$(FASLEXT) \
+ br-data.$(FASLEXT) showimp.$(FASLEXT) \
+ br-op1.$(FASLEXT) br-op2.$(FASLEXT) \
+ br-search.$(FASLEXT) br-util.$(FASLEXT) \
+ topics.$(FASLEXT) br-prof.$(FASLEXT) \
+ br-saturn.$(FASLEXT)
autoload_objects += $(BFOBJS)
@@ -275,7 +278,7 @@ distclean-local: clean-local
makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
nocompil.lisp \
- ${OUTINTERP} ${OCOBJS} ${OPOBJS} ${BROBJS} obey.$(FASLEXT) \
+ ${OUTINTERP} obey.$(FASLEXT) \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${NAGBROBJS} ${TRANOBJS} \
${LOADSYS} \
@@ -296,7 +299,7 @@ makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
@ 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 %, "%", ${OPOBJS}))) (quote ($(patsubst %, "%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
+ @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
@ echo '(boot::set-restart-hook)' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ echo '(load "../algebra/warm.data")' >> makeint.lisp
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index ee4eb038..248f0905 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -377,7 +377,10 @@ OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \
template.$(FASLEXT) termrw.$(FASLEXT) \
trace.$(FASLEXT) \
union.$(FASLEXT) daase.$(FASLEXT) \
- fortcall.$(FASLEXT)
+ fortcall.$(FASLEXT) \
+ $(OPOBJS) \
+ $(OCOBJS) \
+ $(BROBJS)
interpsys_modules = $(patsubst %.$(FASLEXT), "%", $(OBJS))
@@ -452,11 +455,11 @@ rethinking.
<<environment>>=
# These are autloaded old parser files
-OPOBJS= ${AUTO}/parsing.$(FASLEXT) ${AUTO}/bootlex.$(FASLEXT) \
- ${AUTO}/def.$(FASLEXT) \
- ${AUTO}/fnewmeta.$(FASLEXT) ${AUTO}/metalex.$(FASLEXT) \
- ${AUTO}/parse.$(FASLEXT) ${AUTO}/postpar.$(FASLEXT) \
- ${AUTO}/postprop.$(FASLEXT) ${AUTO}/preparse.$(FASLEXT)
+OPOBJS= parsing.$(FASLEXT) bootlex.$(FASLEXT) \
+ def.$(FASLEXT) \
+ fnewmeta.$(FASLEXT) metalex.$(FASLEXT) \
+ parse.$(FASLEXT) postpar.$(FASLEXT) \
+ postprop.$(FASLEXT) preparse.$(FASLEXT)
autoload_objects += $(OPBJS)
@
@@ -464,14 +467,14 @@ autoload_objects += $(OPBJS)
The {\bf OCOBJS} list contains files from the old compiler. Again,
``old'' is meaningless. These files should probably be autoloaded.
<<environment>>=
-OCOBJS= ${AUTO}/apply.$(FASLEXT) ${AUTO}/c-doc.$(FASLEXT) \
- ${AUTO}/c-util.$(FASLEXT) ${AUTO}/profile.$(FASLEXT) \
- ${AUTO}/category.$(FASLEXT) ${AUTO}/compiler.$(FASLEXT) \
- ${AUTO}/define.$(FASLEXT) ${AUTO}/functor.$(FASLEXT) \
- ${AUTO}/info.$(FASLEXT) ${AUTO}/iterator.$(FASLEXT) \
- ${AUTO}/modemap.$(FASLEXT) ${AUTO}/nruncomp.$(FASLEXT) \
- ${AUTO}/package.$(FASLEXT) ${AUTO}/htcheck.$(FASLEXT) \
- ${AUTO}/xruncomp.$(FASLEXT)
+OCOBJS= apply.$(FASLEXT) c-doc.$(FASLEXT) \
+ c-util.$(FASLEXT) profile.$(FASLEXT) \
+ category.$(FASLEXT) compiler.$(FASLEXT) \
+ define.$(FASLEXT) functor.$(FASLEXT) \
+ info.$(FASLEXT) iterator.$(FASLEXT) \
+ modemap.$(FASLEXT) nruncomp.$(FASLEXT) \
+ package.$(FASLEXT) htcheck.$(FASLEXT) \
+ xruncomp.$(FASLEXT)
autoload_objects += $(OCOBJS)
@@ -480,17 +483,17 @@ autoload_objects += $(OCOBJS)
The {\bf BROBJS} list contains files only used by the hypertex
browser. These files should probably be autoloaded.
<<environment>>=
-BROBJS= ${AUTO}/bc-matrix.$(FASLEXT) \
- ${AUTO}/bc-misc.$(FASLEXT) ${AUTO}/bc-solve.$(FASLEXT) \
- ${AUTO}/bc-util.$(FASLEXT) \
- ${AUTO}/ht-util.$(FASLEXT) ${AUTO}/htsetvar.$(FASLEXT) \
- ${AUTO}/ht-root.$(FASLEXT) \
- ${AUTO}/br-con.$(FASLEXT) \
- ${AUTO}/br-data.$(FASLEXT) ${AUTO}/showimp.$(FASLEXT) \
- ${AUTO}/br-op1.$(FASLEXT) ${AUTO}/br-op2.$(FASLEXT) \
- ${AUTO}/br-search.$(FASLEXT) ${AUTO}/br-util.$(FASLEXT) \
- ${AUTO}/topics.$(FASLEXT) ${AUTO}/br-prof.$(FASLEXT) \
- ${AUTO}/br-saturn.$(FASLEXT)
+BROBJS= bc-matrix.$(FASLEXT) \
+ bc-misc.$(FASLEXT) bc-solve.$(FASLEXT) \
+ bc-util.$(FASLEXT) \
+ ht-util.$(FASLEXT) htsetvar.$(FASLEXT) \
+ ht-root.$(FASLEXT) \
+ br-con.$(FASLEXT) \
+ br-data.$(FASLEXT) showimp.$(FASLEXT) \
+ br-op1.$(FASLEXT) br-op2.$(FASLEXT) \
+ br-search.$(FASLEXT) br-util.$(FASLEXT) \
+ topics.$(FASLEXT) br-prof.$(FASLEXT) \
+ br-saturn.$(FASLEXT)
autoload_objects += $(BFOBJS)
@@ -1100,7 +1103,7 @@ Doing otherwise causes havoc.
<<savesys>>=
makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
nocompil.lisp \
- ${OUTINTERP} ${OCOBJS} ${OPOBJS} ${BROBJS} obey.$(FASLEXT) \
+ ${OUTINTERP} obey.$(FASLEXT) \
database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
${NAGBROBJS} ${TRANOBJS} \
${LOADSYS} \
@@ -1121,7 +1124,7 @@ makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
@ 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 %, "%", ${OPOBJS}))) (quote ($(patsubst %, "%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
+ @ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO}))) "${AXIOM}")' >> makeint.lisp
@ echo '(boot::set-restart-hook)' >> makeint.lisp
@ echo '(in-package "BOOT")' >> makeint.lisp
@ echo '(load "../algebra/warm.data")' >> makeint.lisp
diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp
index 04c934fe..6b1d67ad 100644
--- a/src/interp/bootlex.lisp
+++ b/src/interp/bootlex.lisp
@@ -75,8 +75,6 @@
(initialize-preparse *terminal-io*)
(,(intern (strconc "PARSE-" x)) . ,y)))
-(defun |oldParserAutoloadOnceTrigger| () nil)
-
(defun print-defun (name body)
(let* ((sp (assoc 'compiler-output-stream optionlist))
(st (if sp (cdr sp) *standard-output*)))
diff --git a/src/interp/compiler.boot.pamphlet b/src/interp/compiler.boot.pamphlet
index 0e7d60db..175eff35 100644
--- a/src/interp/compiler.boot.pamphlet
+++ b/src/interp/compiler.boot.pamphlet
@@ -1380,8 +1380,6 @@ compileSpad2Cmd args ==
$InteractiveMode : local := nil
if translateOldToNew then
- oldParserAutoloadOnceTrigger()
- browserAutoloadOnceTrigger()
spad2AsTranslatorAutoloadOnceTrigger()
sayKeyedMsg("S2IZ0085", nil)
convertSpadToAsFile path
diff --git a/src/interp/daase.lisp.pamphlet b/src/interp/daase.lisp.pamphlet
index 80247f48..ed192038 100644
--- a/src/interp/daase.lisp.pamphlet
+++ b/src/interp/daase.lisp.pamphlet
@@ -1193,10 +1193,6 @@ database.
(format nil "./~a"
dir)))))
'make-database))
-;browse.daase
-#+:AKCL (load (concatenate 'string (|getEnv| "AXIOM") "/autoload/topics")) ;; hack
- (|oldCompilerAutoloadOnceTrigger|)
- (|browserAutoloadOnceTrigger|)
#+:AKCL (|mkTopicHashTable|)
(setq |$constructorList| nil) ;; affects buildLibdb
(|buildLibdb|)
diff --git a/src/interp/util.lisp.pamphlet b/src/interp/util.lisp.pamphlet
index da707ab2..51564c35 100644
--- a/src/interp/util.lisp.pamphlet
+++ b/src/interp/util.lisp.pamphlet
@@ -101,7 +101,7 @@ it loads all of the named files, resets a few global state variables,
loads the databases, sets up autoload triggers and clears out hash tables.
After this function is called the image is clean and can be saved.
<<build-interpsys>>=
-(defun build-interpsys (load-files parse-files comp-files browse-files
+(defun build-interpsys (load-files
translate-files nagbr-files asauto-files spad)
(initroot spad)
#+:AKCL
@@ -120,9 +120,6 @@ After this function is called the image is clean and can be saved.
#+:CCL
(resethashtables)
(setq *load-verbose* nil)
- (|setBootAutloadProperties| comp-functions comp-files)
- (|setBootAutloadProperties| parse-functions parse-files)
- (|setBootAutloadProperties| browse-functions browse-files)
(|setBootAutloadProperties| translate-functions translate-files)
(|setNAGBootAutloadProperties| nagbr-functions nagbr-files)
(|setBootAutloadProperties| asauto-functions asauto-files)
@@ -357,107 +354,6 @@ the chapter name.
@
-\subsubsection{parse-functions}
-
-This is the {\bf boot parser} subsystem. It is only needed by
-developers who translate boot code to Common Lisp.
-<<parse-functions>>=
-(setq parse-functions
- '(
-;; loadparser
- |oldParserAutoloadOnceTrigger|
- |PARSE-Expression|
- boot-parse-1
- BOOT
- SPAD
- init-boot/spad-reader))
-
-@
-
-\subsubsection{comp-functions}
-
-This is the {\bf spad compiler} subsystem. It is only needed by
-developers who write or modify algebra code.
-<<comp-functions>>=
-(setq comp-functions
- '(
-;; loadcompiler
- |oldCompilerAutoloadOnceTrigger|
- |compileSpad2Cmd|
- |convertSpadToAsFile|
- |compilerDoit|
- |compilerDoitWithScreenedLisplib|
- |mkCategory|
- |cons5|
- |sublisV|))
-
-@
-
-\subsubsection{browse-functions}
-
-This is the {\bf browser} subsystem. It will get autoloaded only
-if you use the browse function of the {\bf hypertex} system.
-<<browse-functions>>=
-(setq browse-functions
- '(
-;; loadbrowse
- |browserAutoloadOnceTrigger|
- |parentsOf| ;interop.boot
- |getParentsFor| ;old compiler
- |folks| ;for astran
- |extendLocalLibdb| ;)lib needs this
- |oSearch|
- |aokSearch|
- |kSearch|
- |aSearch|
- |genSearch|
- |docSearch|
- |abSearch|
- |detailedSearch|
- |ancestorsOf|
- |aPage|
- |dbGetOrigin|
- |dbGetParams|
- |dbGetKindString|
- |dbGetOrigin|
- |dbComments|
- |grepConstruct|
- |buildLibdb|
- |bcDefiniteIntegrate|
- |bcDifferentiate|
- |bcDraw|
- |bcExpand|
- |bcIndefiniteIntegrate|
- |bcLimit|
- |bcMatrix|
- |bcProduct|
- |bcSeries|
- |bcSolve|
- |bcSum|
- |cSearch|
- |conPage|
- |dbName|
- |dbPart|
- |extendLocalLibdb|
- |form2HtString|
- |htGloss|
- |htGreekSearch|
- |htHistory|
- |htSystemCommands|
- |htSystemVariables|
- |htTextSearch|
- |htTutorialSearch|
- |htUserVariables|
- |htsv|
- |oPage|
- |oPageFrom|
- |spadSys|
- |spadType|
- |syscomPage|
- |unescapeStringsInForm|))
-
-@
-
\subsubsection{translate-functions}
This is a little used subsystem to generate {\bf ALDOR} code
@@ -1590,9 +1486,6 @@ function assumes that \\ can only appear as first character of name.
(in-package "BOOT")
-<<parse-functions>>
-<<comp-functions>>
-<<browse-functions>>
<<translate-functions>>
<<asauto-functions>>
<<debug-functions>>
@@ -1667,8 +1560,6 @@ function assumes that \\ can only appear as first character of name.
(in-package "BOOT")
(defun |tr| (fn)
- (|oldCompilerAutoloadOnceTrigger|)
- (|browserAutoloadOnceTrigger|)
(|spad2AsTranslatorAutoloadOnceTrigger|)
(|convertSpadFile| fn) )
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 19:11:02 +0000