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

Add Binary type to lexer type tokens list #224

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Add Binary type to lexer type tokens list #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07212bd
Add Binary type to lexer type tokens list
jay7x Dec 3, 2024
19888c4
Simplify type matcher tests with shared examples
jay7x Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puppet-lint/lexer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def heredoc_queue
[:WHITESPACE, %r{\A(#{WHITESPACE_RE}+)}],
# FIXME: Future breaking change, the following :TYPE tokens conflict with
# the :TYPE keyword token.
[:TYPE, %r{\A(Any|Array|Boolean|Callable|CatalogEntry|Class|Collection|Data|Default|Enum|Error|Float|Hash|Integer|NotUndef|Numeric|Optional|Pattern|Regexp|Resource|Runtime|Scalar|Sensitive|String|Struct|Tuple|Type|Undef|Variant)\b}], # rubocop:disable Layout/LineLength
[:TYPE, %r{\A(Any|Array|Binary|Boolean|Callable|CatalogEntry|Class|Collection|Data|Default|Enum|Error|Float|Hash|Integer|NotUndef|Numeric|Optional|Pattern|Regexp|Resource|Runtime|Scalar|Sensitive|String|Struct|Tuple|Type|Undef|Variant)\b}], # rubocop:disable Layout/LineLength
[:CLASSREF, %r{\A(((::){0,1}[A-Z][-\w]*)+)}],
[:NUMBER, %r{\A\b((?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?))\b}],
[:FUNCTION_NAME, %r{#{NAME_RE}(?=\()}],
Expand Down
28 changes: 12 additions & 16 deletions spec/unit/puppet-lint/lexer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,14 @@
end

context ':TYPE' do
shared_examples 'a type matcher' do |type|
it "matches #{type}" do
token = lexer.tokenise(type).first
expect(token.type).to eq(:TYPE)
expect(token.value).to eq(type)
end
end

it 'matches Data Types' do
token = lexer.tokenise('Integer').first
expect(token.type).to eq(:TYPE)
Expand All @@ -1378,24 +1386,12 @@
end

describe 'Platform Types' do
it 'matches Callable' do
token = lexer.tokenise('Callable').first
expect(token.type).to eq(:TYPE)
expect(token.value).to eq('Callable')
end

it 'matches Sensitive' do
token = lexer.tokenise('Sensitive').first
expect(token.type).to eq(:TYPE)
expect(token.value).to eq('Sensitive')
end
it_behaves_like 'a type matcher', 'Callable'
it_behaves_like 'a type matcher', 'Sensitive'
end

it 'matches Error type' do
token = lexer.tokenise('Error').first
expect(token.type).to eq(:TYPE)
expect(token.value).to eq('Error')
end
it_behaves_like 'a type matcher', 'Error'
it_behaves_like 'a type matcher', 'Binary'
end

context ':HEREDOC without interpolation' do
Expand Down
Loading