diff options
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/i-syscmd.boot | 5 | ||||
| -rw-r--r-- | src/interp/sys-driver.boot | 18 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 0c7d6258..297a8810 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -2451,13 +2451,18 @@ resetHighlight() == $specialCharacters := $saveSpecialchars spool filename == + -- Note: The base Lisp system may change the value of the standard + -- output stream as part of executing DRIBBLE(), so one must + -- ensure that traces are still sent to the spool. null filename => DRIBBLE() + SETQ(_*TRACE_-OUTPUT_*,_*STANDARD_-OUTPUT_*) TERPRI() resetHighlight() PROBE_-FILE car filename => systemError CONCAT('"file ", STRING car filename, '" already exists") DRIBBLE car filename + SETQ(_*TRACE_-OUTPUT_*,_*STANDARD_-OUTPUT_*) TERPRI() clearHighlight() diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index 238042d1..d8bc74d5 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -176,8 +176,7 @@ SET_-RESTART_-HOOK() == )endif "restart" -++ execute Spad script -executeSpadScript(progname,options,file) == +initializeGlobalState() == REROOT() $IOindex := 1 $InteractiveFrame := makeInitialModemapFrame() @@ -188,6 +187,10 @@ executeSpadScript(progname,options,file) == RESTART0() $NEWSPAD := true $SPAD := true + +++ execute Spad script +executeSpadScript(progname,options,file) == + initializeGlobalState() if getOption(Option '"verbose",%systemOptions()) then $verbose := true $options := [] @@ -206,16 +209,7 @@ associateRequestWithFileType(Option '"script", '"input", ++ compiler Spad Library File. compileSpadLibrary(progname,options,file) == - REROOT() - $IOindex := 1 - $InteractiveFrame := makeInitialModemapFrame() - loadExposureGroupData() - initHist() - initializeInterpreterFrameRing() - $currentLine := nil - RESTART0() - $NEWSPAD := true - $SPAD := true + initializeGlobalState() $EchoLines := false ECHO_-META : fluid := false $verbose := false |