diff options
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/boot-pkg.lisp | 4 | ||||
| -rw-r--r-- | src/interp/bootlex.lisp | 67 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 | ||||
| -rw-r--r-- | src/interp/sys-globals.boot | 3 | ||||
| -rw-r--r-- | src/interp/util.lisp | 31 |
5 files changed, 4 insertions, 103 deletions
diff --git a/src/interp/boot-pkg.lisp b/src/interp/boot-pkg.lisp index 95c14b2f..134f0f73 100644 --- a/src/interp/boot-pkg.lisp +++ b/src/interp/boot-pkg.lisp @@ -41,7 +41,9 @@ "systemRootDirectory" "systemLibraryDirectory" "loadNativeModule" - "loadSystemRuntimeCore")) + "loadSystemRuntimeCore" + "$InteractiveMode" + "string2BootTree")) (in-package "BOOT") diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp index b944c653..718c3058 100644 --- a/src/interp/bootlex.lisp +++ b/src/interp/bootlex.lisp @@ -80,73 +80,6 @@ (when (or |$PrettyPrint| (not (is-console st))) (print-full body st) (force-output st)))) -(defun boot-parse-1 (in-stream - &aux - (Echo-Meta nil) - (current-fragment nil) - ($INDEX 0) - ($LineList nil) - ($EchoLineStack nil) - ($preparse-last-line nil) - ($BOOT T) - (*EOF* NIL) - (OPTIONLIST NIL)) - (declare (special echo-meta *comp370-apply* *EOF* File-Closed - $index $linelist $echolinestack $preparse-last-line)) - (init-boot/spad-reader) - (let* ((Boot-Line-Stack (PREPARSE in-stream)) - (parseout (prog2 (|PARSE-Expression|) (pop-stack-1)) ) ) - ;(setq parseout (|new2OldLisp| parseout)) - ; (setq parseout (DEF-RENAME parseout)) - ; (DEF-PROCESS parseout) - parseout)) - -(defun boot (&optional - (*boot-input-file* nil) - (*boot-output-file* nil) - &aux - (Echo-Meta t) - ($BOOT T) - (XCape #\_) - (File-Closed NIL) - (*EOF* NIL) - (OPTIONLIST NIL) - (*fileactq-apply* (function print-defun)) - (*comp370-apply* (function print-defun))) - (declare (special echo-meta *comp370-apply* *EOF* File-Closed XCape)) - (setq |$normalizeTree| t) - (setq |$InteractiveMode| NIL) - (init-boot/spad-reader) - (with-open-stream - (in-stream (if *boot-input-file* - (open *boot-input-file* :direction :input) - |$InputStream|)) - (initialize-preparse in-stream) - (with-open-stream - (out-stream (if *boot-output-file* - (open *boot-output-file* :direction :output) - (make-broadcast-stream |$OutputStream|))) - (when *boot-output-file* - (format out-stream "~&;;; -*- Mode:Lisp; Package:Boot -*-~%~%") - (print-package "BOOT")) - (loop (if (and (not File-Closed) - (setq Boot-Line-Stack (PREPARSE in-stream))) - (progn - (|PARSE-Expression|) - (let ((parseout (pop-stack-1)) ) - (setq parseout (|new2OldLisp| parseout)) - (setq parseout (DEF-RENAME parseout)) - (let ((|$OutputStream| out-stream)) - (DEF-PROCESS parseout)) - (format out-stream "~&") - (if (null parseout) (ioclear)) )) - (return nil))) - (if *boot-input-file* - (format out-stream ";;;Boot translation finished for ~a~%" - (namestring *boot-input-file*))) - (IOClear in-stream out-stream))) - T) - (defun spad (&optional (*spad-input-file* nil) (*spad-output-file* nil) diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 7c91d4e0..10657288 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1148,7 +1148,7 @@ compileNot(x,m,e) == -- ??? selected through general modemaps, and their semantics -- ??? are quite hardwired with their syntax. -- ??? Eventually, we should not need to do this. - $compilerValue => compIf(["IF",y,"false","true"],m,e) + $normalizeTree => compIf(["IF",y,"false","true"],m,e) compForm(x,m,e) --% Case diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index 458ea603..67499dec 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -160,9 +160,6 @@ $e := $EmptyEnvironment $env := [[nil]] ++ -$InteractiveMode := false - -++ $InteractiveTimingStatsIfTrue := false ++ diff --git a/src/interp/util.lisp b/src/interp/util.lisp index 3609b591..995050f8 100644 --- a/src/interp/util.lisp +++ b/src/interp/util.lisp @@ -390,26 +390,6 @@ ;; directory from the current {\bf AXIOM} shell variable. (defvar $relative-library-directory-list '("/algebra/")) -(eval-when (:compile-toplevel :load-toplevel :execute) - #-:GCL (defpackage "OLD-BOOT") - #+:GCL (in-package "OLD-BOOT")) - -(defun -#-:GCL old-boot::boot ;; translates a single boot file -#+:GCL boot - (file) -#+:AKCL - (in-package "BOOT") - (let (*print-level* - *print-length* - (fn (pathname-name file)) - (*print-pretty* t)) - (boot::boot - file - (merge-pathnames (make-pathname :type "clisp") file)))) - -#+:GCL (in-package "BOOT") - ;; This is a little used subsystem to generate {\bf ALDOR} code ;; from {\bf Spad} code. Frankly, I'd be amazed if it worked. (defparameter translate-functions '( @@ -544,17 +524,6 @@ ) -(DEFUN |string2BootTree| (S) - (init-boot/spad-reader) - (LET* ((BOOT-LINE-STACK (LIST (CONS 1 S))) - ($BOOT T) - ($SPAD NIL) - (XTOKENREADER 'GET-BOOT-TOKEN) - (LINE-HANDLER 'NEXT-BOOT-LINE) - (PARSEOUT (PROGN (|PARSE-Expression|) (POP-STACK-1)))) - (DECLARE (SPECIAL BOOT-LINE-STACK $BOOT $SPAD XTOKENREADER LINE-HANDLER)) - (DEF-RENAME (|new2OldLisp| PARSEOUT)))) - (DEFUN |string2SpadTree| (LINE) (DECLARE (SPECIAL LINE)) (if (and (> (LENGTH LINE) 0) (EQ (CHAR LINE 0) #\) )) |