Updated combinator

packages/code_buffer/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 3.0.1
+
+* Updated README
+
 ## 3.0.0
 
 * Upgraded from `pendantic` to `lints` linter

packages/code_buffer/README.md

@@ -1,6 +1,6 @@
 # Belatuk Code Buffer
 
-[![version](https://img.shields.io/badge/pub-v3.0.0-brightgreen)](https://pub.dartlang.org/packages/belatuk_code_buffer)
+[![version](https://img.shields.io/badge/pub-v3.0.1-brightgreen)](https://pub.dartlang.org/packages/belatuk_code_buffer)
 [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
 [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/belatuk-common-utilities/packages/code_buffer/LICENSE)
 

packages/code_buffer/pubspec.yaml

@@ -1,5 +1,5 @@
 name: belatuk_code_buffer
-version: 3.0.0
+version: 3.0.1
 description: An advanced StringBuffer geared toward generating code, and source maps.
 homepage: https://github.com/dart-backend/belatuk-common-utilities/tree/main/packages/code_buffer
 environment:

packages/combinator/CHANGELOG.md

@@ -4,10 +4,11 @@
 
 * Upgraded from `pendantic` to `lints` linter
 * Published as `belatuk_combinator` package
+* Resolved static analysis warnings
 
 ## 2.0.2
 
-* Resolve static analysis warnings
+* Resolved static analysis warnings
 
 ## 2.0.1
 

packages/combinator/README.md

@@ -4,6 +4,8 @@
 [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
 [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/belatuk-common-utilities/packages/combinator/LICENSE)
 
+**Replacement of `package:combinator` with breaking changes to support NNBD.**
+
 Packrat parser combinators that support static typing, generics, file spans, memoization, and more.
 
 **RECOMMENDED:**

packages/combinator/example/basic_auth.dart

@@ -2,7 +2,7 @@
 
 import 'dart:convert';
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 /// Parse a part of a decoded Basic auth string.
@@ -33,7 +33,7 @@ final Parser credentialString = match<Map<String, String>?>(
   return credentials.parse(scanner).value;
 });
 
-final Parser basic = match<Null>('Basic').space();
+final Parser basic = match<void>('Basic').space();
 
 final Parser basicAuth = basic.then(credentialString).index(1);
 

packages/combinator/example/calculator.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 /// Note: This grammar does not handle precedence, for the sake of simplicity.
@@ -22,7 +22,7 @@ Parser<num> calculatorGrammar() {
     alternatives.add(
       chain<num>([
         expr.space(),
-        match<Null>(op).space() as Parser<num>,
+        match<void>(op).space() as Parser<num>,
         expr.space(),
       ]).map((r) => f(r.value![0], r.value![2])),
     );

packages/combinator/example/delimiter.dart

@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 final Parser<String> id =

packages/combinator/example/json.dart

@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 Parser jsonGrammar() {
@@ -51,13 +51,13 @@ Parser jsonGrammar() {
 }
 
 void main() {
-  var JSON = jsonGrammar();
+  var json = jsonGrammar();
 
   while (true) {
     stdout.write('Enter some JSON: ');
     var line = stdin.readLineSync()!;
     var scanner = SpanScanner(line, sourceUrl: 'stdin');
-    var result = JSON.parse(scanner);
+    var result = json.parse(scanner);
 
     if (!result.successful) {
       for (var error in result.errors) {

packages/combinator/example/main.dart

@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 final Parser minus = match('-');

packages/combinator/example/query_string.dart

@@ -1,7 +1,7 @@
 // For some reason, this cannot be run in checked mode???
 
 import 'dart:io';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 final Parser<String> key =

packages/combinator/example/sexp.dart

@@ -1,7 +1,7 @@
 import 'dart:collection';
 import 'dart:io';
 import 'dart:math';
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 import 'package:tuple/tuple.dart';
 

packages/combinator/example/tuple.dart

@@ -1,4 +1,4 @@
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:string_scanner/string_scanner.dart';
 
 void main() {

packages/combinator/lib/src/combinator/any.dart

@@ -15,7 +15,7 @@ Parser<T> any<T>(Iterable<Parser<T>> parsers,
 class _Any<T> extends Parser<T> {
   final Iterable<Parser<T>> parsers;
   final bool backtrack;
-  final errorMessage;
+  final dynamic errorMessage;
   final SyntaxErrorSeverity severity;
 
   _Any(this.parsers, this.backtrack, this.errorMessage, this.severity);

packages/combinator/lib/src/combinator/combinator.dart

@@ -2,7 +2,7 @@ library lex.src.combinator;
 
 import 'dart:collection';
 
-import 'package:angel3_code_buffer/angel3_code_buffer.dart';
+import 'package:belatuk_code_buffer/belatuk_code_buffer.dart';
 import 'package:matcher/matcher.dart';
 import 'package:source_span/source_span.dart';
 import 'package:string_scanner/string_scanner.dart';

packages/combinator/lib/src/combinator/longest.dart

@@ -34,7 +34,9 @@ class _Longest<T> extends Parser<T> {
 
       if (result.successful && result.span != null) {
         results.add(result);
-      } else if (parser is _Alt) errors.addAll(result.errors);
+      } else if (parser is _Alt) {
+        errors.addAll(result.errors);
+      }
 
       args.scanner.position = replay;
     }
@@ -70,7 +72,9 @@ class _Longest<T> extends Parser<T> {
 
       if (result.successful) {
         results.add(result);
-      } else if (parser is _Alt) errors.addAll(result.errors);
+      } else if (parser is _Alt) {
+        errors.addAll(result.errors);
+      }
 
       args.scanner.position = replay;
     }

packages/combinator/lib/src/combinator/repeat.dart

@@ -28,7 +28,9 @@ class _Repeat<T> extends ListParser<T> {
           results.add(result.value!);
         }
         replay = args.scanner.position;
-      } else if (backtrack) args.scanner.position = replay;
+      } else if (backtrack) {
+        args.scanner.position = replay;
+      }
 
       if (result.span != null) {
         spans.add(result.span!);

packages/combinator/test/list_test.dart

@@ -1,4 +1,4 @@
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 

packages/combinator/test/match_test.dart

@@ -1,4 +1,4 @@
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 

packages/combinator/test/misc_test.dart

@@ -1,4 +1,4 @@
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:matcher/matcher.dart';
 import 'package:test/test.dart';
 import 'common.dart';

packages/combinator/test/value_test.dart

@@ -1,4 +1,4 @@
-import 'package:angel3_combinator/belatuk_combinator.dart';
+import 'package:belatuk_combinator/belatuk_combinator.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 

packages/pub_sub/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 4.0.1
+
+* Updated README
+
 ## 4.0.0
 
 * Upgraded from `pendantic` to `lints` linter

packages/pub_sub/README.md

@@ -1,8 +1,9 @@
 # Belatuk Pub Sub
 
-[![version](https://img.shields.io/badge/pub-v4.0.0-brightgreen)](https://pub.dartlang.org/packages/belatuk_pub_sub)
+[![version](https://img.shields.io/badge/pub-v4.0.1-brightgreen)](https://pub.dartlang.org/packages/belatuk_pub_sub)
 [![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
-[![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dart-backend/belatuk-common-utilities/packages/pub_sub/LICENSE)
+
+**Replacement of `package:pub_sub` with breaking changes to support NNBD.**
 
 Keep application instances in sync with a simple pub/sub API.
 

packages/pub_sub/pubspec.yaml

@@ -1,5 +1,5 @@
 name: belatuk_pub_sub
-version: 4.0.0
+version: 4.0.1
 description: Keep application instances in sync with a simple pub/sub API.
 homepage: https://github.com/dart-backend/belatuk-common-utilities/tree/main/packages/pub_sub
 environment: