aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog15
-rw-r--r--src/interp/bootlex.lisp4
-rw-r--r--src/interp/diagnostics.boot6
-rw-r--r--src/interp/macros.lisp6
-rw-r--r--src/interp/msgdb.boot6
-rw-r--r--src/interp/parsing.lisp2
-rw-r--r--src/interp/preparse.lisp4
-rw-r--r--src/interp/server.boot4
-rw-r--r--src/interp/vmlisp.lisp6
9 files changed, 32 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0568fa54..ba620358 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,15 @@
-2012-05-07 Gabriel Dos Reis <gdr@cse.tamu.edu>
+2012-05-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/vmlisp.lisp (ioTerminal?): Rename form IS-CONSOLE.
+ * interp/bootlex.lisp: Adjust.
+ * interp/diagnostics.boot: Likewise.
+ * interp/macros.lisp: Likewise.
+ * interp/msgdb.boot: Likewise.
+ * interp/parsing.lisp: Likewise.
+ * interp/preparse.lisp: Likewise.
+ * interp/server.boot: Likewise.
+
+2012-05-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/preparse.lisp (SKIP-IFBLOCK): Move to spad-parser.boot.
Renamed skipIfBlock.
@@ -6,7 +17,7 @@
(PREPARSEREADLINE): Move to spad-parser.boot. Renamed
preparseReadLine.
-2012-05-06 Gabriel Dos Reis <gdr@cse.tamu.edu>
+2012-05-06 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/sys-globals.boot ($insideCompTypeOf): Remove.
* interp/preparse.lisp (INITIAL-SUBSTRING): Remove.
diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp
index 0f8768b7..77147e7a 100644
--- a/src/interp/bootlex.lisp
+++ b/src/interp/bootlex.lisp
@@ -54,10 +54,10 @@
(defun print-defun (name body)
(let* ((sp (assoc 'compiler-output-stream optionlist))
(st (if sp (cdr sp) |$OutputStream|)))
- (if (and (is-console st) (symbolp name) (fboundp name)
+ (if (and (|ioTerminal?| st) (symbolp name) (fboundp name)
(not (compiled-function-p (symbol-function name))))
(compile name))
- (when (or |$PrettyPrint| (not (is-console st)))
+ (when (or |$PrettyPrint| (not (|ioTerminal?| st)))
(print-full body st) (force-output st))))
diff --git a/src/interp/diagnostics.boot b/src/interp/diagnostics.boot
index ecaf9c7c..bb7cd4ff 100644
--- a/src/interp/diagnostics.boot
+++ b/src/interp/diagnostics.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2011, Gabriel Dos Reis
+-- Copyright (C) 2007-2012, Gabriel Dos Reis
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -128,14 +128,14 @@ sayBrightly1(x,out) ==
sayBrightlyNT(x,out == $OutputStream) ==
x = nil => nil
$sayBrightlyStream ~= nil => sayBrightlyNT1(x,$sayBrightlyStream)
- IS_-CONSOLE out => sayBrightlyNT1(x,out)
+ ioTerminal? out => sayBrightlyNT1(x,out)
sayBrightly1(x,out) => sayBrightlyNT1(x,out)
nil
sayBrightly(x,out == $OutputStream) ==
x = nil => nil
$sayBrightlyStream ~= nil => sayBrightly1(x,$sayBrightlyStream)
- IS_-CONSOLE out => sayBrightly1(x,out)
+ ioTerminal? out => sayBrightly1(x,out)
sayBrightly1(x,out) => sayBrightly1(x,$OutputStream)
nil
diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp
index c11951cb..a3fa1b4e 100644
--- a/src/interp/macros.lisp
+++ b/src/interp/macros.lisp
@@ -255,7 +255,7 @@
"T if input stream STRM is at the end or saw a ~."
(not (peek-char nil STRM nil nil nil)) )
-(DEFUN CONSOLEINPUTP (STRM) (IS-CONSOLE STRM))
+(DEFUN CONSOLEINPUTP (STRM) (|ioTerminal?| STRM))
(defvar $filelinenumber 0)
(defvar $prompt "--->")
@@ -333,10 +333,10 @@
"Attempts to return the current record number of a file stream. This is 0 for
terminals and empty or at-end files. In Common Lisp, we must assume record sizes of 1!"
(COND ((STREAM-EOF STRM) 0)
- ((IS-CONSOLE STRM) 0)
+ ((|ioTerminal?| STRM) 0)
((file-position STRM))))
-(DEFUN IS-CONSOLE-NOT-XEDIT (S) (not (OR (NULL (IS-CONSOLE S)))))
+(DEFUN |ioTerminal?|-NOT-XEDIT (S) (not (OR (NULL (|ioTerminal?| S)))))
(DEFUN POINTW (RECNO STRM)
"Does something obscure and VM-specific with respect to streams."
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 149ea132..6e46b830 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2011, Gabriel Dos Reis.
+-- Copyright (C) 2007-2012, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -626,13 +626,13 @@ brightPrint0(x,out == $OutputStream) ==
x = '"%b" =>
-- FIXME: this kludge is GCL-specific. Find way to support
-- highlighting on all supported Lisp.
- not IS_-CONSOLE out or %escapeSequenceAverseHost?()
+ not ioTerminal? out or %escapeSequenceAverseHost?()
or stdStreamIsTerminal(1) = 0 => sayString('" ",out)
not $highlightAllowed => sayString('" ",out)
sayString($highlightFontOn,out)
k := blankIndicator x => BLANKS(k,out)
x = '"%d" =>
- not IS_-CONSOLE out or %escapeSequenceAverseHost?()
+ not ioTerminal? out or %escapeSequenceAverseHost?()
or stdStreamIsTerminal(1) = 0 => sayString('" ",out)
not $highlightAllowed => sayString('" ",out)
sayString($highlightFontOff,out)
diff --git a/src/interp/parsing.lisp b/src/interp/parsing.lisp
index 5f52da48..66b4598e 100644
--- a/src/interp/parsing.lisp
+++ b/src/interp/parsing.lisp
@@ -86,7 +86,7 @@
:adjustable t :initial-contents s))))
(defun get-a-line (stream)
- (if (and (IS-CONSOLE stream) (not |$leanMode|))
+ (if (and (|ioTerminal?| stream) (not |$leanMode|))
(|printPrompt|))
(let ((ll (read-a-line stream)))
(if (stringp ll) (make-string-adjustable ll) ll)))
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp
index 27e29538..d3585cea 100644
--- a/src/interp/preparse.lisp
+++ b/src/interp/preparse.lisp
@@ -167,7 +167,7 @@
(when (and LINES (EQL SLOC 0))
(IF (AND NCOMBLOCK (NOT (ZEROP (CAR NCOMBLOCK))))
(FINCOMBLOCK NUM NUMS LOCS NCOMBLOCK linelist))
- (IF (NOT (IS-CONSOLE in-stream))
+ (IF (NOT (|ioTerminal?| in-stream))
(setq $preparse-last-line
(|reverse!| $echolinestack)))
(RETURN (|pairList| (|reverse!| NUMS)
@@ -181,7 +181,7 @@
(PUSH A LINES)
(PUSH NUM NUMS)
(setq PARENLEV (+ PARENLEV PCOUNT))
- (when (and (is-console in-stream) (not continue))
+ (when (and (|ioTerminal?| in-stream) (not continue))
(setq $preparse-last-line nil)
(RETURN (|pairList| (|reverse!| NUMS)
(PARSEPILES (|reverse!| LOCS) (|reverse!| LINES)))))
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 3b0daff5..bdf64e58 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2012, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ $sockBufferLength := 9217
serverReadLine(stream) ==
-- used in place of READ-LINE in a scratchpad server system.
flushOutput()
- not $SpadServer or not IS_-CONSOLE stream =>
+ not $SpadServer or not ioTerminal? stream =>
line := readLine stream
line ~= %nothing => line
nil
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 2f57c6ac..e4729fe5 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -315,13 +315,13 @@
; 9.13 Streams
#+KCL
-(defun IS-CONSOLE (stream)
+(defun |ioTerminal?| (stream)
(and (streamp stream) (output-stream-p stream)
(eq (system:fp-output-stream stream)
(system:fp-output-stream *terminal-io*))))
#-KCL
-(defun IS-CONSOLE (stream)
+(defun |ioTerminal?| (stream)
(cond ((not (streamp stream))
nil)
((not (typep stream 'synonym-stream))
@@ -998,7 +998,7 @@
(file-position strm char-position))
strm))))
-(defun shut (st) (if (is-console st) st
+(defun shut (st) (if (|ioTerminal?| st) st
(if (streamp st) (close st) -1)))
(defun EOFP (stream) (null (peek-char nil stream nil nil)))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 23:34:06 +0000