m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--__tests__/lexer.test.js39
-rw-r--r--__tests__/parser.test.js4
-rw-r--r--src/lexer.js10
-rw-r--r--src/parser.js6
4 files changed, 34 insertions, 25 deletions
diff --git a/__tests__/lexer.test.js b/__tests__/lexer.test.js
index 04a95e1..6900764 100644
--- a/__tests__/lexer.test.js
+++ b/__tests__/lexer.test.js
@@ -10,24 +10,24 @@ describe('lex', () => {
})
it('throws on unexpected input at the end', () => {
- expect(() => { lex('1d6 `') }).toThrow(/Syntax error/)
+ expect(() => { lex('1d6`') }).toThrow(/Syntax error/)
})
it('throws on unexpected input in the middle', () => {
- expect(() => { lex('2d3 + b 3d4') }).toThrow(/Syntax error/)
+ expect(() => { lex('2d3 + b3d4') }).toThrow(/Syntax error/)
})
- describe('ignores whitespace', () => {
+ describe('throws on unexpected whitespace', () => {
it('2 d 4', () => {
- expect(lex('2 d 4')).not.toBe('error')
+ expect(() => { lex('2 d 4') }).toThrow(/Syntax error/)
})
it(' 1d8', () => {
- expect(lex(' 1d8')).not.toBe('error')
+ expect(() => { lex(' 1d8') }).toThrow(/Syntax error/)
})
it('3d4 ', () => {
- expect(lex('3d4 ')).not.toBe('error')
+ expect(() => { lex('3d4 ') }).toThrow(/Syntax error/)
})
})
@@ -55,7 +55,7 @@ describe('lex', () => {
{ type: 'constant', value: 1 },
{ type: 'd' },
{ type: 'constant', value: 6 },
- { type: '+' },
+ { type: 'bigPlus' },
{ type: 'constant', value: 1 },
{ type: 'd' },
{ type: 'constant', value: 4 }
@@ -67,7 +67,7 @@ describe('lex', () => {
{ type: 'constant', value: 2 },
{ type: 'd' },
{ type: 'constant', value: 17 },
- { type: '+' },
+ { type: 'bigPlus' },
{ type: 'constant', value: 4 }
])
})
@@ -79,7 +79,7 @@ describe('lex', () => {
{ type: 'constant', value: 1 },
{ type: 'd' },
{ type: 'constant', value: 6 },
- { type: '-' },
+ { type: 'bigMinus' },
{ type: 'constant', value: 1 },
{ type: 'd' },
{ type: 'constant', value: 4 }
@@ -91,7 +91,7 @@ describe('lex', () => {
{ type: 'constant', value: 2 },
{ type: 'd' },
{ type: 'constant', value: 17 },
- { type: '-' },
+ { type: 'bigMinus' },
{ type: 'constant', value: 4 }
])
})
@@ -110,13 +110,13 @@ describe('lex', () => {
])
})
- it('2d(6+3)d4', () => {
- expect(lex('2d(6+3)d4')).toEqual([
+ it('2d(6 + 3)d4', () => {
+ expect(lex('2d(6 + 3)d4')).toEqual([
{ type: 'constant', value: 2 },
{ type: 'd' },
{ type: '(' },
{ type: 'constant', value: 6 },
- { type: '+' },
+ { type: 'bigPlus' },
{ type: 'constant', value: 3 },
{ type: ')' },
{ type: 'd' },
@@ -125,6 +125,19 @@ describe('lex', () => {
})
})
+ describe('lexes negatives', () => {
+ it('-(1d6)', () => {
+ expect(lex('-(1d6)')).toEqual([
+ { type: 'minus' },
+ { type: '(' },
+ { type: 'constant', value: 1 },
+ { type: 'd' },
+ { type: 'constant', value: 6 },
+ { type: ')' }
+ ])
+ })
+ })
+
describe('exploding dice', () => {
test('1E1d6', () => {
expect(lex('1E1d6')).toEqual([
diff --git a/__tests__/parser.test.js b/__tests__/parser.test.js
index fb554f9..bc88894 100644
--- a/__tests__/parser.test.js
+++ b/__tests__/parser.test.js
@@ -152,8 +152,8 @@ describe('parse', () => {
})
})
- test('2d(6+3)d4', () => {
- expect(parse('2d(6+3)d4')).toEqual({
+ test('2d(6 + 3)d4', () => {
+ expect(parse('2d(6 + 3)d4')).toEqual({
type: 'd',
left: { type: 'constant', value: 2 },
right: {
diff --git a/src/lexer.js b/src/lexer.js
index fd0d0a3..8635e4a 100644
--- a/src/lexer.js
+++ b/src/lexer.js
@@ -14,19 +14,15 @@ const newValueLexeme = (type, regex, converter = v => v) => {
})
}
-const newSkippableLexeme = (type, regex) => {
- newLexemeType(type, regex, () => {})
-}
-
newValueLexeme('constant', '\\d+', Number)
newLexemeType('d', 'd')
-newLexemeType('+', '\\+')
-newLexemeType('-', '-')
+newLexemeType('bigPlus', ' \\+ ' )
+newLexemeType('bigMinus', ' - ')
+newLexemeType('minus', '-')
newLexemeType('(', '\\(')
newLexemeType(')', '\\)')
newLexemeType('E', 'E')
newLexemeType('K', 'K')
-newSkippableLexeme('whitespace', '\\s+')
const lex = (expressionString) => {
let lexemes = []
diff --git a/src/parser.js b/src/parser.js
index fd974bc..588f480 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -63,9 +63,9 @@ newSymbol('d', (parser) => {
newDieOperation('E')
newDieOperation('K')
-newInfix('+', 20, { type: 'add' })
-newInfix('-', 20, { type: 'subtract' })
-newSymbol('-', (parser) => {
+newInfix('bigPlus', 20, { type: 'add' })
+newInfix('bigMinus', 20, { type: 'subtract' })
+newSymbol('minus', (parser) => {
return {
type: 'negative',
value: parser.expression(40)