kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Message to pipe should end with a newline

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-07-07 18:17:51 +09:00
parent a33948f40a
commit a13636e756
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parse.y
View file

@ -5581,7 +5581,7 @@ ruby_show_error_line(VALUE errbuf, const YYLTYPE *yylloc, int lineno, VALUE str)
p2 += (lim - ptr); p2 += (lim - ptr);
} }
*p2 = '\0'; *p2 = '\0';
rb_str_catf(mesg, "%s%.*s%s\n""%s%s", rb_str_catf(mesg, "%s%.*s%s\n""%s%s\n",
pre, (int)len, code, post, pre, (int)len, code, post,
pre, caret); pre, caret);
} }

24
test/ruby/test_parse.rb
View file

@ -13,6 +13,10 @@ class TestParse < Test::Unit::TestCase
$VERBOSE = @verbose $VERBOSE = @verbose
end end
def test_error_line
assert_syntax_error('------,,', /\n\z/, 'Message to pipe should end with a newline')
end
def test_else_without_rescue def test_else_without_rescue
assert_syntax_error(<<-END, %r":#{__LINE__+2}: else without rescue"o, [__FILE__, __LINE__+1]) assert_syntax_error(<<-END, %r":#{__LINE__+2}: else without rescue"o, [__FILE__, __LINE__+1])
begin begin
@ -514,13 +518,13 @@ class TestParse < Test::Unit::TestCase
mesg = 'from the backslash through the invalid char' mesg = 'from the backslash through the invalid char'
e = assert_syntax_error('"\xg1"', /hex escape/) e = assert_syntax_error('"\xg1"', /hex escape/)
assert_equal(' ^~', e.message.lines.last, mesg) assert_equal(' ^~'"\n", e.message.lines.last, mesg)
e = assert_syntax_error('"\u{1234"', 'unterminated Unicode escape') e = assert_syntax_error('"\u{1234"', 'unterminated Unicode escape')
assert_equal(' ^', e.message.lines.last, mesg) assert_equal(' ^'"\n", e.message.lines.last, mesg)
e = assert_syntax_error('"\u{xxxx}"', 'invalid Unicode escape') e = assert_syntax_error('"\u{xxxx}"', 'invalid Unicode escape')
assert_equal(' ^', e.message.lines.last, mesg) assert_equal(' ^'"\n", e.message.lines.last, mesg)
e = assert_syntax_error('"\u{xxxx', 'Unicode escape') e = assert_syntax_error('"\u{xxxx', 'Unicode escape')
assert_pattern_list([ assert_pattern_list([
@ -531,14 +535,14 @@ class TestParse < Test::Unit::TestCase
/ \^/, / \^/,
/\n/, /\n/,
/.*: unterminated string.*\n.*\n/, /.*: unterminated string.*\n.*\n/,
/ \^/, / \^\n/,
], e.message) ], e.message)
e = assert_syntax_error('"\M1"', /escape character syntax/) e = assert_syntax_error('"\M1"', /escape character syntax/)
assert_equal(' ^~~', e.message.lines.last, mesg) assert_equal(' ^~~'"\n", e.message.lines.last, mesg)
e = assert_syntax_error('"\C1"', /escape character syntax/) e = assert_syntax_error('"\C1"', /escape character syntax/)
assert_equal(' ^~~', e.message.lines.last, mesg) assert_equal(' ^~~'"\n", e.message.lines.last, mesg)
src = '"\xD0\u{90'"\n""000000000000000000000000" src = '"\xD0\u{90'"\n""000000000000000000000000"
assert_syntax_error(src, /:#{__LINE__}: unterminated/o) assert_syntax_error(src, /:#{__LINE__}: unterminated/o)
@ -1115,13 +1119,13 @@ x = __ENCODING__
end end
def test_unexpected_token_after_numeric def test_unexpected_token_after_numeric
assert_raise_with_message(SyntaxError, /^ \^~~\z/) do assert_raise_with_message(SyntaxError, /^ \^~~\Z/) do
eval('0000xyz') eval('0000xyz')
end end
assert_raise_with_message(SyntaxError, /^ \^~~\z/) do assert_raise_with_message(SyntaxError, /^ \^~~\Z/) do
eval('1.2i1.1') eval('1.2i1.1')
end end
assert_raise_with_message(SyntaxError, /^ \^~\z/) do assert_raise_with_message(SyntaxError, /^ \^~\Z/) do
eval('1.2.3') eval('1.2.3')
end end
end end
@ -1171,7 +1175,7 @@ x = __ENCODING__
end end
def test_location_of_invalid_token def test_location_of_invalid_token
assert_raise_with_message(SyntaxError, /^ \^~~\z/) do assert_raise_with_message(SyntaxError, /^ \^~~\Z/) do
eval('class xxx end') eval('class xxx end')
end end
end end