mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated combinator

Browse source
This commit is contained in:
thomashii@dukefirehawk.com 2021-05-07 13:10:24 +08:00
parent c2c9e40836
commit f749264fbe
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/combinator/lib/src/combinator/combinator.dart
View file

@ -123,7 +123,7 @@ abstract class Parser<T> {
/// Removes multiple errors that occur in the same spot; this can reduce noise in parser output. /// Removes multiple errors that occur in the same spot; this can reduce noise in parser output.
Parser<T> foldErrors({bool equal(SyntaxError a, SyntaxError b)?}) { Parser<T> foldErrors({bool equal(SyntaxError a, SyntaxError b)?}) {
equal ??= (b, e) => b.span!.start.offset == e.span!.start.offset; equal ??= (b, e) => b.span?.start.offset == e.span?.start.offset;
return _FoldErrors<T>(this, equal); return _FoldErrors<T>(this, equal);
} }
@ -308,10 +308,10 @@ abstract class ListParser<T> extends Parser<List<T>> {
/// Modifies this parser, returning only the values that match a predicate. /// Modifies this parser, returning only the values that match a predicate.
Parser<List<T>> where(bool Function(T) f) => Parser<List<T>> where(bool Function(T) f) =>
map<List<T>>((r) => r.value!.where(f).toList()); map<List<T>>((r) => r.value?.where(f).toList() ?? []);
/// Condenses a [ListParser] into having a value of the combined span's text. /// Condenses a [ListParser] into having a value of the combined span's text.
Parser<String> flatten() => map<String>((r) => r.span!.text); Parser<String> flatten() => map<String>((r) => r.span?.text ?? '');
} }
/// Prevents stack overflow in recursive parsers. /// Prevents stack overflow in recursive parsers.
@ -325,7 +325,7 @@ class Trampoline {
} }
ParseResult<T> getMemoized<T>(Parser parser, int position) { ParseResult<T> getMemoized<T>(Parser parser, int position) {
return _memo[parser]!.firstWhere((t) => t.item1 == position).item2 return _memo[parser]?.firstWhere((t) => t.item1 == position).item2
as ParseResult<T>; as ParseResult<T>;
} }
@ -350,7 +350,7 @@ class Trampoline {
} }
void exit(Parser parser) { void exit(Parser parser) {
if (_active.containsKey(parser)) _active[parser]!.removeFirst(); if (_active.containsKey(parser)) _active[parser]?.removeFirst();
} }
} }