From 032e8fdf403502cc066ed7222991f40f3cc1fdfa Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Dec 2017 00:09:51 +0000
Subject: [PATCH] parse.y: end of script at newline

* parse.y (parser_yylex): deal with end of script chars just after
  ignored newline as other places.  [ruby-core:84349] [Bug #14206]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y                 | 4 ++--
 test/ruby/test_parse.rb | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/parse.y b/parse.y
index 8e60f45ff6..cb6f916a62 100644
--- a/parse.y
+++ b/parse.y
@@ -8341,8 +8341,8 @@ parser_yylex(struct parser_params *parser)
 	    }
 	    goto retry;
 	}
-	while ((c = nextc())) {
-	    switch (c) {
+	while (1) {
+	    switch (c = nextc()) {
 	      case ' ': case '\t': case '\f': case '\r':
 	      case '\13': /* '\v' */
 		space_seen = 1;
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index dc461e6599..e26bcdc07e 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -1087,6 +1087,12 @@ x = __ENCODING__
     end
   end
 
+  def test_eof_in_def
+    assert_raise(SyntaxError) { eval("def m\n\0""end") }
+    assert_raise(SyntaxError) { eval("def m\n\C-d""end") }
+    assert_raise(SyntaxError) { eval("def m\n\C-z""end") }
+  end
+
 =begin
   def test_past_scope_variable
     assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}