From 014441bcebba43471231e124c4d9953e8b1a9abf Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 26 Feb 2018 14:59:25 -0700
Subject: [PATCH] reader: fix parsing of here strings

---
 pkgs/racket-test-core/tests/racket/read.rktl |  6 +++++
 racket/src/expander/read/string.rkt          | 24 +++++++++++---------
 racket/src/racket/src/startup.inc            |  8 ++++---
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/read.rktl b/pkgs/racket-test-core/tests/racket/read.rktl
index 253adfe7bd..76b6bb6dd6 100644
--- a/pkgs/racket-test-core/tests/racket/read.rktl
+++ b/pkgs/racket-test-core/tests/racket/read.rktl
@@ -213,6 +213,12 @@
 (err/rt-test (readstr "\"\\uD800\\uDD\"") exn:fail:read?)
 (err/rt-test (readstr "\"\\uD800\\uDD1\"") exn:fail:read?)
 
+(test "abc" readstr "#<<EOS\nabc\nEOS\n")
+(test "abc" readstr "#<<EOS\nabc\nEOS")
+(test "ok\r\nmore\r" readstr "#<<EOS\r\nok\r\nmore\r\nEOS\r")
+(err/rt-test (readstr "#<<EOS\nabc\nEO") exn:fail:read?)
+(err/rt-test (readstr "#<<EOS\r\nabc\nEOS") exn:fail:read?)
+
 (test (bytes 7) readstr "#\"\\a\"")
 (test (bytes 8) readstr "#\"\\b\"")
 (test (bytes 9) readstr "#\"\\t\"")
diff --git a/racket/src/expander/read/string.rkt b/racket/src/expander/read/string.rkt
index 696f0e8b42..e2f032b0cd 100644
--- a/racket/src/expander/read/string.rkt
+++ b/racket/src/expander/read/string.rkt
@@ -171,17 +171,19 @@
   
   ;; Parse terminator
   (define full-terminator
-    (let loop ()
-      (define c (read-char/special in config source))
-      (cond
-       [(eof-object? c)
-        (reader-error in config #:due-to c
-                      "found end-of-file after `#<<` and before a newline")]
-       [(not (char? c))
-        (reader-error in config #:due-to c
-                      "found non-character while reading `#<<`")]
-       [(char=? c #\newline) null]
-       [else (cons c (loop))])))
+    (cons
+     #\newline
+     (let loop ()
+       (define c (read-char/special in config source))
+       (cond
+         [(eof-object? c)
+          (reader-error in config #:due-to c
+                        "found end-of-file after `#<<` and before a newline")]
+         [(not (char? c))
+          (reader-error in config #:due-to c
+                        "found non-character while reading `#<<`")]
+         [(char=? c #\newline) null]
+         [else (cons c (loop))]))))
   
   ;; Get string content
   (let loop ([terminator full-terminator] [terminator-accum null])
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 5c65425e2b..a9c946d4da 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -51999,6 +51999,8 @@ static const char *startup_source =
 "(let-values(((source_28)(read-config-source config_48)))"
 "(let-values(((accum-str_5)(accum-string-init! config_48)))"
 "(let-values(((full-terminator_0)"
+"(cons"
+" '#\\newline"
 "((letrec-values(((loop_112)"
 "(lambda()"
 "(begin"
@@ -52010,7 +52012,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((c94_0) c_87)"
 "((temp95_2)"
-"                                                                  \"found end-of-file after `#<<` and before a newline\"))"
+"                                                                   \"found end-of-file after `#<<` and before a newline\"))"
 "(reader-error10.1"
 " #f"
 " #f"
@@ -52026,7 +52028,7 @@ static const char *startup_source =
 "(let-values()"
 "(let-values(((c98_0) c_87)"
 "((temp99_2)"
-"                                                                    \"found non-character while reading `#<<`\"))"
+"                                                                     \"found non-character while reading `#<<`\"))"
 "(reader-error10.1"
 " #f"
 " #f"
@@ -52041,7 +52043,7 @@ static const char *startup_source =
 "(if(char=? c_87 '#\\newline)"
 "(let-values() null)"
 "(let-values()(cons c_87(loop_112)))))))))))"
-" loop_112))))"
+" loop_112)))))"
 "(let-values((()"
 "(begin"
 "((letrec-values(((loop_113)"