From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 8 Mar 2017 06:11:03 +0000 (-0800)
Subject: Add input-line operation to input strings.
X-Git-Tag: mit-scheme-pucked-9.2.12~158^2~105
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=33ebb4d1996a9e4b742354291cdf3a39b1ed20c4;p=mit-scheme.git

Add input-line operation to input strings.
---

diff --git a/src/runtime/stringio.scm b/src/runtime/stringio.scm
index 775fe2f34..98afab45d 100644
--- a/src/runtime/stringio.scm
+++ b/src/runtime/stringio.scm
@@ -42,24 +42,26 @@ USA.
   (let* ((end (fix:end-index end (string-length string) 'open-input-string))
 	 (start (fix:start-index start end 'open-input-string)))
     (make-textual-port string-input-type
-		       (make-istate string start end start))))
+		       (make-istate string start end start 0))))
 
 (define-structure istate
   (string #f read-only #t)
   (start #f read-only #t)
   (end #f read-only #t)
-  next)
+  next
+  line-number)
 
 (define (make-string-input-type)
   (make-textual-port-type `((char-ready? ,string-in/char-ready?)
 			    (eof? ,string-in/eof?)
+			    (input-line ,string-in/input-line)
 			    (peek-char ,string-in/peek-char)
 			    (read-char ,string-in/read-char)
 			    (read-substring ,string-in/read-substring)
 			    (unread-char ,string-in/unread-char)
 			    (write-self ,string-in/write-self))
 			  #f))
-
+
 (define (string-in/char-ready? port)
   port
   #t)
@@ -79,9 +81,14 @@ USA.
     (if (fix:< (istate-next ss) (istate-end ss))
 	(let ((char (string-ref (istate-string ss) (istate-next ss))))
 	  (set-istate-next! ss (fix:+ (istate-next ss) 1))
+	  (if (char=? char #\newline)
+	      (set-istate-line-number! ss (fix:+ 1 (istate-line-number ss))))
 	  char)
 	(make-eof-object port))))
 
+(define (string-in/input-line port)
+  (istate-line-number (textual-port-state port)))
+
 (define (string-in/read-substring port string start end)
   (let ((ss (textual-port-state port)))
     (let ((string* (istate-string ss))