diff options
| -rw-r--r-- | parse.y | 1 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -4689,6 +4689,7 @@ parser_yyerror(struct parser_params *p, const YYLTYPE *yylloc, const char *msg) pt = (p->ruby_sourceline == yylloc->end_pos.lineno) ? p->lex.pbeg + yylloc->end_pos.column : p->lex.pend; + if ((p->lex.pbeg < pt) && (*(pt-1) == '\n')) pt--; ptr = ptr_end = pt < pend ? pt : pend; lim = ptr - p->lex.pbeg > max_line_margin ? ptr - max_line_margin : p->lex.pbeg; while ((lim < ptr) && (*(ptr-1) != '\n')) ptr--; diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 5c1bd8fc16..c28bc80bc0 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1142,6 +1142,12 @@ eom end; end + def test_syntax_error_at_newline + expected = "\n ^" + assert_syntax_error("%[abcdef", expected) + assert_syntax_error("%[abcdef\n", expected) + end + def test_invalid_jump assert_in_out_err(%w[-e redo], "", [], /^-e:1: /) end |