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/i-toplev.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/i-toplev.boot')
| -rw-r--r-- | src/interp/i-toplev.boot | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot index 416537f3..09f12bed 100644 --- a/src/interp/i-toplev.boot +++ b/src/interp/i-toplev.boot @@ -196,7 +196,7 @@ recordAndPrint(x,md) == mode:= (md=$EmptyMode => quadSch(); md) if (md ~= $Void) or $printVoidIfTrue then newlineIfDisplaying() - if $QuietCommand = false then + if not $QuietCommand then output(x',md') putHist('%,'value,objNewWrap(x,md),$e) if $printTimeIfTrue or $printTypeIfTrue then printTypeAndTime(x',md') @@ -331,9 +331,6 @@ intProcessSynonyms str == intInterpretPform pf == processInteractive(zeroOneTran packageTran pf2Sex pf, pf) -SpadInterpretFile fn == - SpadInterpretStream(1, fn, nil) - intNewFloat() == ["Float"] |