From b84fe7672ad62a7e507b10704fbbd216afaaff44 Mon Sep 17 00:00:00 2001
From: Marcin Chrzanowski <marcin.j.chrzanowski@gmail.com>
Date: Tue, 22 Aug 2017 15:19:12 -0400
Subject: Stop ignoring whitespace

---
 __tests__/lexer.test.js | 12 ++++++------
 src/lexer.js            |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/__tests__/lexer.test.js b/__tests__/lexer.test.js
index 76cb421..12835df 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/)
     })
   })
 
diff --git a/src/lexer.js b/src/lexer.js
index 5831541..8635e4a 100644
--- a/src/lexer.js
+++ b/src/lexer.js
@@ -14,10 +14,6 @@ const newValueLexeme = (type, regex, converter = v => v) => {
   })
 }
 
-const newSkippableLexeme = (type, regex) => {
-  newLexemeType(type, regex, () => {})
-}
-
 newValueLexeme('constant', '\\d+', Number)
 newLexemeType('d', 'd')
 newLexemeType('bigPlus', ' \\+ ' )
@@ -27,7 +23,6 @@ newLexemeType('(', '\\(')
 newLexemeType(')', '\\)')
 newLexemeType('E', 'E')
 newLexemeType('K', 'K')
-newSkippableLexeme('whitespace', '\\s+')
 
 const lex = (expressionString) => {
   let lexemes = []
-- 
cgit v1.2.3