diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-19 16:59:47 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-19 16:59:47 +0000 |
commit | fe2165c81e92b37b7721e4a507ba7e86cf557db8 (patch) | |
tree | e94e838f519f8e2b33dcdc13cf458ba3879a70f5 | |
parent | cc163957a45cc9cadb81d34b630c9f7de79c7892 (diff) |
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_4@62847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | test/ruby/test_parse.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -8108,8 +8108,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 78a7ab8c90..c4b8e45ce0 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -993,6 +993,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")}} @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-20" -#define RUBY_PATCHLEVEL 266 +#define RUBY_PATCHLEVEL 267 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |