diff options
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 5 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 9 | ||||
| -rw-r--r-- | src/interp/debug.lisp | 8 | ||||
| -rw-r--r-- | src/interp/define.boot | 6 | ||||
| -rw-r--r-- | src/interp/int-top.boot | 4 | ||||
| -rw-r--r-- | src/interp/msgdb.boot | 1 | ||||
| -rw-r--r-- | src/interp/setq.lisp | 63 | ||||
| -rw-r--r-- | src/interp/spad.lisp | 1 | ||||
| -rw-r--r-- | src/interp/sys-globals.boot | 4 |
10 files changed, 28 insertions, 85 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8cf82a31..7775c202 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,17 @@ 2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/msgdb.boot ($MARG): Define. + * interp/int-top.boot (intloopReadConsole): Remove code for + $DALYMODE. + * interp/define.boot ($NRTopt): Define. + ($suffix): Likewise. + * interp/debug.lisp (S-SPADKEY): Define. + * interp/Makefile.pamphlet (OBJS): Don't include setq.$(FASLEXT). + (setq.$(FASLEXT)): Remove rule. + * interp/setq.lisp: Remove. + +2008-02-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/spad.lisp (APLMODE): Don't define. (XTOKENREADER): Don't set; define. * interp/setvars.boot (resetWorkspaceVariables): Don't reset diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 768dc64a..a97c829d 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -21,7 +21,7 @@ AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT) OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \ diagnostics.$(FASLEXT) sys-driver.$(FASLEXT) \ macros.$(FASLEXT) \ - unlisp.$(FASLEXT) setq.$(FASLEXT) \ + unlisp.$(FASLEXT) \ astr.$(FASLEXT) bits.$(FASLEXT) \ alql.$(FASLEXT) buildom.$(FASLEXT) \ cattable.$(FASLEXT) \ @@ -620,9 +620,6 @@ obey.$(FASLEXT): obey.lisp macros.$(FASLEXT) daase.$(FASLEXT): daase.lisp macros.$(FASLEXT) foam_l.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -setq.$(FASLEXT): setq.lisp macros.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index fb113b3d..b5a644e3 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -104,9 +104,7 @@ loaded into a clean lisp image ({\bf LOADSYS}) and saved as a runnable \Tool{OpenAxiom} interpreter ({\bf SAVESYS}) usually named \Tool{interpsys}. Most of these files are translated from Boot to Common Lisp and then -compiled. The \File{setq.lisp} -file contains constant initialization code which gains nothing -by being compiled. +compiled. \subsection{The Spad interpreter and compiler} @@ -114,7 +112,7 @@ by being compiled. OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \ diagnostics.$(FASLEXT) sys-driver.$(FASLEXT) \ macros.$(FASLEXT) \ - unlisp.$(FASLEXT) setq.$(FASLEXT) \ + unlisp.$(FASLEXT) \ astr.$(FASLEXT) bits.$(FASLEXT) \ alql.$(FASLEXT) buildom.$(FASLEXT) \ cattable.$(FASLEXT) \ @@ -945,9 +943,6 @@ obey.$(FASLEXT): obey.lisp macros.$(FASLEXT) daase.$(FASLEXT): daase.lisp macros.$(FASLEXT) foam_l.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -setq.$(FASLEXT): setq.lisp macros.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp index 64c68f0c..fbef4df2 100644 --- a/src/interp/debug.lisp +++ b/src/interp/debug.lisp @@ -45,6 +45,8 @@ (import-module "macros") (in-package "BOOT") + +(defvar S-SPADKEY NIL) ;" this is augmented by MAKESPADOP" (DEFPARAMETER /COUNTLIST NIL) (DEFPARAMETER /TIMERLIST NIL) @@ -124,13 +126,13 @@ (DEFUN /D-2 (FN INFILE OUTPUTSTREAM OP EDITFLAG TRACEFLAG) (declare (special OUTPUTSTREAM)) (PROG (FT oft SFN X EDINFILE FILE DEF KEY RECNO U W SOURCEFILES - ECHOMETA SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM SPADERRORSTREAM + ECHO-META SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM SPADERRORSTREAM ISID NBLNK COMMENTCHR $TOKSTACK (/SOURCEFILES |$sourceFiles|) METAKEYLST DEFINITION_NAME (|$sourceFileTypes| '(|spad| |boot| |lisp| |lsp| |meta|)) ($FUNCTION FN) $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK TRAPFLAG |$InteractiveMode| TOK COUNT ERRCOL COLUMN *QUERY CHR LINE (*COMP370-APPLY* (if (eq op 'define) #'eval-defun #'compile-defun))) - (declare (special ECHOMETA SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM + (declare (special ECHO-META SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM SPADERRORSTREAM ISID NBLNK COMMENTCHR $TOKSTACK /SOURCEFILES METAKEYLST DEFINITION_NAME |$sourceFileTypes| $FUNCTION $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK @@ -241,7 +243,7 @@ ;(NXTTOK) ;(SETQ LINE (CURINPUTLINE)) ;(SETQ SPADERRORSTREAM CUROUTSTREAM) - ;(AND /ECHO (SETQ ECHOMETA 'T) (PRINTEXP LINE) (TERPRI)) + ;(AND /ECHO (SETQ ECHO-META 'T) (PRINTEXP LINE) (TERPRI)) ;(SFN) (SETQ DEF (BOOT-PARSE-1 INPUTSTREAM)) (SETQ DEBUGMODE 'YES) diff --git a/src/interp/define.boot b/src/interp/define.boot index 92f15d99..9993f44a 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -43,6 +43,12 @@ $newCompCompare := false ++ List of mutable domains. $mutableDomains := nil +++ when non nil, holds the declaration number of a function in a capsule. +$suffix := nil + +-- ??? turns off buggy code +$NRTopt := false + --% FUNCTIONS WHICH MUNCH ON == STATEMENTS compDefine(form,m,e) == diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot index afa08a1f..116a0114 100644 --- a/src/interp/int-top.boot +++ b/src/interp/int-top.boot @@ -150,10 +150,6 @@ intloopReadConsole(b, n)== #a=0 => PRINC(MKPROMPT()) intloopReadConsole('"", n) - $DALYMODE and intloopPrefix?('"(",a) => - intnplisp(a) - PRINC(MKPROMPT()) - intloopReadConsole('"",n) pfx := stripSpaces intloopPrefix?('")fi",a) pfx and ((pfx = '")fi") or (pfx = '")fin")) => [] b = '"" and (d := intloopPrefix?('")", a)) => diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index ff40c6fd..215020e3 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -87,6 +87,7 @@ $msgAlist := NIL $msgDatabaseName := NIL $testingErrorPrefix := '"Daly Bug" $testingSystem := false +$MARG := 0 $texFormatting := false diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp deleted file mode 100644 index ef10bad7..00000000 --- a/src/interp/setq.lisp +++ /dev/null @@ -1,63 +0,0 @@ -;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -;; All rights reserved. -;; Copyright (C) 2007-2008, Gabriel Dos Reis. -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are -;; met: -;; -;; - Redistributions of source code must retain the above copyright -;; notice, this list of conditions and the following disclaimer. -;; -;; - Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in -;; the documentation and/or other materials provided with the -;; distribution. -;; -;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the -;; names of its contributors may be used to endorse or promote products -;; derived from this software without specific prior written permission. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -(import-module "macros") -(in-package "BOOT") - -;; These were originally in SPAD LISP - -(defvar $dalymode nil "if true then leading paren implies lisp cmd") -(defconstant |$Newline| #\Newline) - - -(defvar ECHOMETA NIL) -(defvar S-SPADKEY NIL) ;" this is augmented by MAKESPADOP" -(defvar MARG 0) - ;" Margin for testing by ?OP" - -;; These were originally in INIT LISP - -(SETQ |$functorForm| NIL) - -(SETQ |$suffix| NIL) -(SETQ |$prefix| NIL) -(SETQ |$formalArgList| ()) - -(SETQ |$NRTopt| NIL) ;; turns off buggy code - -(SETQ |$useConvertForCoercions| NIL) - -(MAKEPROP '|One| '|defaultType| |$Integer|) -(MAKEPROP '|Zero| '|defaultType| |$Integer|) - diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp index fe1c8dfe..1ddb46dc 100644 --- a/src/interp/spad.lisp +++ b/src/interp/spad.lisp @@ -40,6 +40,7 @@ ;;; Common Block +(defconstant |$Newline| #\Newline) (defvar |$preserveSystemLisplib| t "if nil finalizeLisplib does MA REP") (defvar |$incrementalLisplibFlag| nil "checked in compDefineLisplib") (defvar |$reportInstantiations| nil) diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index edd5d114..eb642e79 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -221,10 +221,6 @@ $previousTime := 0 $VariableCount := 0 ++ -++ FIXME: Eventually move to define.boot.pamphlet. -$suffix := 0 - -++ $useBFasDefault := true ++ |