Lex and parse again

5 files changed, 28 insertions, 0 deletions

diff --git a/__tests__/lexer.test.js b/__tests__/lexer.test.js
index 1e80c25..5ae84cc 100644
--- a/__tests__/lexer.test.js
+++ b/__tests__/lexer.test.js
@@ -182,4 +182,16 @@ describe('lex', () => {
       ])
     })
   })
+
+  describe('again', () => {
+    test('6A3d6', () => {
+      expect(lex('6A3d6')).toEqual([
+        { type: 'constant', value: 6 },
+        { type: 'A' },
+        { type: 'constant', value: 3 },
+        { type: 'd' },
+        { type: 'constant', value: 6 }
+      ])
+    })
+  })
 })
diff --git a/__tests__/parser.test.js b/__tests__/parser.test.js
index 25edbfc..6bf5958 100644
--- a/__tests__/parser.test.js
+++ b/__tests__/parser.test.js
@@ -199,6 +199,18 @@ describe('parse', () => {
     })
   })
 
+  it('parases dice with again', () => {
+    expect(parse('10A3d10')).toEqual({
+      type: 'A',
+      left: { type: 'constant', value: 10 },
+      right: {
+        type: 'd',
+        left: { type: 'constant', value: 3 },
+        right: { type: 'constant', value: 10 }
+      }
+    })
+  })
+
   describe('parsing parentheses', () => {
     test('(1d6)d6', () => {
       expect(parse('(1d6)d6')).toEqual({
diff --git a/index.js b/index.js
index 895656d..fa4a993 100644
--- a/index.js
+++ b/index.js
@@ -13,6 +13,8 @@ const interpret = tree => {
     return D.keepHigh(interpret(tree.left), interpret(tree.right))
   case 'k':
     return D.keepLow(interpret(tree.left), interpret(tree.right))
+  case 'A':
+    return D.again(interpret(tree.left), interpret(tree.right))
   case 'add':
     return D.add(interpret(tree.left), interpret(tree.right))
   case 'subtract':
diff --git a/src/lexer.js b/src/lexer.js
index b95ebc5..a83ee2b 100644
--- a/src/lexer.js
+++ b/src/lexer.js
@@ -25,6 +25,7 @@ newLexemeType(')', '\\)')
 newLexemeType('E', 'E')
 newLexemeType('K', 'K')
 newLexemeType('k', 'k')
+newLexemeType('A', 'A')
 
 const lex = (expressionString) => {
   let lexemes = []
diff --git a/src/parser.js b/src/parser.js
index a4665ac..1b678e4 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -63,6 +63,7 @@ newSymbol('d', (parser) => {
 newDieOperation('E')
 newDieOperation('K')
 newDieOperation('k')
+newDieOperation('A')
 
 newInfix('bigPlus', 20, { type: 'add' })
 newInfix('bigMinus', 20, { type: 'subtract' })