diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | parse.y | 4 | ||||
| -rw-r--r-- | test/ruby/test_parse.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Mar 28 13:48:35 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> + + 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 <zn@mbf.nifty.com> [DOC] IO.new accepts external_encoding @@ -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")}} @@ -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 |