From 45426ecf640e4bc54847f57427cb52a3a4aa174c Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 12 Sep 2007 23:32:53 +0000
Subject: [PATCH] Return #T from CHAR-READY? when at EOF.
---
v7/src/runtime/genio.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/v7/src/runtime/genio.scm b/v7/src/runtime/genio.scm
index e3a100cee..8aee5ef92 100644
--- a/v7/src/runtime/genio.scm
+++ b/v7/src/runtime/genio.scm
@@ -1,6 +1,6 @@
#| -*-Scheme-*-
-$Id: genio.scm,v 1.53 2007/07/07 17:22:19 cph Exp $
+$Id: genio.scm,v 1.54 2007/09/12 23:32:53 cph Exp $
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -742,20 +742,20 @@ USA.
(define (buffer-has-input? ib)
(let ((bs (input-buffer-start ib)))
- (if (read-next-char ib)
- (begin
- (set-input-buffer-start! ib bs)
- #t)
- (and (not (input-buffer-at-eof? ib))
- ((source/has-input? (input-buffer-source ib)))
- (begin
- (justify-input-buffer ib)
- (read-bytes ib)
- (let ((bs (input-buffer-start ib)))
- (and (read-next-char ib)
- (begin
- (set-input-buffer-start! ib bs)
- #t))))))))
+ (cond ((read-next-char ib)
+ (set-input-buffer-start! ib bs)
+ #t)
+ ((input-buffer-at-eof? ib) #t)
+ (else
+ (and ((source/has-input? (input-buffer-source ib)))
+ (begin
+ (justify-input-buffer ib)
+ (read-bytes ib)
+ (let ((bs (input-buffer-start ib)))
+ (and (read-next-char ib)
+ (begin
+ (set-input-buffer-start! ib bs)
+ #t)))))))))
(define (justify-input-buffer ib)
(let ((bs (input-buffer-start ib))
--
2.25.1