7.0.3 -- make counting operations have lowest priority in order of operations

Author: stevesea

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 7.0.3
+
+## 🛠️ Bug fixes
+- Previously, `4d6 + 3d6 #s #f` would only count success/failures of the 3d6 rolls, since counting
+  had higher priority than the plus operation. You could workaround that with parens `(4d6 + 3d6) #s #f`
+  In 7.0.3 and later, the counting operations now have the lowest priority.
+
 # 7.0.2
 - remove demo code accidentally added
 

README.md

@@ -129,7 +129,7 @@ void main() {
          If that's not the behavior you want, move the counts prior to the drop (`2d20 #cf #cs kh`).
 
 * arithmetic operations
-  * parenthesis for order of operations
+  * parenthesis to force a certain order of operations
   * addition is a little special -- could be a sum of ints, or it can be used to aggregate results of multiple dice rolls
     * Addition of integers is the usual sum
       * `4+5` 

lib/src/parser.dart

@@ -89,23 +89,23 @@ Parser<DiceExpression> parserBuilder(DiceRoller roller) {
     ..left(
       (pattern('Kk') & pattern('LlHh').optional()).flatten().trim(),
       (a, op, b) => DropHighLowOp(op.toLowerCase(), a, b),
-    )
-    // count >=, <=, <, >, =,
-    // #s, #cs, #f, #cf -- count (critical) successes / failures
-    ..left(
-      (char('#') &
-              char('c').optional() &
-              pattern('sf').optional() &
-              pattern('<>').optional() &
-              char('=').optional())
-          .flatten()
-          .trim(),
-      (a, op, b) => CountOp(op.toLowerCase(), a, b),
     );
 
   builder.group().left(char('*').trim(), (a, op, b) => MultiplyOp(op, a, b));
   builder.group()
     ..left(char('+').trim(), (a, op, b) => AddOp(op, a, b))
     ..left(char('-').trim(), (a, op, b) => SubOp(op, a, b));
+  // count >=, <=, <, >, =,
+  // #s, #cs, #f, #cf -- count (critical) successes / failures
+  builder.group().left(
+        (char('#') &
+                char('c').optional() &
+                pattern('sf').optional() &
+                pattern('<>').optional() &
+                char('=').optional())
+            .flatten()
+            .trim(),
+        (a, op, b) => CountOp(op.toLowerCase(), a, b),
+      );
   return builder.build().end();
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_dice_parser
 description: A dart library for parsing dice notation (`2d6+4`). Supports advantage/disadvantage, exploding die, and other variations.
-version: 7.0.2
+version: 7.0.3
 homepage: https://github.com/Adventuresmith/dart-dice-parser
 repository: https://github.com/Adventuresmith/dart-dice-parser
 

test/dart_dice_parser_test.dart

@@ -628,7 +628,7 @@ void main() {
 
     test('string method returns expr', () {
       final dice = DiceExpression.create('2d6# + 5d6!>=5 + 5D66', seededRandom);
-      expect(dice.toString(), '((((2d6) # ) + ((5d6) !>= 5)) + (5D66))');
+      expect(dice.toString(), '((2d6) # (( + ((5d6) !>= 5)) + (5D66)))');
     });
 
     test('invalid dice str', () {