From 1cc6b80cfd4875f289837421cdbe81e3dfcf0ed1 Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Sat, 2 Sep 2017 00:47:46 -0400 Subject: Implement repeat --- src/dice.js | 14 ++++++++++++++ src/lexer.js | 1 + src/parser.js | 2 ++ 3 files changed, 17 insertions(+) (limited to 'src') diff --git a/src/dice.js b/src/dice.js index d47455e..5a484b0 100644 --- a/src/dice.js +++ b/src/dice.js @@ -193,6 +193,19 @@ const thresholdLow = (die1, die2) => { return threshold(lessThanOrEqual, die1, die2) } +const repeat = (die1, die2) => { + return () => { + const times = roll(die2) + + let results = [] + for (let i = 0; i < times; i++) { + results = results.concat(die1()) + } + + return results + } +} + exports.pool = pool exports.roll = roll exports.constant = constant @@ -212,3 +225,4 @@ exports.againAbove = againAbove exports.againUnder = againUnder exports.thresholdHigh = thresholdHigh exports.thresholdLow = thresholdLow +exports.repeat = repeat diff --git a/src/lexer.js b/src/lexer.js index 59fba16..248a9b2 100644 --- a/src/lexer.js +++ b/src/lexer.js @@ -32,6 +32,7 @@ newLexemeType('A', 'A') newLexemeType('a', 'a') newLexemeType('T', 'T') newLexemeType('t', 't') +newLexemeType(' x ', ' x ') const lex = (expressionString) => { let lexemes = [] diff --git a/src/parser.js b/src/parser.js index fd0fd59..b1f6ebb 100644 --- a/src/parser.js +++ b/src/parser.js @@ -82,6 +82,8 @@ newSymbol('minus', (parser) => { } }) +newInfix(' x ', 24, { type: 'repeat' }) + newSymbol('end', null, -1) const newParser = (tokens) => { -- cgit v1.2.3