From 594f3b0c20c5b12f0d1ef11705187c22c1e40faf Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Tue, 22 Aug 2017 17:03:45 -0400 Subject: Lex and parse keepLow --- __tests__/lexer.test.js | 9 +++++++++ __tests__/parser.test.js | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to '__tests__') diff --git a/__tests__/lexer.test.js b/__tests__/lexer.test.js index d7a4368..1e80c25 100644 --- a/__tests__/lexer.test.js +++ b/__tests__/lexer.test.js @@ -160,6 +160,15 @@ describe('lex', () => { { type: 'constant', value: 20 } ]) }) + test('1k2d20', () => { + expect(lex('1k2d20')).toEqual([ + { type: 'constant', value: 1 }, + { type: 'k' }, + { type: 'constant', value: 2 }, + { type: 'd' }, + { type: 'constant', value: 20 } + ]) + }) }) describe('bonusAdd', () => { diff --git a/__tests__/parser.test.js b/__tests__/parser.test.js index 350af03..873972b 100644 --- a/__tests__/parser.test.js +++ b/__tests__/parser.test.js @@ -127,7 +127,7 @@ describe('parse', () => { }) }) - it('parses dice with keep', () => { + it('parses dice with keep high', () => { expect(parse('1K2d20')).toEqual({ type: 'K', left: { type: 'constant', value: 1 }, @@ -139,6 +139,18 @@ describe('parse', () => { }) }) + it('parses dice with keep low', () => { + expect(parse('1k2d20')).toEqual({ + type: 'k', + left: { type: 'constant', value: 1 }, + right: { + type: 'd', + left: { type: 'constant', value: 2 }, + right: { type: 'constant', value: 20 } + } + }) + }) + it('parses additive bonuses', () => { expect(parse('3d4+1')).toEqual({ type: 'bonusAdd', -- cgit v1.2.3