Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- lexer.rl: fix incompatible delimiters on percent literal #808

Merged
merged 1 commit into from Jul 12, 2021
Merged

- lexer.rl: fix incompatible delimiters on percent literal #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/parser/lexer.rl
View file
Open in desktop
Expand Up @@ -518,7 +518,8 @@ class Parser::Lexer
c_nl_zlen = c_nl | zlen;
c_line = any - c_nl_zlen;

c_unicode = c_any - 0x00..0x7f;
c_ascii = 0x00..0x7f;
c_unicode = c_any - c_ascii;
c_upper = [A-Z];
c_lower = [a-z_] | c_unicode;
c_alpha = c_lower | c_upper;
Expand Down Expand Up @@ -1406,7 +1407,7 @@ class Parser::Lexer
':'
=> { fhold; fgoto expr_beg; };

'%s' c_any
'%s' (c_ascii - [A-Za-z0-9])
=> {
if version?(23)
type, delimiter = tok[0..-2], tok[-1].chr
Expand Down Expand Up @@ -1758,14 +1759,14 @@ class Parser::Lexer
};

# %<string>
'%' ( any - [A-Za-z] )
'%' ( c_ascii - [A-Za-z0-9] )
=> {
type, delimiter = @source_buffer.slice(@ts).chr, tok[-1].chr
fgoto *push_literal(type, delimiter, @ts);
};

# %w(we are the people)
'%' [A-Za-z]+ c_any
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the + is redundant, so I removed it. The test cases are all green so I think it is ok. Please tell me if the + is necessary here.

'%' [A-Za-z] (c_ascii - [A-Za-z0-9])
=> {
type, delimiter = tok[0..-2], tok[-1].chr
fgoto *push_literal(type, delimiter, @ts);
Expand Down
39 changes: 39 additions & 0 deletions test/test_lexer.rb
View file
Open in desktop
Expand Up @@ -2246,6 +2246,25 @@ def test_string_pct_pct
:tSTRING_END, '%', [6, 7])
end

def test_string_pct_null
assert_scanned("%\0blah\0",
:tSTRING_BEG, "%\0", [0, 2],
:tSTRING_CONTENT, "blah", [2, 6],
:tSTRING_END, "\0", [6, 7])
end

def test_string_pct_non_ascii
refute_scanned("%★foo★")
end

def test_string_pct_alphabet
refute_scanned("%AfooA")
end

def test_string_pct_number
refute_scanned("%1foo1")
end

def test_string_pct_w
assert_scanned("%w[s1 s2 ]",
:tQWORDS_BEG, "%w[", [0, 3],
Expand Down Expand Up @@ -2293,6 +2312,26 @@ def test_string_pct_w_tab
:tSTRING_END, ']', [10, 11])
end

def test_string_pct_w_null
assert_scanned("%w\0abc\0",
:tQWORDS_BEG, "%w\0", [0, 3],
:tSTRING_CONTENT, "abc", [3, 6],
:tSPACE, nil, [6, 6],
:tSTRING_END, "\0", [6, 7])
end

def test_string_pct_w_non_ascii
refute_scanned("%w★foo★")
end

def test_string_pct_w_alphabet
refute_scanned("%wAfooA")
end

def test_string_pct_w_number
refute_scanned("%w1foo1")
end

def test_string_pct_i
assert_scanned("%i(s1 s2)",
:tQSYMBOLS_BEG, "%i(", [0, 3],
Expand Down