From 6a3913853aeb542f155a1164eb48aba1724f17f7 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 27 Oct 2011 02:46:10 +0000
Subject: 	* algebra/stream.spad.pamphlet (Stream): Tidy accessors.

---
 src/interp/g-opt.boot    |  2 +-
 src/interp/i-syscmd.boot | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index f044b7a2..a4561beb 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -422,7 +422,7 @@ optSuchthat [.,:u] == ["SUCHTHAT",:u]
  
 ++ List of VM side effect free operators.
 $VMsideEffectFreeOperators ==
-  '(SPADfirst ASH FLOAT FLOAT_-SIGN %function
+  '(SPADfirst ASH FLOAT FLOAT_-SIGN %function %nullStream %nonNullStream
     %funcall %nothing %when %false %true %otherwise %2bit %2bool
     %and %or %not %peq %ieq %ilt %ile %igt %ige %head %tail %integer?
     %beq %blt %ble %bgt %bge %bitand %bitior %bitxor %bitnot %bcompl
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 311db253..a6483122 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -46,12 +46,6 @@ $existingFiles := hashTable "EQUAL"
 
 $SYSCOMMANDS := [first x for x in $systemCommands]
 
-$NonNullStream ==
-  '"NonNullStream"
-
-$NullStream ==
-  '"NullStream"
-
 $whatOptions := '( _
     operations _
     categories _
@@ -1832,8 +1826,8 @@ writify ob ==
                 THROW('writifyTag, 'writifyFailed)
             -- Default case: return the object itself.
             string? ob =>
-                sameObject?(ob, $NullStream) => ['WRITIFIED!!, 'NULLSTREAM]
-                sameObject?(ob, $NonNullStream) => ['WRITIFIED!!, 'NONNULLSTREAM]
+                sameObject?(ob, %nullStream) => ['WRITIFIED!!, 'NULLSTREAM]
+                sameObject?(ob, %nonNullStream) => ['WRITIFIED!!, 'NONNULLSTREAM]
                 ob
             FLOATP ob =>
                 ob = READ_-FROM_-STRING STRINGIMAGE ob => ob
@@ -1920,8 +1914,8 @@ dewritify ob ==
                     nob
                 type is 'READTABLE =>
                     error '"Cannot de-writify a read table."
-                type is 'NULLSTREAM => $NullStream
-                type is 'NONNULLSTREAM => $NonNullStream
+                type is 'NULLSTREAM => %nullStream
+                type is 'NONNULLSTREAM => %nonNullStream
                 type is 'FLOAT =>
                    [fval, signif, expon, sign] := CDDR ob
                    fval := SCALE_-FLOAT( FLOAT(signif, fval), expon)
-- 
cgit v1.2.3