Introduce forkStreamByName.

5 files changed, 16 insertions, 18 deletions

diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 4a74a8ff..51a426da 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2012, Gabriel Dos Reis.
+-- Copyright (C) 2007-2014, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -92,8 +92,8 @@ ncTopLevel() ==
 
 
 ncIntLoop() ==
-  $InputStream : local := MAKE_-SYNONYM_-STREAM "*STANDARD-INPUT*"
-  $OutputStream : local := MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+  $InputStream : local := forkStreamByName "*STANDARD-INPUT*"
+  $OutputStream : local := forkStreamByName "*STANDARD-OUTPUT*"
   intloop()
 
 
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 4fc465d3..27c1b371 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -1,4 +1,4 @@
--- Copyright (C) 2007-2013, Gabriel Dos Reis.
+-- Copyright (C) 2007-2014, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -1065,7 +1065,7 @@ parseSpadFile sourceFile ==
   FILE_-CLOSED : local := false          -- current stream closed?
   try
     -- noise to standard output  
-    $OutputStream: local := MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+    $OutputStream: local := forkStreamByName "*STANDARD-OUTPUT*"
     -- we need to tell the post-parsing transformers that we're compiling
     -- Spad because few parse forms have slightly different representations
     -- depending on whether we are interpreter mode or compiler mode.
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 825b40ce..ae2d5f80 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2013, Gabriel Dos Reis.
+-- Copyright (C) 2007-2014, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -365,14 +365,12 @@ $compForModeIfTrue := false
 
 --%
 
-$algebraOutputStream :=
-  MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+$algebraOutputStream := forkStreamByName "*STANDARD-OUTPUT*"
 
 ++
-$texOutputStream := MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+$texOutputStream := forkStreamByName "*STANDARD-OUTPUT*"
 
-$fortranOutputStream :=
-  MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+$fortranOutputStream := forkStreamByName "*STANDARD-OUTPUT*"
 
 --%
 
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index d03cec85..1d5d98bf 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -1,6 +1,6 @@
 ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 ;; All rights reserved.
-;; Copyright (C) 2007-2013, Gabriel Dos Reis.
+;; Copyright (C) 2007-2014, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -1050,7 +1050,7 @@
 (defmacro |quietlyIfInteractive| (cmd)
   `(let ((|$OutputStream| (if |$InteractiveMode|
 			      (make-broadcast-stream)
-			    (make-synonym-stream '*standard-output*))))
+			    (|forkStreamByName| '*standard-output*))))
      ,cmd))
 
 (defmacro |withOutputFile| (stream filespec form)
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index cbb6de78..bf75f950 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -912,13 +912,13 @@
 
 (defun MAKE-INSTREAM (filespec &optional (recnum 0))
  (declare (ignore recnum))
-   (cond ((numberp filespec) (make-synonym-stream '*standard-input*))
+   (cond ((numberp filespec) (|forkStreamByName| '*standard-input*))
          ((null filespec) (error "not handled yet"))
          (t (|inputTextFile| (|makeInputFilename| filespec)))))
 
 (defun MAKE-OUTSTREAM (filespec &optional (width nil) (recnum 0))
  (declare (ignore width) (ignore recnum))
-   (cond ((numberp filespec) (make-synonym-stream '*standard-output*))
+   (cond ((numberp filespec) (|forkStreamByName| '*standard-output*))
          ((null filespec) (error "not handled yet"))
          (t (|outputTextFile| (|makeFilename| filespec)))))
 
@@ -926,7 +926,7 @@
  "fortran support"
  (declare (ignore width) (ignore recnum))
  (cond 
-  ((numberp filespec) (make-synonym-stream '*standard-output*))
+  ((numberp filespec) (|forkStreamByName| '*standard-output*))
   ((null filespec) (error "make-appendstream: not handled yet"))
   ('else (open (|makeFilename| filespec) :direction :output
           :if-exists :append :if-does-not-exist :create))))
@@ -938,8 +938,8 @@
          (dev (cdr (assoc 'DEVICE stream-alist))))
       (if (EQ dev 'CONSOLE)
 	  (case mode
-		((OUTPUT O) (make-synonym-stream '*standard-output*))
-		((INPUT I) (make-synonym-stream '*standard-input*)))
+		((OUTPUT O) (|forkStreamByName| '*standard-output*))
+		((INPUT I) (|forkStreamByName| '*standard-input*)))
         (let ((strm (case mode
                           ((OUTPUT O) (open (|makeFilename| filename)
                                             :direction :output))