diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-11-30 07:58:43 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-11-30 07:58:43 +0000 |
| commit | 816865ca0322b9d413aaf562cbf5dd648f9c1038 (patch) | |
| tree | bad734df4facb483e57f0922942d355939c3146a /src/interp/setvars.boot | |
| parent | c81dbb595ec1d8352d3cfd420ef1b6926b861a78 (diff) | |
| download | open-axiom-816865ca0322b9d413aaf562cbf5dd648f9c1038.tar.gz | |
Fix SF/2110371
* interp/i-toplev.boot (recordAndPrint): Tidy.
(SpadInterpretFile): Move to int-top.boot.
* interp/int-top.boot (ncINTERPFILE): Simplify.
(ncloopPrintLines): Output onto the standard output stream.
(ncloopIncFileName): Issue diagnostic on error output stream.
* interp/setvars.boot (setOutputAlgebra): Fix thinko.
(setStandardOutputToAlgebraStream): New.
* interp/sys-driver.boot (executeSpadScript): Use it.
Set verbosity level as appropriate. Redirect output if requested.
Diffstat (limited to 'src/interp/setvars.boot')
| -rw-r--r-- | src/interp/setvars.boot | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index 2fced3b3..ed8423ab 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -987,10 +987,11 @@ setOutputAlgebra arg == -- try to figure out what the argument is - if arg is [fn] and - fn in '(Y N YE YES NO O ON OF OFF CONSOLE y n ye yes no o on of off console) - then 'ok - else arg := [fn,'spout] + if arg is [fn] then + arg := + fn in '(Y N YE YES NO O ON OF OFF CONSOLE + y n ye yes no o on of off console) => arg + [fn,'spout] arg is [fn] => UPCASE(fn) in '(Y N YE O OF) => @@ -1048,6 +1049,12 @@ describeSetOutputAlgebra() == '"The current setting is: ",'%b,setOutputAlgebra "%display%",'%d] +++ In case we are catching the output, we are also interested in +++ redirecting traffic on the standard output to that capturing stream. +setStandardOutputToAlgebraStream() == + $OutputStream := $algebraOutputStream + + -- See the subsection output characters in setvart.boot -- -- -------------------- The characters Option -------------------- |