Skip to content

fix(Lexer): Interpret minus correctly #122

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

Open
Dossar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(Lexer): Interpret minus correctly #122

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
7fd886f
fix(Lexer): Interpret minus correctly
Jun 9, 2022
bb5e1d3
Add unit tests in Lexer for minus interpretation
Jun 10, 2022
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
41 changes: 33 additions & 8 deletions __tests__/lib/Lexer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,38 @@ describe('Lexer', () => {
{ type: 'closeBracket', value: ']', raw: ']' }
])
})
it('considers minus to be negative appropriately', () => {
expect(inst.tokenize('-1?-2:-3')).toEqual([
{ type: 'literal', value: -1, raw: '-1' },
{ type: 'question', value: '?', raw: '?' },
{ type: 'literal', value: -2, raw: '-2' },
{ type: 'colon', value: ':', raw: ':' },
{ type: 'literal', value: -3, raw: '-3' }
])
describe('minus interpretation', () => {
it('considers minus to be negative appropriately', () => {
expect(inst.tokenize('-1?-2:-3')).toEqual([
{ type: 'literal', value: -1, raw: '-1' },
{ type: 'question', value: '?', raw: '?' },
{ type: 'literal', value: -2, raw: '-2' },
{ type: 'colon', value: ':', raw: ':' },
{ type: 'literal', value: -3, raw: '-3' }
])
})
it('can interpret minus in an array', () => {
expect(inst.tokenize('[-1, -2, 3]')).toEqual([
{ type: 'openBracket', value: '[', raw: '[' },
{ type: 'literal', value: -1, raw: '-1' },
{ type: 'comma', value: ',', raw: ', ' },
{ type: 'literal', value: -2, raw: '-2' },
{ type: 'comma', value: ',', raw: ', ' },
{ type: 'literal', value: 3, raw: '3' },
{ type: 'closeBracket', value: ']', raw: ']' }
])
})
it('can interpret minus in a method call', () => {
expect(inst.tokenize('min(1, -2, 3)')).toEqual([
{ type: 'identifier', value: 'min', raw: 'min' },
{ type: 'openParen', value: '(', raw: '(' },
{ type: 'literal', value: 1, raw: '1' },
{ type: 'comma', value: ',', raw: ', ' },
{ type: 'literal', value: -2, raw: '-2' },
{ type: 'comma', value: ',', raw: ', ' },
{ type: 'literal', value: 3, raw: '3' },
{ type: 'closeParen', value: ')', raw: ')' }
])
})
})
})
3 changes: 2 additions & 1 deletion lib/Lexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ const minusNegatesAfter = [
'openParen',
'openBracket',
'question',
'colon'
'colon',
'comma'
]

/**
Expand Down