Skip to content

Commit 2694ed8

Browse files
steveseastevesea
committed
reformat w/ latest dart fmt
1 parent f36c4b8 commit 2694ed8

File tree

8 files changed

+190
-286
lines changed

8 files changed

+190
-286
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# 8.0.0
22
## ⚠️⚠️ Breaking changes ⚠️⚠️
33

4-
Roll results have changed significantly (again). It's amazing what having users will do to a package!
5-
6-
Rather than the result collection being a simple list of integers, each roll is a
4+
Roll results have changed significantly (again). It's amazing what having users will do to a package!
75

86

97
## 📈 Enhancements
@@ -18,7 +16,7 @@ Rather than the result collection being a simple list of integers, each roll is
1816

1917
## 📈 Enhancements
2018
- upgrade to dart 3.6.0
21-
- add roll notation to support defining your own values. `1d[val1,val2,val3]`
19+
- add roll notation to support defining your own values. `1d[val1,val2,val3]`.
2220
For example, to roll 2 dice of primes under 20, use: `2d[2,3,5,7,11,13,17,19]`
2321

2422

@@ -253,4 +251,3 @@ traverse the graph.
253251
# 0.0.1
254252

255253
- Initial version, created by Steve Christensen
256-

‎example/simple.dart‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,14 @@ Future<void> main() async {
3636

3737
// demonstrate navigation of the result graph
3838
assert(result2.total == 39);
39-
assert(
40-
listEquals(
41-
result2.results,
42-
[20, 19],
43-
),
44-
);
39+
assert(listEquals(result2.results, [20, 19]));
4540
// read the score-related properties
4641
assert(!result2.hasSuccesses);
4742
assert(!result2.hasFailures);
4843
assert(!result2.hasCritFailures);
4944
assert(result2.hasCritSuccesses);
5045
assert(result2.metadata.score.critSuccessCount == 1);
51-
assert(
52-
listEquals(
53-
result2.metadata.score.critSuccesses,
54-
[20],
55-
),
56-
);
46+
assert(listEquals(result2.metadata.score.critSuccesses, [20]));
5747

5848
// look at the expression tree :
5949
// ((((4d20) kh 2) #cf ) #cs ) ===> RollSummary(total: 39, results: [20, 19], metadata: {rolled: [1, 12, 19, 20], discarded: [12, 1], score: {critSuccesses: [20]}})
@@ -65,40 +55,20 @@ Future<void> main() async {
6555
final top = result2.detailedResults;
6656
assert(top.opType == OpType.count);
6757
assert(
68-
top.metadata ==
69-
const RollMetadata(
70-
score: RollScore(
71-
critSuccesses: [20],
72-
),
73-
),
58+
top.metadata == const RollMetadata(score: RollScore(critSuccesses: [20])),
7459
);
7560
// next level is the count critical failures node of the graph
7661
// NOTE: despite there being a 1 rolled, the criticalFailure expression is _after_ the `1` is discarded by the lower expression
7762
assert(top.left!.opType == OpType.count);
7863
assert(top.left!.metadata.score.hasCritFailures == false);
7964

8065
assert(top.left!.left!.opType == OpType.drop);
81-
assert(
82-
listEquals(
83-
top.left!.left!.metadata.discarded,
84-
[12, 1],
85-
),
86-
);
66+
assert(listEquals(top.left!.left!.metadata.discarded, [12, 1]));
8767

8868
assert(top.left!.left!.left!.opType == OpType.rollDice);
8969

90-
assert(
91-
listEquals(
92-
top.left!.left!.left!.results,
93-
[1, 12, 19, 20],
94-
),
95-
);
96-
assert(
97-
listEquals(
98-
top.left!.left!.left!.metadata.rolled,
99-
[1, 12, 19, 20],
100-
),
101-
);
70+
assert(listEquals(top.left!.left!.left!.results, [1, 12, 19, 20]));
71+
assert(listEquals(top.left!.left!.left!.metadata.rolled, [1, 12, 19, 20]));
10272

10373
final stats = await DiceExpression.create('2d6', Random(1234)).stats();
10474
// output:

‎lib/src/ast.dart‎

Lines changed: 37 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ const defaultRerollLimit = 1000;
1313
/// it must parse as an int, and an empty string will return empty set.
1414
class SimpleValue extends DiceExpression {
1515
SimpleValue(this.value)
16-
: _results = RollResult(
17-
expression: value,
18-
opType: OpType.value,
19-
results: value.isEmpty ? [] : [int.parse(value)],
20-
);
16+
: _results = RollResult(
17+
expression: value,
18+
opType: OpType.value,
19+
results: value.isEmpty ? [] : [int.parse(value)],
20+
);
2121

2222
final String value;
2323
final RollResult _results;
@@ -121,30 +121,28 @@ class CountOp extends Binary {
121121
final rhs = right();
122122

123123
var rhsEmptyAndSimpleCount = false;
124-
final target = rhs.totalOrDefault(
125-
() {
126-
// if missing RHS, we can make assumptions depending on operator.
127-
//
128-
switch (name) {
129-
case '#':
130-
// example: '3d6#' should be 3. target is ignored in case statement below.
131-
rhsEmptyAndSimpleCount = true;
132-
return 0;
133-
case '#s' || '#cs':
134-
// example: '3d6#s' -- assume target is nsides (maximum)
135-
return lhs.nsides;
136-
case '#f' || '#cf':
137-
// example: '3d6#f' -- assume target is 1 (minimum)
138-
return 1;
139-
default:
140-
throw FormatException(
141-
'Invalid count operation. Missing count target',
142-
toString(),
143-
toString().length,
144-
);
145-
}
146-
},
147-
);
124+
final target = rhs.totalOrDefault(() {
125+
// if missing RHS, we can make assumptions depending on operator.
126+
//
127+
switch (name) {
128+
case '#':
129+
// example: '3d6#' should be 3. target is ignored in case statement below.
130+
rhsEmptyAndSimpleCount = true;
131+
return 0;
132+
case '#s' || '#cs':
133+
// example: '3d6#s' -- assume target is nsides (maximum)
134+
return lhs.nsides;
135+
case '#f' || '#cf':
136+
// example: '3d6#f' -- assume target is 1 (minimum)
137+
return 1;
138+
default:
139+
throw FormatException(
140+
'Invalid count operation. Missing count target',
141+
toString(),
142+
toString().length,
143+
);
144+
}
145+
});
148146
bool test(int v) {
149147
switch (name) {
150148
case '#>=' || '#s>=' || '#f>=' || '#cs>=' || '#cf>=':
@@ -189,9 +187,7 @@ class CountOp extends Binary {
189187
return RollResult(
190188
expression: toString(),
191189
opType: OpType.count,
192-
metadata: RollMetadata(
193-
discarded: lhs.results,
194-
),
190+
metadata: RollMetadata(discarded: lhs.results),
195191
results: [filteredResults.length],
196192
ndice: lhs.ndice,
197193
nsides: lhs.nsides,
@@ -266,9 +262,7 @@ class DropOp extends Binary {
266262
ndice: lhs.ndice,
267263
nsides: lhs.nsides,
268264
results: results,
269-
metadata: RollMetadata(
270-
discarded: dropped,
271-
),
265+
metadata: RollMetadata(discarded: dropped),
272266
left: lhs,
273267
right: rhs,
274268
);
@@ -316,9 +310,7 @@ class DropHighLowOp extends Binary {
316310
ndice: lhs.ndice,
317311
nsides: lhs.nsides,
318312
results: results,
319-
metadata: RollMetadata(
320-
discarded: dropped,
321-
),
313+
metadata: RollMetadata(discarded: dropped),
322314
left: lhs,
323315
right: rhs,
324316
);
@@ -378,10 +370,7 @@ class ClampOp extends Binary {
378370
ndice: lhs.ndice,
379371
nsides: lhs.nsides,
380372
results: results,
381-
metadata: RollMetadata(
382-
discarded: discarded,
383-
rolled: added,
384-
),
373+
metadata: RollMetadata(discarded: discarded, rolled: added),
385374
left: lhs,
386375
right: rhs,
387376
);
@@ -427,9 +416,7 @@ class FudgeDice extends UnaryDice {
427416
roll,
428417
expression: toString(),
429418
opType: roll.opType,
430-
metadata: RollMetadata(
431-
rolled: roll.results,
432-
),
419+
metadata: RollMetadata(rolled: roll.results),
433420
left: lhs,
434421
);
435422
}
@@ -473,9 +460,7 @@ class PercentDice extends UnaryDice {
473460
roll,
474461
expression: toString(),
475462
opType: OpType.rollPercent,
476-
metadata: RollMetadata(
477-
rolled: roll.results,
478-
),
463+
metadata: RollMetadata(rolled: roll.results),
479464
left: lhs,
480465
);
481466
}
@@ -498,9 +483,7 @@ class D66Dice extends UnaryDice {
498483
opType: OpType.rollD66,
499484
ndice: ndice,
500485
results: results,
501-
metadata: RollMetadata(
502-
rolled: results,
503-
),
486+
metadata: RollMetadata(rolled: results),
504487
left: lhs,
505488
);
506489
}
@@ -540,9 +523,7 @@ class StdDice extends BinaryDice {
540523
roll,
541524
expression: toString(),
542525
opType: roll.opType,
543-
metadata: RollMetadata(
544-
rolled: roll.results,
545-
),
526+
metadata: RollMetadata(rolled: roll.results),
546527
left: lhs,
547528
right: rhs,
548529
);
@@ -633,10 +614,7 @@ class RerollDice extends BinaryDice {
633614
ndice: lhs.ndice,
634615
nsides: lhs.nsides,
635616
results: results,
636-
metadata: RollMetadata(
637-
rolled: added,
638-
discarded: discarded,
639-
),
617+
metadata: RollMetadata(rolled: added, discarded: discarded),
640618
left: lhs,
641619
right: rhs,
642620
);
@@ -722,10 +700,7 @@ class CompoundingDice extends BinaryDice {
722700
ndice: lhs.ndice,
723701
nsides: lhs.nsides,
724702
results: results,
725-
metadata: RollMetadata(
726-
rolled: added,
727-
discarded: discarded,
728-
),
703+
metadata: RollMetadata(rolled: added, discarded: discarded),
729704
left: lhs,
730705
right: rhs,
731706
);

‎lib/src/dice_expression.dart‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ abstract class DiceExpression {
1414
static List<Function(RollResult)> listeners = [defaultListener];
1515
static List<Function(RollSummary)> summaryListeners = [];
1616

17-
static void registerListener(
18-
Function(RollResult rollResult) callback,
19-
) {
17+
static void registerListener(Function(RollResult rollResult) callback) {
2018
listeners.add(callback);
2119
}
2220

@@ -58,10 +56,7 @@ abstract class DiceExpression {
5856
/// Parse the given input into a DiceExpression
5957
///
6058
/// Throws [FormatException] if invalid
61-
static DiceExpression create(
62-
String input, [
63-
Random? random,
64-
]) {
59+
static DiceExpression create(String input, [Random? random]) {
6560
final builder = parserBuilder(DiceRoller(random));
6661
final result = builder.parse(input);
6762
if (result is Failure) {
@@ -108,9 +103,7 @@ abstract class DiceExpression {
108103
/// Performs [num] rolls and outputs stats (stddev, mean, min/max, and a histogram)
109104
///
110105
/// Throws [FormatException]
111-
Future<Map<String, dynamic>> stats({
112-
int num = 1000,
113-
}) async {
106+
Future<Map<String, dynamic>> stats({int num = 1000}) async {
114107
final stats = StatsCollector();
115108

116109
await for (final r in rollN(num)) {

‎lib/src/dice_roller.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class DiceRoller with LoggingMixin {
4949

5050
/// select n items from the list of values
5151
List<T> selectN<T>(int n, List<T> vals) => [
52-
for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)],
53-
];
52+
for (var i = 0; i < n; i++) vals[_random.nextInt(vals.length)],
53+
];
5454

5555
/// Roll N fudge dice, return results
5656
RollResult rollFudge(int ndice) {

0 commit comments

Comments
 (0)