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

Fixed error messages at non-ascii %string terminator

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-08-26 21:36:22 +09:00
parent cc36b5d4ac
commit 445e5548c9
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
parse.y
View file

@ -8547,11 +8547,17 @@ parse_percent(struct parser_params *p, const int space_seen, const enum lex_stat
quotation: quotation:
if (c == -1 || !ISALNUM(c)) { if (c == -1 || !ISALNUM(c)) {
term = c; term = c;
if (!ISASCII(c)) goto unknown;
c = 'Q'; c = 'Q';
} }
else { else {
term = nextc(p); term = nextc(p);
if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) { if (rb_enc_isalnum(term, p->enc) || !parser_isascii(p)) {
unknown:
pushback(p, term);
c = parser_precise_mbclen(p, p->lex.pcur);
if (c < 0) return 0;
p->lex.pcur += c;
yyerror0("unknown type of %string"); yyerror0("unknown type of %string");
return 0; return 0;
} }

2
test/ruby/test_parse.rb
View file

@ -599,6 +599,8 @@ class TestParse < Test::Unit::TestCase
assert_syntax_error('%s', /unterminated quoted string/) assert_syntax_error('%s', /unterminated quoted string/)
assert_syntax_error('%ss', /unknown type/) assert_syntax_error('%ss', /unknown type/)
assert_syntax_error('%z()', /unknown type/) assert_syntax_error('%z()', /unknown type/)
assert_syntax_error("%\u3042", /unknown type/)
assert_syntax_error("%q\u3042", /unknown type/)
end end
def test_symbol def test_symbol