From 2d0062bcf5081fadbda999ffe45468782fda7fa2 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 28 Mar 2018 04:49:41 +0000 Subject: [PATCH] merge revision(s) 61346: [Backport #14206] 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/branches/ruby_2_3@62938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ parse.y | 4 ++-- test/ruby/test_parse.rb | 6 ++++++ version.h | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 388a865ca5..5bf287e9d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 28 13:48:35 2018 Nobuyoshi Nakada + + parse.y: end of script at newline + + * parse.y (parser_yylex): deal with end of script chars just after + ignored newline as other places. [Bug #14206] + Thu Mar 28 13:42:55 2018 Kazuhiro NISHIYAMA [DOC] IO.new accepts external_encoding diff --git a/parse.y b/parse.y index a4afdd6dca..3b148e67eb 100644 --- a/parse.y +++ b/parse.y @@ -8195,8 +8195,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 f48928b85e..0b608c4a16 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -899,6 +899,12 @@ x = __ENCODING__ assert_equal(line, obj.location.lineno, bug) 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")}} diff --git a/version.h b/version.h index fdb2e569ab..6af3748f99 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 434 +#define RUBY_PATCHLEVEL 435 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3