Add CBOR diagnostic files for ease of code review

Fixes #656 This adds a human-readable `.diag` file containing the CBOR diagnostic representation for the corresponding `.dhallb` file, for ease of reviewing changes to encoded expressions. This also adds: * A new `./scripts/generate-diagnostic-files.sh` script for keeping the `*.diag` files up-to-date * A new CI check to ensure the contributor hasn't forgotten to update those files This also removes the `./tests/diff-binary.sh` script since it's no longer necessary.
dhall-lang · Jul 21, 2019 · bf56899 · bf56899
1 parent 40fce66
commit bf56899
Show file tree

Hide file tree

Showing 212 changed files with 242 additions and 49 deletions.
diff --git a/release.nix b/release.nix
@@ -3,9 +3,9 @@
 let
   nixpkgs =
     builtins.fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/804060ff9a79ceb0925fe9ef79ddbf564a225d47.tar.gz";
+      url = "https://github.com/NixOS/nixpkgs/archive/55b8860aa209e987f6f15c523811e4861d97d6af.tar.gz";
 
-      sha256 = "0ga345hgw6v2kzyhvf5kw96hf60mx5pbd9c4qj5q4nan4lr7nkxn";
+      sha256 = "0ri58704vwv6gnyw33vjirgnvh2f1201vbflk0ydj5ff7vpyy7hf";
     };
 
   overlay = pkgsNew: pkgsOld: {
@@ -62,6 +62,17 @@ let
           touch $out
         '';
 
+    expected-diagnostic-files =
+      pkgsNew.runCommand "expected-diagnostic-files" {} ''
+        ${pkgsNew.rsync}/bin/rsync --archive ${./tests}/ "$out"
+
+        ${pkgsNew.coreutils}/bin/chmod --recursive u+w "$out"
+
+        for FILE in $(${pkgsNew.findutils}/bin/find "$out" -type f -name '*.dhallb'); do
+          ${pkgsNew.cbor-diag}/bin/cbor2diag.rb "$FILE" > "''${FILE%.dhallb}.diag"
+        done
+      '';
+
     expected-prelude = pkgsNew.runCommand "expected-prelude" {} ''
       ${pkgsNew.rsync}/bin/rsync --archive ${./Prelude}/ "$out"
 
@@ -73,6 +84,15 @@ let
       done
     '';
 
+    diagnostic-files-lint = pkgsNew.runCommand "diagnostic-files-lint" {} ''
+      ${pkgsNew.rsync}/bin/rsync --archive ${pkgsNew.expected-diagnostic-files}/ ./tests.expected
+      ${pkgsNew.rsync}/bin/rsync --archive ${./tests}/ ./tests.actual
+
+      ${pkgsNew.diffutils}/bin/diff --recursive ./tests.{actual,expected}
+
+      touch $out
+    '';
+
     prelude-lint = pkgsNew.runCommand "prelude-lint" {} ''
       ${pkgsNew.rsync}/bin/rsync --archive ${pkgsNew.expected-prelude}/ ./Prelude.expected
       ${pkgsNew.rsync}/bin/rsync --archive ${./Prelude}/ ./Prelude.actual
@@ -114,9 +134,10 @@ in
         pkgs.dhall-grammar
         pkgs.ensure-trailing-newlines
         pkgs.prelude-lint
+        pkgs.diagnostic-files-lint
         rev
       ];
     };
 
-    inherit (pkgs) expected-prelude;
+    inherit (pkgs) expected-prelude expected-diagnostic-files;
   }
diff --git a/scripts/generate-diagnostic-files.sh b/scripts/generate-diagnostic-files.sh
@@ -0,0 +1,5 @@
+set -eu
+
+nix build --file ./release.nix expected-diagnostic-files
+rsync --archive --checksum --delete result/ ./tests
+chmod -R u+w ./tests
diff --git a/tests/README.md b/tests/README.md
@@ -58,9 +58,11 @@ Where `A` and `B` are:
 - `A`: a Dhall expression as text
 - `B`: the binary representation of the Dhall-CBOR-encoded expression
 
