diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | Makefile.pamphlet | 4 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 7 | ||||
| -rw-r--r-- | src/Makefile.pamphlet | 13 | ||||
| -rw-r--r-- | src/interp/ChangeLog | 9 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 29 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 326 | ||||
| -rw-r--r-- | src/interp/macros.lisp | 6 | ||||
| -rw-r--r-- | src/interp/util.lisp | 32 |
14 files changed, 47 insertions, 414 deletions
@@ -1,3 +1,7 @@ +2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove all-depsys rule. + 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: Tidy. Don't instantiate src/lisp/core.lisp. diff --git a/Makefile.in b/Makefile.in index 4d6bb68a..c04254c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ build_srcdir = $(builddir)/src AXIOM_SRC_TARGETS = all-algebra all-asq all-axiomsys all-book all-boot \ all-clef all-doc all-graph all-hyper all-input all-interpsys \ - all-lib all-lisp all-sman all-src all-depsys + all-lib all-lisp all-sman all-src .PHONY: all $(AXIOM_SRC_TARGETS) all: all-ax @@ -27,7 +27,7 @@ all-ax: all-src all-src: stamp-rootdirs @axiom_all_prerequisites@ ifeq ($(strip $(axiom_include_gcl)),yes) -all-boot all-lisp all-depsys all-interpsys all-axiomsys \ +all-boot all-lisp all-interpsys all-axiomsys \ all-algebra all-input: all-gcl endif diff --git a/Makefile.pamphlet b/Makefile.pamphlet index ea55f2a3..7892605c 100644 --- a/Makefile.pamphlet +++ b/Makefile.pamphlet @@ -320,7 +320,7 @@ build_srcdir = $(builddir)/src AXIOM_SRC_TARGETS = all-algebra all-asq all-axiomsys all-book all-boot \ all-clef all-doc all-graph all-hyper all-input all-interpsys \ - all-lib all-lisp all-sman all-src all-depsys + all-lib all-lisp all-sman all-src .PHONY: all $(AXIOM_SRC_TARGETS) all: all-ax @@ -331,7 +331,7 @@ all-ax: all-src all-src: stamp-rootdirs @axiom_all_prerequisites@ ifeq ($(strip $(axiom_include_gcl)),yes) -all-boot all-lisp all-depsys all-interpsys all-axiomsys \ +all-boot all-lisp all-interpsys all-axiomsys \ all-algebra all-input: all-gcl endif @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-24. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.1.0-2007-11-25. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.1.0-2007-11-24' -PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-24' +PACKAGE_VERSION='1.1.0-2007-11-25' +PACKAGE_STRING='OpenAxiom 1.1.0-2007-11-25' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1388,7 +1388,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.1.0-2007-11-24 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.1.0-2007-11-25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-24:";; + short | recursive ) echo "Configuration of OpenAxiom 1.1.0-2007-11-25:";; esac cat <<\_ACEOF @@ -1562,7 +1562,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.1.0-2007-11-24 +OpenAxiom configure 1.1.0-2007-11-25 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1576,7 +1576,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.1.0-2007-11-24, which was +It was created by OpenAxiom $as_me 1.1.0-2007-11-25, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25198,7 +25198,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.1.0-2007-11-24, which was +This file was extended by OpenAxiom $as_me 1.1.0-2007-11-25, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25247,7 +25247,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.1.0-2007-11-24 +OpenAxiom config.status 1.1.0-2007-11-25 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 56c278d0..09fcce2a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.1.0-2007-11-24], +AC_INIT([OpenAxiom], [1.1.0-2007-11-25], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index eacc33a4..7ecde40d 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1010,7 +1010,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.1.0-2007-11-24], +AC_INIT([OpenAxiom], [1.1.0-2007-11-25], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index f760fad5..bbd67531 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove all-depsys rule. + (all-interpsys): Now depend on all-boot. + 2007-09-19 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (all-interpsys): Now depend on all-depsys. diff --git a/src/Makefile.in b/src/Makefile.in index 2f309a78..0ab6dd64 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,13 +40,10 @@ all-lisp: all-lib cd lisp && $(MAKE) all-lisp all-boot: all-lisp @cd boot && $(MAKE) $@ -all-depsys: all-boot - cd interp && $(MAKE) all-depsys - ifeq (@axiom_use_x@,yes) -all-interpsys: all-depsys all-hyper +all-interpsys: all-boot all-hyper else -all-interpsys: all-depsys +all-interpsys: all-boot endif cd interp && ${MAKE} all-interpsys diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet index b6514576..f7cb6918 100644 --- a/src/Makefile.pamphlet +++ b/src/Makefile.pamphlet @@ -133,18 +133,13 @@ all-boot: all-lisp \subsection{The \File{interp/} directory} -Once \Tool{bootsys} exists we need to build \Tool{depsys} -and \Tool{interpsys}. Since these two images share a lot of -files they are built in the interp subdirectory using the -same Makefile. +Once \Tool{bootsys} exists we need to build +\Tool{interpsys}. <<interpdir>>= -all-depsys: all-boot - cd interp && $(MAKE) all-depsys - ifeq (@axiom_use_x@,yes) -all-interpsys: all-depsys all-hyper +all-interpsys: all-boot all-hyper else -all-interpsys: all-depsys +all-interpsys: all-boot endif cd interp && ${MAKE} all-interpsys diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 09c52220..a5b6346f 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,5 +1,14 @@ 2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + Remove depsys from OpenAxiom. + * Makefile.pamphlet: Remove references to depsys. + * macros.lisp (BRIGHPRINT): Remove. + (BRIGHPRINT-0): Likewise. + * util.lisp (build-depsys): Likewise. + (processSynonyms): Likewise. + +2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + * Makefile.pamphlet (util.$(FASLEXT)): Move down. (bookvol5.$(FASLEXT)): Likewise. (<<depsys>>): Don't extract. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 0653e16f..29a708b9 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -4,28 +4,16 @@ subdir = src/interp/ IN=$(srcdir) DOC=$(axiom_target_docdir)/src/interp BOOK=$(axiom_target_docdir) - -# Command to translate Boot to Common Lisp -BOOT_TO_LISP = $(BOOTSYS) -- --translate --output=$@ $< - -# Command to translate Common Lisp to native object code -COMPILE_LISP = $(DEPSYS) -- --compile --output=$@ $< AUTO=$(axiom_targetdir)/autoload autoload_objects = # Build platform-dependent Lisp image, at the base of other -# derived Lisp images (depsys, interpsys, AXIOMsys) +# derived Lisp images (interpsys, AXIOMsys) LISPSYS= $(axiom_build_bindir)/lisp BOOTSYS= $(axiom_build_bindir)/bootsys -DEPSYS = ./depsys -DEP= $(srcdir)/spaderror.lisp $(srcdir)/debug.lisp \ - $(srcdir)/spad.lisp \ - $(srcdir)/setq.lisp $(srcdir)/property.lisp \ - $(srcdir)/unlisp.lisp $(srcdir)/foam_l.lisp \ - $(srcdir)/axext_l.lisp LOADSYS= $(axiom_build_bindir)/lisp$(EXEEXT) SAVESYS= interpsys$(EXEEXT) AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT) @@ -161,7 +149,6 @@ YEARWEEK=(progn (setq boot::timestamp "${TIMESTAMP}") \ (boot::yearweek)) -.PRECIOUS: ${DEPSYS} .PRECIOUS: ${SAVESYS} .PRECIOUS: ${AXIOMSYS} @@ -175,7 +162,7 @@ UNUSED= ${DOC}/anna.boot.dvi ${DOC}/construc.lisp.dvi \ .SUFFIXES: .SUFFIXES: .boot .clisp .lisp .pamphlet -.PHONY: all all-ax all-depsys all-interpsys all-axiomsys +.PHONY: all all-ax all-interpsys all-axiomsys all: all-ax @@ -192,29 +179,19 @@ remove-stamp: .PHONY: build-images build-images: remove-stamp all-interpsys -all-interpsys: makeint.lisp +all-interpsys: $(mkinstalldirs) $(AUTO) $(MAKE) $(SAVESYS) all-axiomsys: all-interpsys $(MAKE) $(AXIOMSYS) -all-depsys: $(DEPSYS) - .PRECIOUS: %.boot %.boot: $(srcdir)/%.boot.pamphlet $(axiom_build_document) --tangle --output=$@ $< -.PRECIOUS: %.clisp -%.clisp: %.boot - $(BOOT_TO_LISP) -.PRECIOUS: %.$(FASLEXT) -%.$(FASLEXT): %.clisp - $(COMPILE_LISP) # Extract and compile the part of the interpreter written # in Common Lisp .PRECIOUS: %.lisp -%.$(FASLEXT): %.lisp - $(COMPILE_LISP) %.lisp: $(srcdir)/%.lisp.pamphlet $(axiom_build_document) --tangle --output=$@ $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index 3cd53b96..3783b9b1 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -14,25 +14,6 @@ \tableofcontents \eject -\begin{verbatim} -notes for understanding this makefile: -re: postpar.clisp and parse.clisp stanzas: -NOTE: the .clisp file is copies back into the src directory so that -it is possible to create a new obootsys system from scratch for a -new platform. parse.clisp needs to be compiled in a depsys. -one thing need to be done to create an obootsys by hand: - parse and postpar must be loaded along with the depsys files - into a bare lisp system. -if these two things are done then a obootsys image can be bootstrapped -to a new platform. - -IMPORTANT: all source file names in this Makefile must be lowercase - This is for cross-platform compatibility and also makes getting - them into Lisp much easier at the Makefile level. - -\end{verbatim} - - \section{The Environment} We define 3 directories for this build. The first two are @@ -54,12 +35,6 @@ in the [[\$(axiom_target_docdir)/src/interp/]] directory. IN=$(srcdir) DOC=$(axiom_target_docdir)/src/interp BOOK=$(axiom_target_docdir) - -# Command to translate Boot to Common Lisp -BOOT_TO_LISP = $(BOOTSYS) -- --translate --output=$@ $< - -# Command to translate Common Lisp to native object code -COMPILE_LISP = $(DEPSYS) -- --compile --output=$@ $< @ @@ -86,7 +61,7 @@ the other images. This is called {\bf LISPSYS} and is located in the build platform sub-directory. <<environment>>= # Build platform-dependent Lisp image, at the base of other -# derived Lisp images (depsys, interpsys, AXIOMsys) +# derived Lisp images (interpsys, AXIOMsys) LISPSYS= $(axiom_build_bindir)/lisp @ @@ -105,162 +80,6 @@ BOOTSYS= $(axiom_build_bindir)/bootsys @ -Note also that another translator (built into [[depsys]]) translates -a variant og Boot (called ``old Boot'') to Common Lisp. - - -\subsection{The old Boot translator} - -<<environment>>= -DEPSYS = ./depsys -@ - -Some of the Common Lisp code we compile uses macros which -are assumed to be available at compile time. The [[DEPSYS]] -image is created to contain the compile time environment -and saved. Furthermore, it is also used to translate codes written -in ``old Boot'' to Common Lisp. That translator is in the process of -being phased out in favor of the ``new Boot'' translator found in -\File{src/boot/}. - -\subsubsection{Structure of [[depsys]]} - -The [[depsys]] image is made of the following Lisp source files - -\begin{description} -\item[Interpreted Lisp source files] - The following files are currently part of [[depsys]] in interpreted - form. The exact reasons for that are not well articulated. - - \begin{description} - \item[\File{nocompil.lisp}] This file defines obscure functions - that seem to be there only for obscure reasons. Most of them are not - really needed for translating Boot codes. - - \item[\File{bookvol5.lisp}] This file defines functions for - the Spad interpreter. None of which seems relevant for translating - Boot codes to Common Lisp. - - \item[\File{util.lisp}] This file defines various ``system-level'' - helper functions, for building [[depsys]], [[interpsys]], etc. - - \item[\File{vmlisp.lisp}] This is a collection of various utility - functions, encapsulations of variabilities of Lisp implementations. - All those symbols are defined in the package [[VMLISP]]. - It needs some strip down, and possibly have its contents moved - to the package [[BOOT]]. - - \item[\File{ggreater.lisp}] This file defines various orderings - on collections and other aggregates. Its content is defined in the - package [[VMLISP]]. - - \item[\File{hash.lisp}] This file defines a ``hash table'' module. - Its content is defined in package [[VMLISP]]. - - \item[\File{union.lisp}] This file defines functions that - compute set-theoretic operations (union, difference, intersection, etc.). - Its content is in package [[VMLISP]]. - - \item[\File{nlib.lisp}] This file defines to work around problems - with GCL when compiling Spad files. It is not necessary for - translating Boot codes to Common Lisp. Its content is in package - [[VMLISP]]. - - \item[\File{macros.lisp}] This file collects various helper macros - and functions for Boot and Spad codes. - - \item[\File{comp.lisp}] This file defines several functions that - desugar Boot and Spad codes; in particular, they infer local - variables from their position in assignment expressions. Its - content is defined in package [[BOOT]]. - - \item[\File{spaderror.lisp}] This file defines error handling functions - that are useful only for Spad codes -- not for translating Boot codes. - Its content is defined in package [[BOOT]]. - - \item[\File{debug.lisp}] This file defines debug utilities for - essentially Spad codes. Its content is defined in package [[BOOT]]. - - \item[\File{spad.lisp}] This files defines the entry points for - processing Spad and Boot codes. Its content is defined in package - [[BOOT]]. - - \item[\File{bits.lisp}] This file implements a ``bit vector'' - data type. Its content is in package [[BOOT]]. - - \item[\File{setq.lisp}] This file defines several global - variables. Its content is defined in package [[BOOT]]. - - \item[\File{property.lisp}] This file defines properties of - Spad and Boot tokens, as well as several constructors. Its - content is defined in package [[BOOT]]. - - \item[\File{unlisp.lisp}] This file attempts to define interfaces - to the Operating System, that are not found in strict ANSI - Common Lisp (though they may be present as extensions with - varying spellings.). Its content is defined in package [[BOOT]]. - - \item[\File{foam\_l.lisp}] This file defines the FOAM functions. - The packages [[FOAM]] and [[FOAM-USER]] are defined here. - It is not needed for translating Boot codes to Common Lisp. - - \item[\File{axext\_l.lisp}] This file defines various macros and - functions for interoperability between Aldor and OpenAxiom. Not needed - for translating Boot codes to Common Lisp. - \end{description} - -\item[Compiled Lisp source files] - \begin{description} - \item[\File{parsing.lisp}] - - \item[\File{metalex.lisp}] - - \item[\File{bootlex.lisp}] - - \item[\File{newaux.lisp}] - - \item[\File{preparse.lisp}] - - \item[\File{postprop.lisp}] - - \item[\File{def.lisp}] - - \item[\File{fnewmeta.lisp}] - \end{description} - -\item[Compiled Boot source files] - \begin{description} - \item[\File{postpar.boot}] - - \item[\File{parse.boot}] - - \item[\File{clam.boot}] - - \item[\File{slam.boot}] - - \item[\File{g-boot.boot}] - - \item[\File{c-util.boot}] - - \item[\File{g-util.boot}] - \end{description} - -\end{description} - -The {\bf DEP} variable contains the list of files that -will be loaded into {\bf DEPSYS}. Notice that these files -are loaded in interpreted form. We are not concerned about -the compile time performance so we can use interpreted code. -We do, however, care about the macros as these will be -expanded in later compiles. All macros are assumed to be -in this list of files. -<<environment>>= -DEP= $(srcdir)/spaderror.lisp $(srcdir)/debug.lisp \ - $(srcdir)/spad.lisp \ - $(srcdir)/setq.lisp $(srcdir)/property.lisp \ - $(srcdir)/unlisp.lisp $(srcdir)/foam_l.lisp \ - $(srcdir)/axext_l.lisp -@ Once we've compile all of the Common Lisp files we fire up a clean lisp image called {\bf LOADSYS} (from the build platform), load all @@ -291,13 +110,6 @@ by being compiled. \subsection{The Spad interpreter and compiler} -The value of the variable [[AXIOMsys_boot_sources]] is the (currently -partial) list of Boot source files that make up the interpreter. -Similarly, the value of the variable [[AXIOMsys_compiled_lisp_sources]] -is the list of Common Lisp source files that are compiled into -the interpreter. Notice that some of these files are loaded (\eg{}, -interpreted) in [[depsys]]. - <<environment>>= OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \ diagnostics.$(FASLEXT) sys-driver.$(FASLEXT) \ @@ -530,7 +342,6 @@ are likely to be useable we don't need to redo the work if they exist. <<environment>>= -.PRECIOUS: ${DEPSYS} .PRECIOUS: ${SAVESYS} .PRECIOUS: ${AXIOMSYS} @@ -546,22 +357,6 @@ files: $(axiom_build_document) --tangle --output=$@ $< @ -The extracted Boot codes are then fed into \Tool{bootsys} which translates -them into Common Lisp codes: -<<extract source codes>>= -.PRECIOUS: %.clisp -%.clisp: %.boot - $(BOOT_TO_LISP) -@ - -The resulting Common Lips codes are, in turn, compiled to object codes -using the \Tool{depsys} image. -<<extract source codes>>= -.PRECIOUS: %.$(FASLEXT) -%.$(FASLEXT): %.clisp - $(COMPILE_LISP) -@ - Part of the interpreter is written directly in Common Lisp (instead of the sugared dialect Boot). That part is extracted from the pamphlet files and compiled to native object code, as usual. @@ -569,8 +364,6 @@ and compiled to native object code, as usual. # Extract and compile the part of the interpreter written # in Common Lisp .PRECIOUS: %.lisp -%.$(FASLEXT): %.lisp - $(COMPILE_LISP) %.lisp: $(srcdir)/%.lisp.pamphlet $(axiom_build_document) --tangle --output=$@ $< @@ -625,107 +418,6 @@ UNUSED= ${DOC}/anna.boot.dvi ${DOC}/construc.lisp.dvi \ @ -\section{Building DEPSYS} - -\begin{verbatim} -NOTES: depsys proceeds all else. it is the compile-time environment -for all interpreter code. -[[OLD-BOOT::BOOT]] emulates the new boot parser command [[BOOTTOCL]]. since -we eventually plan to move to the new boot parser this function -should disappear. -the load of postpar and parse (without extensions) allows the .${LISP} form -to be loaded in a virgin system. however, if depsys is recreated then -the compiled form will get loaded. -\end{verbatim} - -\subsection{save depsys image} - -Once the appropriate commands are in the [[makedep.lisp]] file -we can load the file into an initial Lisp image and save it. -In freebsd we cannot do this so we have to use -a much more complicated procedure. -This code used to read: -\begin{verbatim} -<<save depsys image>>= - ../lisp/base-lisp$(EXEEXT) -- --make --output=$@ \ - --load-directory=. makedep.lisp -@ -\end{verbatim} - - -<<depsys>>= -${DEPSYS}: vmlisp.$(FASLEXT) \ - hash.$(FASLEXT) \ - bits.$(FASLEXT) \ - ggreater.$(FASLEXT) \ - union.$(FASLEXT) \ - boot-pkg.$(FASLEXT) \ - sys-constants.$(FASLEXT) \ - sys-globals.$(FASLEXT) \ - sys-driver.$(FASLEXT) \ - diagnostics.$(FASLEXT) \ - sys-macros.$(FASLEXT) \ - macros.$(FASLEXT) \ - nlib.$(FASLEXT) \ - comp.$(FASLEXT) \ - ${DEP} \ - nocompil.$(FASLEXT) \ - bookvol5.$(FASLEXT)\ - util.$(FASLEXT) \ - postpar.$(FASLEXT) \ - parse.$(FASLEXT) \ - parsing.$(FASLEXT) \ - metalex.$(FASLEXT) \ - bootlex.$(FASLEXT) \ - newaux.$(FASLEXT) \ - preparse.$(FASLEXT) \ - postprop.$(FASLEXT)\ - def.$(FASLEXT) \ - fnewmeta.$(FASLEXT) \ - g-error.$(FASLEXT) \ - g-boot.$(FASLEXT) \ - c-util.$(FASLEXT) \ - g-util.$(FASLEXT) \ - clam.$(FASLEXT) \ - slam.$(FASLEXT) - @ echo 3 making ${DEPSYS} - @ rm -f makedep.lisp - @ $(mkinstalldirs) $(axiom_build_bindir) - @ echo '(|importModule| "sys-driver")' >> makedep.lisp - @ echo '(|importModule| "vmlisp")' >> makedep.lisp - @ echo '(|importModule| "bits")' >> makedep.lisp - @ echo '(|importModule| "hash")' >> makedep.lisp - @ echo '(|importModule| "ggreater")' >> makedep.lisp - @ echo '(|importModule| "union")' >> makedep.lisp - @ echo '(|importModule| "nocompil")' >> makedep.lisp - @ echo '(|importModule| "macros")' >> makedep.lisp - @ echo '(|importModule| "nlib")' >> makedep.lisp - @ echo '(|importModule| "bookvol5")' >> makedep.lisp - @ echo '(|importModule| "util")' >> makedep.lisp - @ echo '(in-package "BOOT")' >> makedep.lisp - @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))))' >> makedep.lisp - @ echo '(in-package "AxiomCore")' >> makedep.lisp - @ echo '(|importModule| "newaux")' >> makedep.lisp - @ echo '(|importModule| "parse")' >> makedep.lisp - @ echo '(|importModule| "metalex")' >> makedep.lisp - @ echo '(|importModule| "parsing")' >> makedep.lisp - @ echo '(|importModule| "fnewmeta")' >> makedep.lisp - @ echo '(|importModule| "preparse")' >> makedep.lisp - @ echo '(|importModule| "comp")' >> makedep.lisp - @ echo '(|importModule| "def")' >> makedep.lisp - @ echo '(|importModule| "bootlex")' >> makedep.lisp - @ echo '(|importModule| "postprop")' >> makedep.lisp - @ echo '(|importModule| "postpar")' >> makedep.lisp - @ echo '(|importModule| "clam")' >> makedep.lisp - @ echo '(|importModule| "slam")' >> makedep.lisp - @ echo '(|importModule| "g-error")' >> makedep.lisp - @ echo '(|importModule| "g-boot")' >> makedep.lisp - @ echo '(|importModule| "c-util")' >> makedep.lisp - @ echo '(|importModule| "g-util")' >> makedep.lisp -<<save depsys image>> - @ echo 4 ${DEPSYS} created - -@ \section{Building SAVESYS and AXIOMSYS} @@ -824,16 +516,6 @@ bookvol5.lisp: $(srcdir)/bookvol5.pamphlet $(axiom_build_document) --tangle=Interpreter --output=$@ $< @ -\subsection{postpar.boot} - -\begin{verbatim} -NOTE: One thing need to be done to create an DEPSYS by hand: - parse and postpar must be loaded along with the depsys files - into a bare lisp system. -if these two things are done then a DEPSYS image can be bootstrapped -to a new platform. -\end{verbatim} - \section{The databases} \begin{verbatim} @@ -886,7 +568,7 @@ subdir = src/interp/ .SUFFIXES: .SUFFIXES: .boot .clisp .lisp .pamphlet -.PHONY: all all-ax all-depsys all-interpsys all-axiomsys +.PHONY: all all-ax all-interpsys all-axiomsys all: all-ax @@ -903,15 +585,13 @@ remove-stamp: .PHONY: build-images build-images: remove-stamp all-interpsys -all-interpsys: makeint.lisp +all-interpsys: $(mkinstalldirs) $(AUTO) $(MAKE) $(SAVESYS) all-axiomsys: all-interpsys $(MAKE) $(AXIOMSYS) -all-depsys: $(DEPSYS) - <<extract source codes>> mostlyclean-local: diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp index 8c5c16c6..76cbb3c6 100644 --- a/src/interp/macros.lisp +++ b/src/interp/macros.lisp @@ -578,12 +578,6 @@ ;; the following are redefined in MSGDB BOOT -;; --------------------> NEW DEFINITION (override in msgdb.boot.pamphlet) -(DEFUN BRIGHTPRINT (X) (MESSAGEPRINT X)) - -;; --------------------> NEW DEFINITION (override in msgdb.boot.pamphlet) -(DEFUN BRIGHTPRINT-0 (x) (MESSAGEPRINT-1 X)) - (DEFUN BLANKS (N &optional (stream *standard-output*)) "Print N blanks." (do ((i 1 (the fixnum(1+ i)))) ((> i N))(declare (fixnum i n)) (princ " " stream))) diff --git a/src/interp/util.lisp b/src/interp/util.lisp index 730b1df5..7ea4bfd8 100644 --- a/src/interp/util.lisp +++ b/src/interp/util.lisp @@ -32,8 +32,8 @@ ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ;; This file is a collection of utility functions that are useful -;; for system level work. A couple of the functions, `build-depsys' -;; and `build-interpsys' interface to the src/interp/Makefile. +;; for system level work. A couple of the functions, +;; `build-interpsys' interface to the src/interp/Makefile. ;; A second group of related functions allows us to rebuild portions ;; of the system from the command prompt. This varies from rebuilding @@ -706,30 +706,6 @@ ) -;; The `depsys' image is one of the two images we build from -;; the src/interp subdirectory (the other is `interpsys'). We -;; use `depsys' as a compile-time image as it contains all of -;; the necessary functions and macros to compile any file. The -;; `depsys' image is almost the same as an `interpsys' -;; image but it does not have any autoload triggers or databases -;; loaded. - -(defun build-depsys (load-files) -#+:CCL - (setq *package* (find-package "BOOT")) -#+:AKCL - (in-package "BOOT") - (mapcar #'load load-files) - (reroot) - #+:AKCL - (init-memory-config :cons 1000 :fixnum 400 :symbol 1000 :package 16 - :array 800 :string 1000 :cfun 200 :cpages 2000 - :rpages 2000 :hole 4000) ) -;; (init-memory-config :cons 500 :fixnum 200 :symbol 500 :package 8 -;; :array 400 :string 500 :cfun 100 :cpages 1000 -;; :rpages 1000 :hole 2000) ) - - (DEFUN |string2BootTree| (S) (init-boot/spad-reader) (LET* ((BOOT-LINE-STACK (LIST (CONS 1 S))) @@ -756,10 +732,6 @@ PARSEOUT)) -;;--------------------> NEW DEFINITION (see i-syscmd.boot.pamphlet) -(defun |processSynonyms| () nil) ;;dummy def for depsys, redefined later - - ;; the following are for conditional reading #+:ieee-floating-point (setq $ieee t) #-:ieee-floating-point (setq $ieee nil) |