-*Note*: since the tests are binary-encoded, they are not the friendliest to debug.  
-For this reason, you might want to look at the `diff-binary.sh` script to help
-with the debugging.
+*Note*: Each `B.dhallb` file has a matching `B.diag` file containing the
+CBOR diagnostic notation for the encoded expression.  You can generate
+the `.diag` file using the `./scripts/generate-diagnostic-files.sh` script
+and our continuous integration will remind you to do so (by failing if you
+don't keep the diagnostic file up-to-date).
 
 ### Running `normalization` tests
 

diff --git a/tests/binary-decode/failure/unit/ApplyNoArgs.diag b/tests/binary-decode/failure/unit/ApplyNoArgs.diag
@@ -0,0 +1 @@
+[0, ["f", 0]]
diff --git a/tests/binary-decode/failure/unit/LambdaExplicitlyNamedUnderscore.diag b/tests/binary-decode/failure/unit/LambdaExplicitlyNamedUnderscore.diag
@@ -0,0 +1 @@
+[1, "_", 0, 0]
diff --git a/tests/binary-decode/failure/unit/ListOneWithAnnotation.diag b/tests/binary-decode/failure/unit/ListOneWithAnnotation.diag
@@ -0,0 +1 @@
+[4, 0, 0]
diff --git a/tests/binary-decode/failure/unit/NaturalNegativeOne.diag b/tests/binary-decode/failure/unit/NaturalNegativeOne.diag
@@ -0,0 +1 @@
+[15, -1]
diff --git a/tests/binary-decode/failure/unit/OperatorOrTooFewArgs.diag b/tests/binary-decode/failure/unit/OperatorOrTooFewArgs.diag
@@ -0,0 +1 @@
+[3, 0, 0]
diff --git a/tests/binary-decode/failure/unit/OperatorOrTooManyArgs.diag b/tests/binary-decode/failure/unit/OperatorOrTooManyArgs.diag
@@ -0,0 +1 @@
+[3, 0, 0, 0, 0]
diff --git a/tests/binary-decode/failure/unit/OperatorUnknownOpcode.diag b/tests/binary-decode/failure/unit/OperatorUnknownOpcode.diag
@@ -0,0 +1 @@
+[3, 12, 0, 0]
diff --git a/tests/binary-decode/failure/unit/PiExplicitlyNamedUnderscore.diag b/tests/binary-decode/failure/unit/PiExplicitlyNamedUnderscore.diag
@@ -0,0 +1 @@
+[2, "_", 0, 0]
diff --git a/tests/binary-decode/failure/unit/VariableExplicitlyNamedUnderscore.diag b/tests/binary-decode/failure/unit/VariableExplicitlyNamedUnderscore.diag
@@ -0,0 +1 @@
+["_", 0]
diff --git a/tests/binary-decode/success/unit/AnnotationA.diag b/tests/binary-decode/success/unit/AnnotationA.diag
@@ -0,0 +1 @@
+[26, [15, 5], "Natural"]
diff --git a/tests/binary-decode/success/unit/ApplicationA.diag b/tests/binary-decode/success/unit/ApplicationA.diag
@@ -0,0 +1 @@
+[0, "Natural/show", 0]
diff --git a/tests/binary-decode/success/unit/ApplicationMultipleA.diag b/tests/binary-decode/success/unit/ApplicationMultipleA.diag
@@ -0,0 +1 @@
+[0, ["f", 0], ["x", 0], ["y", 0], ["z", 0]]
diff --git a/tests/binary-decode/success/unit/BoolFalseA.diag b/tests/binary-decode/success/unit/BoolFalseA.diag
@@ -0,0 +1 @@
+false
diff --git a/tests/binary-decode/success/unit/BoolIfA.diag b/tests/binary-decode/success/unit/BoolIfA.diag
@@ -0,0 +1 @@
+[14, true, ["x", 0], ["y", 0]]
diff --git a/tests/binary-decode/success/unit/BoolTrueA.diag b/tests/binary-decode/success/unit/BoolTrueA.diag
@@ -0,0 +1 @@
+true
diff --git a/tests/binary-decode/success/unit/BuiltinNaturalShowA.diag b/tests/binary-decode/success/unit/BuiltinNaturalShowA.diag
@@ -0,0 +1 @@
+"Natural/show"
diff --git a/tests/binary-decode/success/unit/DoubleDoubleA.diag b/tests/binary-decode/success/unit/DoubleDoubleA.diag
@@ -0,0 +1 @@
+2.0
diff --git a/tests/binary-decode/success/unit/DoubleHalfA.diag b/tests/binary-decode/success/unit/DoubleHalfA.diag
@@ -0,0 +1 @@
+1.0
diff --git a/tests/binary-decode/success/unit/DoubleInfinityA.diag b/tests/binary-decode/success/unit/DoubleInfinityA.diag
@@ -0,0 +1 @@
+Infinity
diff --git a/tests/binary-decode/success/unit/DoubleNegativeInfinityA.diag b/tests/binary-decode/success/unit/DoubleNegativeInfinityA.diag
@@ -0,0 +1 @@
+-Infinity
diff --git a/tests/binary-decode/success/unit/DoubleSingleA.diag b/tests/binary-decode/success/unit/DoubleSingleA.diag
@@ -0,0 +1 @@
+2.0
diff --git a/tests/binary-decode/success/unit/IntegerNegativeOneA.diag b/tests/binary-decode/success/unit/IntegerNegativeOneA.diag
@@ -0,0 +1 @@
+[16, -1]
diff --git a/tests/binary-decode/success/unit/IntegerZeroA.diag b/tests/binary-decode/success/unit/IntegerZeroA.diag
@@ -0,0 +1 @@
+[16, 0]
diff --git a/tests/binary-decode/success/unit/LambdaNamedXA.diag b/tests/binary-decode/success/unit/LambdaNamedXA.diag
@@ -0,0 +1 @@
+[1, "x", 0, ["x", 0]]
diff --git a/tests/binary-decode/success/unit/LambdaUnderscoreA.diag b/tests/binary-decode/success/unit/LambdaUnderscoreA.diag
@@ -0,0 +1 @@
+[1, "Natural", 0]
diff --git a/tests/binary-decode/success/unit/LetMultipleA.diag b/tests/binary-decode/success/unit/LetMultipleA.diag
@@ -0,0 +1 @@
+[25, "x", "Natural", [15, 1], "y", null, [15, 2], ["x", 0]]
diff --git a/tests/binary-decode/success/unit/LetOneTypedA.diag b/tests/binary-decode/success/unit/LetOneTypedA.diag
@@ -0,0 +1 @@
+[25, "x", "Natural", [15, 1], ["x", 0]]
diff --git a/tests/binary-decode/success/unit/LetOneUntypedA.diag b/tests/binary-decode/success/unit/LetOneUntypedA.diag
@@ -0,0 +1 @@
+[25, "x", null, [15, 1], ["x", 0]]
diff --git a/tests/binary-decode/success/unit/ListEmptyA.diag b/tests/binary-decode/success/unit/ListEmptyA.diag
@@ -0,0 +1 @@
+[4, "Natural"]
diff --git a/tests/binary-decode/success/unit/ListOneA.diag b/tests/binary-decode/success/unit/ListOneA.diag
@@ -0,0 +1 @@
+[4, null, 0]
diff --git a/tests/binary-decode/success/unit/MergeAnnotatedA.diag b/tests/binary-decode/success/unit/MergeAnnotatedA.diag
@@ -0,0 +1 @@
+[6, 0, 1, 2]
diff --git a/tests/binary-decode/success/unit/MergeUnannotatedA.diag b/tests/binary-decode/success/unit/MergeUnannotatedA.diag
@@ -0,0 +1 @@
+[6, 0, 1]
diff --git a/tests/binary-decode/success/unit/NaturalTwentyFourA.diag b/tests/binary-decode/success/unit/NaturalTwentyFourA.diag
@@ -0,0 +1 @@
+[15, 24]
diff --git a/tests/binary-decode/success/unit/NaturalZeroA.diag b/tests/binary-decode/success/unit/NaturalZeroA.diag
@@ -0,0 +1 @@
+[15, 0]
diff --git a/tests/binary-decode/success/unit/OperatorAndA.diag b/tests/binary-decode/success/unit/OperatorAndA.diag
@@ -0,0 +1 @@
+[3, 1, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorCombineA.diag b/tests/binary-decode/success/unit/OperatorCombineA.diag
@@ -0,0 +1 @@
+[3, 8, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorCombineTypesA.diag b/tests/binary-decode/success/unit/OperatorCombineTypesA.diag
@@ -0,0 +1 @@
+[3, 10, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorEqA.diag b/tests/binary-decode/success/unit/OperatorEqA.diag
@@ -0,0 +1 @@
+[3, 2, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorImportAltA.diag b/tests/binary-decode/success/unit/OperatorImportAltA.diag
@@ -0,0 +1 @@
+[3, 11, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorListAppendA.diag b/tests/binary-decode/success/unit/OperatorListAppendA.diag
@@ -0,0 +1 @@
+[3, 7, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorNeqA.diag b/tests/binary-decode/success/unit/OperatorNeqA.diag
@@ -0,0 +1 @@
+[3, 3, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorOrA.diag b/tests/binary-decode/success/unit/OperatorOrA.diag
@@ -0,0 +1 @@
+[3, 0, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorPlusA.diag b/tests/binary-decode/success/unit/OperatorPlusA.diag
@@ -0,0 +1 @@
+[3, 4, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorPreferA.diag b/tests/binary-decode/success/unit/OperatorPreferA.diag
@@ -0,0 +1 @@
+[3, 9, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorTextAppendA.diag b/tests/binary-decode/success/unit/OperatorTextAppendA.diag
@@ -0,0 +1 @@
+[3, 6, 0, 1]
diff --git a/tests/binary-decode/success/unit/OperatorTimesA.diag b/tests/binary-decode/success/unit/OperatorTimesA.diag
@@ -0,0 +1 @@
+[3, 5, 0, 1]
diff --git a/tests/binary-decode/success/unit/PiNamedXA.diag b/tests/binary-decode/success/unit/PiNamedXA.diag
@@ -0,0 +1 @@
+[2, "x", "Natural", 0]
diff --git a/tests/binary-decode/success/unit/PiUnderscoreA.diag b/tests/binary-decode/success/unit/PiUnderscoreA.diag
@@ -0,0 +1 @@
+[2, "Natural", "Text"]
diff --git a/tests/binary-decode/success/unit/RecordFieldAccessA.diag b/tests/binary-decode/success/unit/RecordFieldAccessA.diag
@@ -0,0 +1 @@
+[9, 0, "x"]
diff --git a/tests/binary-decode/success/unit/RecordLiteralA.diag b/tests/binary-decode/success/unit/RecordLiteralA.diag
@@ -0,0 +1 @@
+[8, {"x": "Natural", "y": "Bool"}]
diff --git a/tests/binary-decode/success/unit/RecordProjectFieldsA.diag b/tests/binary-decode/success/unit/RecordProjectFieldsA.diag
@@ -0,0 +1 @@
+[10, ["r", 0], "x", "y", "z"]
diff --git a/tests/binary-decode/success/unit/RecordTypeA.diag b/tests/binary-decode/success/unit/RecordTypeA.diag
@@ -0,0 +1 @@
+[7, {"x": "Natural", "y": "Bool"}]
diff --git a/tests/binary-decode/success/unit/SelfDescribeCBORX2A.diag b/tests/binary-decode/success/unit/SelfDescribeCBORX2A.diag
@@ -0,0 +1 @@
+["x", 55799(0)]
diff --git a/tests/binary-decode/success/unit/SelfDescribeCBORX3A.diag b/tests/binary-decode/success/unit/SelfDescribeCBORX3A.diag
@@ -0,0 +1 @@
+[55799("x"), 0]
diff --git a/tests/binary-decode/success/unit/SelfDescribeCBORXA.diag b/tests/binary-decode/success/unit/SelfDescribeCBORXA.diag
@@ -0,0 +1 @@
+55799(["x", 0])
diff --git a/tests/binary-decode/success/unit/SomeA.diag b/tests/binary-decode/success/unit/SomeA.diag
@@ -0,0 +1 @@
+[5, null, 0]
diff --git a/tests/binary-decode/success/unit/TextInterpolatedA.diag b/tests/binary-decode/success/unit/TextInterpolatedA.diag
@@ -0,0 +1 @@
+[18, "foo", 0, "bar"]
diff --git a/tests/binary-decode/success/unit/TextSimpleA.diag b/tests/binary-decode/success/unit/TextSimpleA.diag
@@ -0,0 +1 @@
+[18, "foo"]
diff --git a/tests/binary-decode/success/unit/UnionTypeA.diag b/tests/binary-decode/success/unit/UnionTypeA.diag
@@ -0,0 +1 @@
+[11, {"x": "Natural", "y": null}]
diff --git a/tests/binary-decode/success/unit/VariableNamedA.diag b/tests/binary-decode/success/unit/VariableNamedA.diag
@@ -0,0 +1 @@
+["x", 1]
diff --git a/tests/binary-decode/success/unit/VariableNamedOversizedIntA.diag b/tests/binary-decode/success/unit/VariableNamedOversizedIntA.diag
@@ -0,0 +1 @@
+["x", 1]
diff --git a/tests/binary-decode/success/unit/VariableUnderscoreA.diag b/tests/binary-decode/success/unit/VariableUnderscoreA.diag
@@ -0,0 +1 @@
+4
diff --git a/tests/binary-decode/success/unit/VariableUnderscoreOversizedIntA.diag b/tests/binary-decode/success/unit/VariableUnderscoreOversizedIntA.diag
@@ -0,0 +1 @@
+1
diff --git a/tests/binary-decode/success/unit/imports/EnvironmentVariableA.diag b/tests/binary-decode/success/unit/imports/EnvironmentVariableA.diag
@@ -0,0 +1 @@
+[24, null, 0, 6, "FOO"]
diff --git a/tests/binary-decode/success/unit/imports/HttpImportWithQueryA.diag b/tests/binary-decode/success/unit/imports/HttpImportWithQueryA.diag
@@ -0,0 +1 @@
+[24, null, 0, 0, null, "foo:bar@baz:123", "path1", "path2", "query"]
diff --git a/tests/binary-decode/success/unit/imports/HttpImportWithoutQueryA.diag b/tests/binary-decode/success/unit/imports/HttpImportWithoutQueryA.diag
@@ -0,0 +1 @@
+[24, null, 0, 0, null, "foo:bar@baz:123", "path1", "path2", null]
diff --git a/tests/binary-decode/success/unit/imports/HttpsImportWithEmptyQueryA.diag b/tests/binary-decode/success/unit/imports/HttpsImportWithEmptyQueryA.diag
@@ -0,0 +1 @@
+[24, null, 0, 1, null, "foo:bar@baz:123", "path1", "path2", ""]
diff --git a/tests/binary-decode/success/unit/imports/HttpsImportWithQueryA.diag b/tests/binary-decode/success/unit/imports/HttpsImportWithQueryA.diag
@@ -0,0 +1 @@
+[24, null, 0, 1, null, "foo:bar@baz:123", "path1", "path2", "query"]
diff --git a/tests/binary-decode/success/unit/imports/HttpsImportWithTrickyPathCharsA.diag b/tests/binary-decode/success/unit/imports/HttpsImportWithTrickyPathCharsA.diag
@@ -0,0 +1 @@
+[24, null, 0, 1, null, "authority", "path/with?funny-characters", null]
diff --git a/tests/binary-decode/success/unit/imports/HttpsImportWithTrickyQueryCharsA.diag b/tests/binary-decode/success/unit/imports/HttpsImportWithTrickyQueryCharsA.diag
@@ -0,0 +1 @@
+[24, null, 0, 1, null, "authority", "path", "a%23b%5Bc"]
diff --git a/tests/binary-decode/success/unit/imports/HttpsImportWithoutQueryA.diag b/tests/binary-decode/success/unit/imports/HttpsImportWithoutQueryA.diag
@@ -0,0 +1 @@
+[24, null, 0, 1, null, "foo:bar@baz:123", "path1", "path2", null]
diff --git a/tests/binary-decode/success/unit/imports/LocalHereImportA.diag b/tests/binary-decode/success/unit/imports/LocalHereImportA.diag
@@ -0,0 +1 @@
+[24, null, 0, 3, "path0", "path1", "path2", "file"]
diff --git a/tests/binary-decode/success/unit/imports/LocalHomeImportA.diag b/tests/binary-decode/success/unit/imports/LocalHomeImportA.diag
@@ -0,0 +1 @@
+[24, null, 0, 5, "path0", "path1", "path2", "file"]
diff --git a/tests/binary-decode/success/unit/imports/LocalParentImportA.diag b/tests/binary-decode/success/unit/imports/LocalParentImportA.diag
@@ -0,0 +1 @@
+[24, null, 0, 4, "path0", "path1", "path2", "file"]
diff --git a/tests/binary-decode/success/unit/imports/LocalRootImportA.diag b/tests/binary-decode/success/unit/imports/LocalRootImportA.diag
@@ -0,0 +1 @@
+[24, null, 0, 2, "path0", "path1", "path2", "file"]
diff --git a/tests/binary-decode/success/unit/imports/MissingA.diag b/tests/binary-decode/success/unit/imports/MissingA.diag
@@ -0,0 +1 @@
+[24, null, 0, 7]
diff --git a/tests/binary-decode/success/unit/recordProjectionByExpressionA.diag b/tests/binary-decode/success/unit/recordProjectionByExpressionA.diag
@@ -0,0 +1 @@
+[10, [8, {"a": [15, 1], "b": [15, 2]}], [[7, {"a": "Natural"}]]]
diff --git a/tests/diff-binary.sh b/tests/diff-binary.sh
diff --git a/tests/parser/success/annotationsB.diag b/tests/parser/success/annotationsB.diag
@@ -0,0 +1 @@
+[26, [3, 7, [3, 7, [4, "Natural"], [4, null, [15, 1], [15, 2], [15, 3]]], [26, [4, null, [15, 1], [15, 2], [15, 3]], [0, "List", "Natural"]]], [0, "List", "Natural"]]
diff --git a/tests/parser/success/blockCommentB.diag b/tests/parser/success/blockCommentB.diag
@@ -0,0 +1 @@
+[15, 1]
diff --git a/tests/parser/success/builtinNameAsFieldB.diag b/tests/parser/success/builtinNameAsFieldB.diag
@@ -0,0 +1 @@
+[25, "Prelude", null, [24, null, 0, 1, null, "prelude.dhall-lang.org", "package.dhall", null], [9, [9, ["Prelude", 0], "List"], "map"]]
diff --git a/tests/parser/success/builtinsB.diag b/tests/parser/success/builtinsB.diag
@@ -0,0 +1 @@
+[1, "x", [7, {"field0": "Bool", "field1": [0, "Optional", [0, "Optional", "Bool"]], "field2": "Natural", "field3": "Integer", "field4": "Double", "field5": "Text", "field6": [0, "List", [0, "List", "Bool"]]}], [8, {"field00": "Natural/fold", "field01": "Natural/build", "field02": "Natural/isZero", "field03": "Natural/even", "field04": "Natural/odd", "field05": "Natural/toInteger", "field06": "Natural/show", "field07": "Integer/show", "field08": "Double/show", "field09": "List/build", "field10": "List/fold", "field11": "List/length", "field12": "List/head", "field13": "List/last", "field14": "List/indexed", "field15": "List/reverse", "field16": "Optional/fold", "field17": "Optional/build", "field18": true, "field19": false, "field20": "None"}]]
diff --git a/tests/parser/success/collectionImportTypeB.diag b/tests/parser/success/collectionImportTypeB.diag
@@ -0,0 +1 @@
+[8, {"example0": [0, "None", [24, null, 0, 3, "type.dhall"]], "example1": [4, [24, null, 0, 3, "type.dhall"]]}]
diff --git a/tests/parser/success/doubleB.diag b/tests/parser/success/doubleB.diag
@@ -0,0 +1 @@
+[4, null, 1.1, -1.1, 10.0, 11.0, NaN, Infinity, -Infinity, 0.0]
diff --git a/tests/parser/success/fieldsB.diag b/tests/parser/success/fieldsB.diag
@@ -0,0 +1 @@
+[9, [9, [9, [8, {"foo": [8, {"bar": [8, {"baz": [15, 1]}]}]}], "foo"], "bar"], "baz"]
diff --git a/tests/parser/success/forallB.diag b/tests/parser/success/forallB.diag
@@ -0,0 +1 @@
+[2, "a", "Type", [2, "b", "Type", ["a", 0]]]
diff --git a/tests/parser/success/functionTypeB.diag b/tests/parser/success/functionTypeB.diag
@@ -0,0 +1 @@
+[2, "Bool", [2, "Bool", "Bool"]]
diff --git a/tests/parser/success/identifierB.diag b/tests/parser/success/identifierB.diag
@@ -0,0 +1 @@
+[1, "a", "Type", [1, "a", "Type", ["a", 1]]]
diff --git a/tests/parser/success/ifThenElseB.diag b/tests/parser/success/ifThenElseB.diag
@@ -0,0 +1 @@
+[14, true, [15, 1], [15, 2]]
diff --git a/tests/parser/success/labelB.diag b/tests/parser/success/labelB.diag
@@ -0,0 +1 @@
+[25, "_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-/", null, [15, 1], ["_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-/", 0]]
diff --git a/tests/parser/success/lambdaB.diag b/tests/parser/success/lambdaB.diag
@@ -0,0 +1 @@
+[1, "a", "Type", [1, "b", "Type", ["a", 0]]]
diff --git a/tests/parser/success/largeExpressionB.diag b/tests/parser/success/largeExpressionB.diag
@@ -0,0 +1 @@
+[1, "xs", [0, "List", [7, {"cores": "Natural", "host": "Text", "key": "Text", "mandatoryFeatures": [0, "List", "Text"], "platforms": [0, "List", [11, {"AArch64_Linux": null, "ARMv5tel_Linux": null, "ARMv7l_Linux": null, "I686_Cygwin": null, "I686_Linux": null, "MIPS64el_Linux": null, "PowerPC_Linux": null, "X86_64_Cygwin": null, "X86_64_Darwin": null, "X86_64_FreeBSD": null, "X86_64_Linux": null, "X86_64_Solaris": null}]], "speedFactor": "Natural", "supportedFeatures": [0, "List", "Text"], "user": [0, "Optional", "Text"]}]], [0, "List/fold", [7, {"cores": "Natural", "host": "Text", "key": "Text", "mandatoryFeatures": [0, "List", "Text"], "platforms": [0, "List", [11, {"AArch64_Linux": null, "ARMv5tel_Linux": null, "ARMv7l_Linux": null, "I686_Cygwin": null, "I686_Linux": null, "MIPS64el_Linux": null, "PowerPC_Linux": null, "X86_64_Cygwin": null, "X86_64_Darwin": null, "X86_64_FreeBSD": null, "X86_64_Linux": null, "X86_64_Solaris": null}]], "speedFactor": "Natural", "supportedFeatures": [0, "List", "Text"], "user": [0, "Optional", "Text"]}], ["xs", 0], "Text", [1, "x", [7, {"cores": "Natural", "host": "Text", "key": "Text", "mandatoryFeatures": [0, "List", "Text"], "platforms": [0, "List", [11, {"AArch64_Linux": null, "ARMv5tel_Linux": null, "ARMv7l_Linux": null, "I686_Cygwin": null, "I686_Linux": null, "MIPS64el_Linux": null, "PowerPC_Linux": null, "X86_64_Cygwin": null, "X86_64_Darwin": null, "X86_64_FreeBSD": null, "X86_64_Linux": null, "X86_64_Solaris": null}]], "speedFactor": "Natural", "supportedFeatures": [0, "List", "Text"], "user": [0, "Optional", "Text"]}], [1, "y", "Text", [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [3, 6, [0, "Optional/fold", "Text", [9, ["x", 0], "user"], "Text", [1, "user", "Text", [3, 6, [3, 6, [3, 6, ["user", 0], [18, "@"]], [9, ["x", 0], "host"]], [18, ""]]], [9, ["x", 0], "host"]], [18, " "]], [6, [8, {"Empty": [18, ""], "NonEmpty": [1, "result", "Text", ["result", 0]]}], [0, "List/fold", [11, {"AArch64_Linux": null, "ARMv5tel_Linux": null, "ARMv7l_Linux": null, "I686_Cygwin": null, "I686_Linux": null, "MIPS64el_Linux": null, "PowerPC_Linux": null, "X86_64_Cygwin": null, "X86_64_Darwin": null, "X86_64_FreeBSD": null, "X86_64_Linux": null, "X86_64_Solaris": null}], [9, ["x", 0], "platforms"], [11, {"Empty": null, "NonEmpty": "Text"}], [1, "element", [11, {"AArch64_Linux": null, "ARMv5tel_Linux": null, "ARMv7l_Linux": null, "I686_Cygwin": null, "I686_Linux": null, "MIPS64el_Linux": null, "PowerPC_Linux": null, "X86_64_Cygwin": null, "X86_64_Darwin": null, "X86_64_FreeBSD": null, "X86_64_Linux": null, "X86_64_Solaris": null}], [1, "status", [11, {"Empty": null, "NonEmpty": "Text"}], [6, [8, {"Empty": [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], [6, [8, {"AArch64_Linux": [18, "aarch64-linux"], "ARMv5tel_Linux": [18, "armv5tel-linux"], "ARMv7l_Linux": [18, "armv7l-linux"], "I686_Cygwin": [18, "i686-cygwin"], "I686_Linux": [18, "i686-linux"], "MIPS64el_Linux": [18, "mips64el-linux"], "PowerPC_Linux": [18, "powerpc-linux"], "X86_64_Cygwin": [18, "x86_64-cygwin"], "X86_64_Darwin": [18, "x86_64-darwin"], "X86_64_FreeBSD": [18, "x86_64-freebsd"], "X86_64_Linux": [18, "x86_64-linux"], "X86_64_Solaris": [18, "x86_64-solaris"]}], ["element", 0]]], "NonEmpty": [1, "result", "Text", [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], [3, 6, [3, 6, [6, [8, {"AArch64_Linux": [18, "aarch64-linux"], "ARMv5tel_Linux": [18, "armv5tel-linux"], "ARMv7l_Linux": [18, "armv7l-linux"], "I686_Cygwin": [18, "i686-cygwin"], "I686_Linux": [18, "i686-linux"], "MIPS64el_Linux": [18, "mips64el-linux"], "PowerPC_Linux": [18, "powerpc-linux"], "X86_64_Cygwin": [18, "x86_64-cygwin"], "X86_64_Darwin": [18, "x86_64-darwin"], "X86_64_FreeBSD": [18, "x86_64-freebsd"], "X86_64_Linux": [18, "x86_64-linux"], "X86_64_Solaris": [18, "x86_64-solaris"]}], ["element", 0]], [18, ","]], ["result", 0]]]]}], ["status", 0], [11, {"Empty": null, "NonEmpty": "Text"}]]]], [9, [11, {"Empty": null, "NonEmpty": "Text"}], "Empty"]], "Text"]], [18, " "]], [9, ["x", 0], "key"]], [18, " "]], [0, "Integer/show", [0, "Natural/toInteger", [9, ["x", 0], "cores"]]]], [18, " "]], [0, "Integer/show", [0, "Natural/toInteger", [9, ["x", 0], "speedFactor"]]]], [18, " "]], [6, [8, {"Empty": [18, ""], "NonEmpty": [1, "result", "Text", ["result", 0]]}], [0, "List/fold", "Text", [9, ["x", 0], "supportedFeatures"], [11, {"Empty": null, "NonEmpty": "Text"}], [1, "element", "Text", [1, "status", [11, {"Empty": null, "NonEmpty": "Text"}], [6, [8, {"Empty": [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], ["element", 0]], "NonEmpty": [1, "result", "Text", [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], [3, 6, [3, 6, ["element", 0], [18, ","]], ["result", 0]]]]}], ["status", 0], [11, {"Empty": null, "NonEmpty": "Text"}]]]], [9, [11, {"Empty": null, "NonEmpty": "Text"}], "Empty"]], "Text"]], [18, " "]], [6, [8, {"Empty": [18, ""], "NonEmpty": [1, "result", "Text", ["result", 0]]}], [0, "List/fold", "Text", [9, ["x", 0], "mandatoryFeatures"], [11, {"Empty": null, "NonEmpty": "Text"}], [1, "element", "Text", [1, "status", [11, {"Empty": null, "NonEmpty": "Text"}], [6, [8, {"Empty": [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], ["element", 0]], "NonEmpty": [1, "result", "Text", [0, [9, [11, {"Empty": null, "NonEmpty": "Text"}], "NonEmpty"], [3, 6, [3, 6, ["element", 0], [18, ","]], ["result", 0]]]]}], ["status", 0], [11, {"Empty": null, "NonEmpty": "Text"}]]]], [9, [11, {"Empty": null, "NonEmpty": "Text"}], "Empty"]], "Text"]], [18, "\n"]], ["y", 0]]]], [18, ""]]]
diff --git a/tests/parser/success/leadingTabsB.diag b/tests/parser/success/leadingTabsB.diag
@@ -0,0 +1 @@
+[18, "\n"]
diff --git a/tests/parser/success/letB.diag b/tests/parser/success/letB.diag
@@ -0,0 +1 @@
+[25, "x", null, [15, 1], [25, "y", "Natural", [15, 2], ["x", 0]]]
diff --git a/tests/parser/success/lineCommentB.diag b/tests/parser/success/lineCommentB.diag
@@ -0,0 +1 @@
+[15, 1]
diff --git a/tests/parser/success/listB.diag b/tests/parser/success/listB.diag
@@ -0,0 +1 @@
+[4, null, [4, null, [16, 1], [16, 2], [16, 3]], [26, [4, null, [16, 1], [16, 2], [16, 3]], [0, "List", "Integer"]], [4, "Integer"]]
diff --git a/tests/parser/success/mergeB.diag b/tests/parser/success/mergeB.diag
@@ -0,0 +1 @@
+[1, "x", [11, {}], [8, {"bar": [6, [8, {}], ["x", 0], "Integer"], "foo": [6, [8, {"Left": [1, "b", "Bool", ["b", 0]], "Right": "Natural/even"}], [0, [9, [11, {"Left": "Bool", "Right": "Natural"}], "Left"], true]]}]]
diff --git a/tests/parser/success/multiletB.diag b/tests/parser/success/multiletB.diag
@@ -0,0 +1 @@
+[25, "a", null, [15, 1], "b", null, [15, 2], [3, 4, ["a", 0], ["b", 0]]]
diff --git a/tests/parser/success/naturalB.diag b/tests/parser/success/naturalB.diag
@@ -0,0 +1 @@
+[4, null, [15, 0], [15, 1], [15, 1], [15, 10]]
diff --git a/tests/parser/success/nestedBlockCommentB.diag b/tests/parser/success/nestedBlockCommentB.diag
@@ -0,0 +1 @@
+[15, 1]
diff --git a/tests/parser/success/operatorsB.diag b/tests/parser/success/operatorsB.diag
@@ -0,0 +1 @@
+[26, [3, 8, [8, {"foo": [3, 0, [3, 1, false, [0, "Natural/even", [3, 4, [15, 1], [3, 5, [15, 2], [15, 3]]]]], [3, 2, true, [3, 3, false, true]]]}], [3, 9, [8, {"bar": [3, 7, [4, null, [3, 6, [18, "ABC"], [18, "DEF"]]], [4, null, [18, "GHI"]]]}], [8, {"baz": true}]]], [3, 10, [7, {"baz": "Bool", "foo": "Bool"}], [7, {"bar": [0, "List", "Text"]}]]]
diff --git a/tests/parser/success/quotedBoundVariableB.diag b/tests/parser/success/quotedBoundVariableB.diag
@@ -0,0 +1 @@
+[0, [1, "Natural/even", [2, "Natural", "Bool"], ["Natural/even", 0]], "Natural/odd", [15, 0]]
diff --git a/tests/parser/success/quotedLabelB.diag b/tests/parser/success/quotedLabelB.diag
@@ -0,0 +1 @@
+[8, {"example1": [25, "let", null, [15, 1], ["let", 0]], "example2": [25, ":.", null, [15, 1], [":.", 0]], "example3": [25, "$ref", null, [15, 1], ["$ref", 0]]}]
diff --git a/tests/parser/success/recordB.diag b/tests/parser/success/recordB.diag
@@ -0,0 +1 @@
+[26, [8, {"bar": [15, 2], "baz": true, "foo": [16, 1]}], [7, {"bar": "Natural", "baz": "Bool", "foo": "Integer"}]]
diff --git a/tests/parser/success/recordProjectionByExpressionB.diag b/tests/parser/success/recordProjectionByExpressionB.diag
@@ -0,0 +1 @@
+[25, "example1", null, [1, "A", "Type", [1, "B", "Type", [1, "C", [7, {"x": ["A", 0], "y": ["B", 0]}], [26, [10, ["C", 0], [[7, {"x": ["A", 0]}]]], [7, {"x": ["A", 0]}]]]]], "example2", null, [1, "A", "Type", [1, "B", "Type", [1, "C", [7, {"p": ["A", 0], "q": ["B", 0]}], [26, [10, ["C", 0], [[25, "r", null, [7, {"p": ["A", 0]}], ["r", 0]]]], [7, {"p": ["A", 0]}]]]]], "A", null, "Natural", "B", null, "Text", [26, [3, 8, [0, ["example1", 0], ["A", 0], ["B", 0], [8, {"x": [15, 10], "y": [18, "Text"]}]], [0, ["example2", 0], ["A", 0], ["B", 0], [8, {"p": [15, 10], "q": [18, "Text"]}]]], [7, {"p": ["A", 0], "x": ["A", 0]}]]]
diff --git a/tests/parser/success/reservedPrefixB.diag b/tests/parser/success/reservedPrefixB.diag
@@ -0,0 +1 @@
+[25, "TypeSynonym", null, "Integer", [26, [16, 1], ["TypeSynonym", 0]]]
diff --git a/tests/parser/success/text/doubleQuotedStringB.diag b/tests/parser/success/text/doubleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "ABC"]
diff --git a/tests/parser/success/text/escapeB.diag b/tests/parser/success/text/escapeB.diag
@@ -0,0 +1 @@
+[18, "${\n''\n$\n\"\n\\\n"]
diff --git a/tests/parser/success/text/escapedDoubleQuotedStringB.diag b/tests/parser/success/text/escapedDoubleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "\\\"$\\/\b\f\n\r\t\u{1D11E} \u2200(a : Type) \u2192 a"]
diff --git a/tests/parser/success/text/escapedSingleQuotedStringB.diag b/tests/parser/success/text/escapedSingleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "${\n''\n"]
diff --git a/tests/parser/success/text/interestingB.diag b/tests/parser/success/text/interestingB.diag
@@ -0,0 +1 @@
+[1, "x", "Text", [18, "", ["x", 0], "    baz\n    bar\n  foo\n  "]]
diff --git a/tests/parser/success/text/interiorIndentB.diag b/tests/parser/success/text/interiorIndentB.diag
@@ -0,0 +1 @@
+[18, "  foo\n  bar\n"]
diff --git a/tests/parser/success/text/interpolatedDoubleQuotedStringB.diag b/tests/parser/success/text/interpolatedDoubleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "ABC", [0, "Natural/show", [15, 123]], ""]
diff --git a/tests/parser/success/text/interpolatedSingleQuotedStringB.diag b/tests/parser/success/text/interpolatedSingleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "ABC\n", [0, "Natural/show", [15, 123]], "\n"]
diff --git a/tests/parser/success/text/interpolationB.diag b/tests/parser/success/text/interpolationB.diag
@@ -0,0 +1 @@
+[18, "", [0, "Natural/show", [15, 1]], "      foo\n  bar\n"]
diff --git a/tests/parser/success/text/multilineBlankLineB.diag b/tests/parser/success/text/multilineBlankLineB.diag
@@ -0,0 +1 @@
+[18, "hello\n\nthere\n"]
diff --git a/tests/parser/success/text/multilineBlankLineCrlfB.diag b/tests/parser/success/text/multilineBlankLineCrlfB.diag
@@ -0,0 +1 @@
+[18, "hello\n\nthere\n"]
diff --git a/tests/parser/success/text/multilineCorruptedLeadingWhitespaceB.diag b/tests/parser/success/text/multilineCorruptedLeadingWhitespaceB.diag
@@ -0,0 +1 @@
+[18, "\thai\n\tthere\n ok\n\t"]
diff --git a/tests/parser/success/text/multilineIndentedAndAlignedB.diag b/tests/parser/success/text/multilineIndentedAndAlignedB.diag
@@ -0,0 +1 @@
+[18, "hai\nthere\n"]
diff --git a/tests/parser/success/text/multilineMismatchedLeadingWhitespaceB.diag b/tests/parser/success/text/multilineMismatchedLeadingWhitespaceB.diag
@@ -0,0 +1 @@
+[18, "\ta\n b\n"]
diff --git a/tests/parser/success/text/multilineTabsB.diag b/tests/parser/success/text/multilineTabsB.diag
@@ -0,0 +1 @@
+[18, "hai\n\tthere\n   lol\n"]
diff --git a/tests/parser/success/text/preserveCommentB.diag b/tests/parser/success/text/preserveCommentB.diag
@@ -0,0 +1 @@
+[18, "-- Hello\n{- world -}\n"]
diff --git a/tests/parser/success/text/singleLineB.diag b/tests/parser/success/text/singleLineB.diag
@@ -0,0 +1 @@
+[18, "foo"]
diff --git a/tests/parser/success/text/singleQuotedStringB.diag b/tests/parser/success/text/singleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "ABC\nDEF\n"]
diff --git a/tests/parser/success/text/templateB.diag b/tests/parser/success/text/templateB.diag
@@ -0,0 +1 @@
+[1, "record", [7, {"in_ca": "Bool", "name": "Text", "taxed_value": "Double", "value": "Double"}], [18, "Hello ", [9, ["record", 0], "name"], "\nYou have just won ", [0, "Double/show", [9, ["record", 0], "value"]], " dollars!\n", [14, [9, ["record", 0], "in_ca"], [18, "Well, ", [0, "Double/show", [9, ["record", 0], "taxed_value"]], " dollars, after taxes"], [18, ""]], "\n"]]
diff --git a/tests/parser/success/text/twoLinesB.diag b/tests/parser/success/text/twoLinesB.diag
@@ -0,0 +1 @@
+[18, "foo\nbar"]
diff --git a/tests/parser/success/text/unicodeDoubleQuotedStringB.diag b/tests/parser/success/text/unicodeDoubleQuotedStringB.diag
@@ -0,0 +1 @@
+[18, "\u2200(a : Type) \u2192 a"]
diff --git a/tests/parser/success/toMapB.diag b/tests/parser/success/toMapB.diag
@@ -0,0 +1 @@
+[27, [8, {"bar": [15, 4], "baz": [15, 9], "foo": [15, 1]}]]
diff --git a/tests/parser/success/unicodeCommentB.diag b/tests/parser/success/unicodeCommentB.diag
@@ -0,0 +1 @@
+[15, 1]
diff --git a/tests/parser/success/unionB.diag b/tests/parser/success/unionB.diag
@@ -0,0 +1 @@
+[26, [12, "B", [8, {}], {"A": [7, {}], "C": [7, {}]}], [11, {"A": [7, {}], "B": [7, {}], "C": [7, {}]}]]
diff --git a/tests/parser/success/unit/BoolB.diag b/tests/parser/success/unit/BoolB.diag
@@ -0,0 +1 @@
+"Bool"
diff --git a/tests/parser/success/unit/BoolLitTrueB.diag b/tests/parser/success/unit/BoolLitTrueB.diag
@@ -0,0 +1 @@
+true
diff --git a/tests/parser/success/unit/ForallB.diag b/tests/parser/success/unit/ForallB.diag
@@ -0,0 +1 @@
+[2, "x", ["T", 0], ["x", 0]]
diff --git a/tests/parser/success/unit/ForallNestedB.diag b/tests/parser/success/unit/ForallNestedB.diag
@@ -0,0 +1 @@
+[2, "x", ["T", 0], [2, "y", ["U", 0], ["x", 0]]]
diff --git a/tests/parser/success/unit/ForallUnderscoreB.diag b/tests/parser/success/unit/ForallUnderscoreB.diag
@@ -0,0 +1 @@
+[2, ["T", 0], ["x", 0]]
diff --git a/tests/parser/success/unit/IntegerLitNegativeB.diag b/tests/parser/success/unit/IntegerLitNegativeB.diag
@@ -0,0 +1 @@
+[16, -10]
diff --git a/tests/parser/success/unit/IntegerLitPositiveB.diag b/tests/parser/success/unit/IntegerLitPositiveB.diag
@@ -0,0 +1 @@
+[16, 10]
diff --git a/tests/parser/success/unit/KindB.diag b/tests/parser/success/unit/KindB.diag
@@ -0,0 +1 @@
+"Kind"
diff --git a/tests/parser/success/unit/LambdaB.diag b/tests/parser/success/unit/LambdaB.diag
@@ -0,0 +1 @@
+[1, "x", ["T", 0], ["x", 0]]