From 4878df7d9fa93613f97359e1c0caf85e36900be9 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Fri, 15 Mar 2024 09:01:42 +0000 Subject: [PATCH 1/2] Testsuite: update baselines after recent Prettier-Ada changes --- .../everything_long/doc-baseline.json | 12 +- .../expr_function/long_spec/doc-baseline.json | 12 +- .../long_spec_with_aspect/doc-baseline.json | 12 +- .../expr_function/short/doc-baseline.json | 12 +- .../short_with_aspect/doc-baseline.json | 12 +- .../empty_formal_part/doc-baseline.json | 12 +- .../non_empty_formal_part/doc-baseline.json | 36 +- .../empty_formal_part/doc-baseline.json | 36 +- .../non_empty_formal_part/doc-baseline.json | 60 +- .../everything_long/doc-baseline.json | 24 +- .../everything_long_rename/doc-baseline.json | 32 +- .../long_default_expr/doc-baseline.json | 24 +- .../object_decl/long_ids/doc-baseline.json | 24 +- .../long_type_expr/doc-baseline.json | 24 +- .../object_decl/short/doc-baseline.json | 12 +- .../object_decl/short_full/doc-baseline.json | 24 +- .../everything_long/doc-baseline.json | 446 ++-- .../long_default_expr/doc-baseline.json | 24 +- .../param_spec/long_ids/doc-baseline.json | 24 +- .../long_type_expr/doc-baseline.json | 24 +- .../param_spec/short/doc-baseline.json | 12 +- .../param_spec/short_full/doc-baseline.json | 24 +- .../doc-baseline.json | 2190 ++++++++--------- .../doc-baseline.json | 1248 +++++----- .../doc-baseline.json | 996 ++++---- .../doc-baseline.json | 1662 ++++++------- .../record_with_variant/doc-baseline.json | 1950 +++++++-------- .../subp_body/no_end_name/doc-baseline.json | 48 +- .../subp_body/with_decls/doc-baseline.json | 48 +- .../long_not_overriding/doc-baseline.json | 48 +- .../long_with_long_aspects/doc-baseline.json | 48 +- .../long_with_short_aspects/doc-baseline.json | 48 +- .../short_overriding/doc-baseline.json | 48 +- .../short_with_long_aspects/doc-baseline.json | 48 +- .../everything_long/doc-baseline.json | 48 +- .../everything_short/doc-baseline.json | 48 +- .../function/long_name/doc-baseline.json | 48 +- .../function/long_params/doc-baseline.json | 48 +- .../function/long_return/doc-baseline.json | 48 +- .../everything_short/doc-baseline.json | 48 +- 40 files changed, 4796 insertions(+), 4796 deletions(-) diff --git a/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json b/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json index 86a7f1f18..6b1aef342 100644 --- a/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json @@ -205,7 +205,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -214,13 +214,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -232,7 +232,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -241,13 +241,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json b/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json index 4cd319d32..db9381bc3 100644 --- a/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json @@ -205,7 +205,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -214,13 +214,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -232,7 +232,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -241,13 +241,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json index 13d517dbc..0a99dfa22 100644 --- a/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json @@ -205,7 +205,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -214,13 +214,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -232,7 +232,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -241,13 +241,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/expr_function/short/doc-baseline.json b/testsuite/tests/unparsing/expr_function/short/doc-baseline.json index 33d5d9792..2fcf41b37 100644 --- a/testsuite/tests/unparsing/expr_function/short/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/short/doc-baseline.json @@ -205,7 +205,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -214,13 +214,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -232,7 +232,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -241,13 +241,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json b/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json index 5e8007042..5b5e9e64e 100644 --- a/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json +++ b/testsuite/tests/unparsing/expr_function/short_with_aspect/doc-baseline.json @@ -205,7 +205,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -214,13 +214,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -232,7 +232,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -241,13 +241,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json index 35421d56e..925a73d4a 100644 --- a/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_decl/empty_formal_part/doc-baseline.json @@ -433,7 +433,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 47, + "id": 44, "kind": "command", "command": { "command": "align", @@ -442,13 +442,13 @@ "n": 4 }, "alignContents": { - "id": 46, + "id": 43, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 45, + "id": 42, "kind": "list", "list": [ ] @@ -460,7 +460,7 @@ } }, "flatContents": { - "id": 44, + "id": 47, "kind": "command", "command": { "command": "align", @@ -469,13 +469,13 @@ "n": 2 }, "alignContents": { - "id": 43, + "id": 46, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 42, + "id": 45, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json index e81e21d96..5f93b957e 100644 --- a/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_package_decl/non_empty_formal_part/doc-baseline.json @@ -278,7 +278,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 25, + "id": 22, "kind": "command", "command": { "command": "align", @@ -287,13 +287,13 @@ "n": 4 }, "alignContents": { - "id": 24, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 23, + "id": 20, "kind": "list", "list": [ ] @@ -305,7 +305,7 @@ } }, "flatContents": { - "id": 22, + "id": 25, "kind": "command", "command": { "command": "align", @@ -314,13 +314,13 @@ "n": 2 }, "alignContents": { - "id": 21, + "id": 24, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 23, "kind": "list", "list": [ ] @@ -667,7 +667,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 73, + "id": 70, "kind": "command", "command": { "command": "align", @@ -676,13 +676,13 @@ "n": 4 }, "alignContents": { - "id": 72, + "id": 69, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 71, + "id": 68, "kind": "list", "list": [ ] @@ -694,7 +694,7 @@ } }, "flatContents": { - "id": 70, + "id": 73, "kind": "command", "command": { "command": "align", @@ -703,13 +703,13 @@ "n": 2 }, "alignContents": { - "id": 69, + "id": 72, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 68, + "id": 71, "kind": "list", "list": [ ] @@ -1218,7 +1218,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 144, + "id": 141, "kind": "command", "command": { "command": "align", @@ -1227,13 +1227,13 @@ "n": 4 }, "alignContents": { - "id": 143, + "id": 140, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 142, + "id": 139, "kind": "list", "list": [ ] @@ -1245,7 +1245,7 @@ } }, "flatContents": { - "id": 141, + "id": 144, "kind": "command", "command": { "command": "align", @@ -1254,13 +1254,13 @@ "n": 2 }, "alignContents": { - "id": 140, + "id": 143, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 139, + "id": 142, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json index 04914b8b4..6f7033193 100644 --- a/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_decl/empty_formal_part/doc-baseline.json @@ -249,7 +249,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 27, + "id": 24, "kind": "command", "command": { "command": "align", @@ -258,13 +258,13 @@ "n": 4 }, "alignContents": { - "id": 26, + "id": 23, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 25, + "id": 22, "kind": "list", "list": [ ] @@ -276,7 +276,7 @@ } }, "flatContents": { - "id": 24, + "id": 27, "kind": "command", "command": { "command": "align", @@ -285,13 +285,13 @@ "n": 2 }, "alignContents": { - "id": 23, + "id": 26, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 25, "kind": "list", "list": [ ] @@ -426,7 +426,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 49, + "id": 46, "kind": "command", "command": { "command": "align", @@ -435,13 +435,13 @@ "n": 4 }, "alignContents": { - "id": 48, + "id": 45, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 47, + "id": 44, "kind": "list", "list": [ ] @@ -453,7 +453,7 @@ } }, "flatContents": { - "id": 46, + "id": 49, "kind": "command", "command": { "command": "align", @@ -462,13 +462,13 @@ "n": 2 }, "alignContents": { - "id": 45, + "id": 48, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 44, + "id": 47, "kind": "list", "list": [ ] @@ -603,7 +603,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 71, + "id": 68, "kind": "command", "command": { "command": "align", @@ -612,13 +612,13 @@ "n": 4 }, "alignContents": { - "id": 70, + "id": 67, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 69, + "id": 66, "kind": "list", "list": [ ] @@ -630,7 +630,7 @@ } }, "flatContents": { - "id": 68, + "id": 71, "kind": "command", "command": { "command": "align", @@ -639,13 +639,13 @@ "n": 2 }, "alignContents": { - "id": 67, + "id": 70, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 66, + "id": 69, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json index b95dedaec..b4205ac7a 100644 --- a/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json +++ b/testsuite/tests/unparsing/generic_subp_decl/non_empty_formal_part/doc-baseline.json @@ -310,7 +310,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 29, + "id": 26, "kind": "command", "command": { "command": "align", @@ -319,13 +319,13 @@ "n": 4 }, "alignContents": { - "id": 28, + "id": 25, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 27, + "id": 24, "kind": "list", "list": [ ] @@ -337,7 +337,7 @@ } }, "flatContents": { - "id": 26, + "id": 29, "kind": "command", "command": { "command": "align", @@ -346,13 +346,13 @@ "n": 2 }, "alignContents": { - "id": 25, + "id": 28, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 24, + "id": 27, "kind": "list", "list": [ ] @@ -487,7 +487,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 51, + "id": 48, "kind": "command", "command": { "command": "align", @@ -496,13 +496,13 @@ "n": 4 }, "alignContents": { - "id": 50, + "id": 47, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 49, + "id": 46, "kind": "list", "list": [ ] @@ -514,7 +514,7 @@ } }, "flatContents": { - "id": 48, + "id": 51, "kind": "command", "command": { "command": "align", @@ -523,13 +523,13 @@ "n": 2 }, "alignContents": { - "id": 47, + "id": 50, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 46, + "id": 49, "kind": "list", "list": [ ] @@ -856,7 +856,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 103, + "id": 100, "kind": "command", "command": { "command": "align", @@ -865,13 +865,13 @@ "n": 4 }, "alignContents": { - "id": 102, + "id": 99, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 101, + "id": 98, "kind": "list", "list": [ ] @@ -883,7 +883,7 @@ } }, "flatContents": { - "id": 100, + "id": 103, "kind": "command", "command": { "command": "align", @@ -892,13 +892,13 @@ "n": 2 }, "alignContents": { - "id": 99, + "id": 102, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 98, + "id": 101, "kind": "list", "list": [ ] @@ -1033,7 +1033,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 125, + "id": 122, "kind": "command", "command": { "command": "align", @@ -1042,13 +1042,13 @@ "n": 4 }, "alignContents": { - "id": 124, + "id": 121, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 123, + "id": 120, "kind": "list", "list": [ ] @@ -1060,7 +1060,7 @@ } }, "flatContents": { - "id": 122, + "id": 125, "kind": "command", "command": { "command": "align", @@ -1069,13 +1069,13 @@ "n": 2 }, "alignContents": { - "id": 121, + "id": 124, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 120, + "id": 123, "kind": "list", "list": [ ] @@ -1210,7 +1210,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 147, + "id": 144, "kind": "command", "command": { "command": "align", @@ -1219,13 +1219,13 @@ "n": 4 }, "alignContents": { - "id": 146, + "id": 143, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 145, + "id": 142, "kind": "list", "list": [ ] @@ -1237,7 +1237,7 @@ } }, "flatContents": { - "id": 144, + "id": 147, "kind": "command", "command": { "command": "align", @@ -1246,13 +1246,13 @@ "n": 2 }, "alignContents": { - "id": 143, + "id": 146, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 142, + "id": 145, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/object_decl/everything_long/doc-baseline.json b/testsuite/tests/unparsing/object_decl/everything_long/doc-baseline.json index ccd69f8a6..3e1bb10ad 100644 --- a/testsuite/tests/unparsing/object_decl/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/everything_long/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baaaaaaaaaaaaaaaaz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baaaaaaaaaaaaaaaaz" } diff --git a/testsuite/tests/unparsing/object_decl/everything_long_rename/doc-baseline.json b/testsuite/tests/unparsing/object_decl/everything_long_rename/doc-baseline.json index 98083f3a5..c405f7aad 100644 --- a/testsuite/tests/unparsing/object_decl/everything_long_rename/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/everything_long_rename/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 26, + "id": 18, "kind": "command", "command": { "command": "align", @@ -108,32 +108,32 @@ "n": 4 }, "alignContents": { - "id": 25, + "id": 17, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 24, + "id": 16, "kind": "list", "list": [ { - "id": 23, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 22, + "id": 14, "kind": "list", "list": [ { - "id": 19, + "id": 11, "kind": "text", "text": " renames" }, { - "id": 20, + "id": 12, "kind": "command", "command": { "command": "line", @@ -143,7 +143,7 @@ } }, { - "id": 21, + "id": 13, "kind": "text", "text": "Baaaaaaaaaaaaaaaz" } @@ -162,7 +162,7 @@ } }, "flatContents": { - "id": 18, + "id": 26, "kind": "command", "command": { "command": "align", @@ -171,32 +171,32 @@ "n": 2 }, "alignContents": { - "id": 17, + "id": 25, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 24, "kind": "list", "list": [ { - "id": 15, + "id": 23, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 22, "kind": "list", "list": [ { - "id": 11, + "id": 19, "kind": "text", "text": " renames" }, { - "id": 12, + "id": 20, "kind": "command", "command": { "command": "line", @@ -206,7 +206,7 @@ } }, { - "id": 13, + "id": 21, "kind": "text", "text": "Baaaaaaaaaaaaaaaz" } diff --git a/testsuite/tests/unparsing/object_decl/long_default_expr/doc-baseline.json b/testsuite/tests/unparsing/object_decl/long_default_expr/doc-baseline.json index 9ad6b3782..9079ebe49 100644 --- a/testsuite/tests/unparsing/object_decl/long_default_expr/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/long_default_expr/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" } diff --git a/testsuite/tests/unparsing/object_decl/long_ids/doc-baseline.json b/testsuite/tests/unparsing/object_decl/long_ids/doc-baseline.json index dc917e0f6..80dde4177 100644 --- a/testsuite/tests/unparsing/object_decl/long_ids/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/long_ids/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/object_decl/long_type_expr/doc-baseline.json b/testsuite/tests/unparsing/object_decl/long_type_expr/doc-baseline.json index 0435e143d..e805a0df0 100644 --- a/testsuite/tests/unparsing/object_decl/long_type_expr/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/long_type_expr/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/object_decl/short/doc-baseline.json b/testsuite/tests/unparsing/object_decl/short/doc-baseline.json index d2a1a9a27..6c67e14c8 100644 --- a/testsuite/tests/unparsing/object_decl/short/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/short/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 16, + "id": 13, "kind": "command", "command": { "command": "align", @@ -108,13 +108,13 @@ "n": 4 }, "alignContents": { - "id": 15, + "id": 12, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 11, "kind": "list", "list": [ ] @@ -126,7 +126,7 @@ } }, "flatContents": { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -135,13 +135,13 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 11, + "id": 14, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/object_decl/short_full/doc-baseline.json b/testsuite/tests/unparsing/object_decl/short_full/doc-baseline.json index 5ac03e155..6eaa67c01 100644 --- a/testsuite/tests/unparsing/object_decl/short_full/doc-baseline.json +++ b/testsuite/tests/unparsing/object_decl/short_full/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/param_spec/everything_long/doc-baseline.json b/testsuite/tests/unparsing/param_spec/everything_long/doc-baseline.json index 168bba326..2938e857d 100644 --- a/testsuite/tests/unparsing/param_spec/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/everything_long/doc-baseline.json @@ -1,223 +1,223 @@ -{ - "id": 28, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 27, - "kind": "list", - "list": [ - { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 0, - "kind": "text", - "text": "Fooooooooooooooooo" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 2, - "kind": "text", - "text": " :" - }, - { - "id": 11, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "text", - "text": "aliased in out " - }, - { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 5, - "kind": "text", - "text": "not null access Baaaaaaaaaaaaaaaaaaaaaaar" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 25, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 24, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 23, - "kind": "list", - "list": [ - { - "id": 20, - "kind": "text", - "text": " :=" - }, - { - "id": 21, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 22, - "kind": "text", - "text": "Baaaaaaaaaaaaaaaaz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 19, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 18, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 17, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "text", - "text": " :=" - }, - { - "id": 15, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 16, - "kind": "text", - "text": "Baaaaaaaaaaaaaaaaz" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } -} +{ + "id": 28, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 27, + "kind": "list", + "list": [ + { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 0, + "kind": "text", + "text": "Fooooooooooooooooo" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 2, + "kind": "text", + "text": " :" + }, + { + "id": 11, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "text", + "text": "aliased in out " + }, + { + "id": 7, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 6, + "kind": "list", + "list": [ + { + "id": 5, + "kind": "text", + "text": "not null access Baaaaaaaaaaaaaaaaaaaaaaar" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 19, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 18, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 17, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "text", + "text": " :=" + }, + { + "id": 15, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 16, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 25, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 24, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 23, + "kind": "list", + "list": [ + { + "id": 20, + "kind": "text", + "text": " :=" + }, + { + "id": 21, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 22, + "kind": "text", + "text": "Baaaaaaaaaaaaaaaaz" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/param_spec/long_default_expr/doc-baseline.json b/testsuite/tests/unparsing/param_spec/long_default_expr/doc-baseline.json index 581a4c092..36ef937a0 100644 --- a/testsuite/tests/unparsing/param_spec/long_default_expr/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/long_default_expr/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Bazzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" } diff --git a/testsuite/tests/unparsing/param_spec/long_ids/doc-baseline.json b/testsuite/tests/unparsing/param_spec/long_ids/doc-baseline.json index 6a92fdbf5..ab7d27e62 100644 --- a/testsuite/tests/unparsing/param_spec/long_ids/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/long_ids/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/param_spec/long_type_expr/doc-baseline.json b/testsuite/tests/unparsing/param_spec/long_type_expr/doc-baseline.json index 059428d0a..6b304ba56 100644 --- a/testsuite/tests/unparsing/param_spec/long_type_expr/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/long_type_expr/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/param_spec/short/doc-baseline.json b/testsuite/tests/unparsing/param_spec/short/doc-baseline.json index fb7613666..c187086c4 100644 --- a/testsuite/tests/unparsing/param_spec/short/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/short/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 16, + "id": 13, "kind": "command", "command": { "command": "align", @@ -108,13 +108,13 @@ "n": 4 }, "alignContents": { - "id": 15, + "id": 12, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 11, "kind": "list", "list": [ ] @@ -126,7 +126,7 @@ } }, "flatContents": { - "id": 13, + "id": 16, "kind": "command", "command": { "command": "align", @@ -135,13 +135,13 @@ "n": 2 }, "alignContents": { - "id": 12, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 11, + "id": 14, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/param_spec/short_full/doc-baseline.json b/testsuite/tests/unparsing/param_spec/short_full/doc-baseline.json index a64feeec5..c2e4bc89c 100644 --- a/testsuite/tests/unparsing/param_spec/short_full/doc-baseline.json +++ b/testsuite/tests/unparsing/param_spec/short_full/doc-baseline.json @@ -99,7 +99,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 22, + "id": 16, "kind": "command", "command": { "command": "align", @@ -108,22 +108,22 @@ "n": 4 }, "alignContents": { - "id": 21, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 20, + "id": 14, "kind": "list", "list": [ { - "id": 17, + "id": 11, "kind": "text", "text": " :=" }, { - "id": 18, + "id": 12, "kind": "command", "command": { "command": "line", @@ -133,7 +133,7 @@ } }, { - "id": 19, + "id": 13, "kind": "text", "text": "Baz" } @@ -146,7 +146,7 @@ } }, "flatContents": { - "id": 16, + "id": 22, "kind": "command", "command": { "command": "align", @@ -155,22 +155,22 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 21, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 20, "kind": "list", "list": [ { - "id": 11, + "id": 17, "kind": "text", "text": " :=" }, { - "id": 12, + "id": 18, "kind": "command", "command": { "command": "line", @@ -180,7 +180,7 @@ } }, { - "id": 13, + "id": 19, "kind": "text", "text": "Baz" } diff --git a/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/doc-baseline.json b/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/doc-baseline.json index 9693462b7..0a9567a12 100644 --- a/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/doc-baseline.json +++ b/testsuite/tests/unparsing/record_type_def/record_mixed_with_variant/doc-baseline.json @@ -1,1095 +1,1095 @@ -{ - "id": 141, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 140, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "type Expr" - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 21, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "list", - "list": [ - { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "Kind" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 7, - "kind": "text", - "text": "Expr_Kind_Type" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 18, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 17, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 16, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 15, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 14, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 23, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 28, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 138, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 137, - "kind": "list", - "list": [ - { - "id": 31, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 136, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 135, - "kind": "list", - "list": [ - { - "id": 134, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 133, - "kind": "list", - "list": [ - { - "id": 132, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 131, - "kind": "list", - "list": [ - { - "id": 32, - "kind": "command", - "command": { - "command": "breakParent" - } - }, - { - "id": 126, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 125, - "kind": "list", - "list": [ - { - "id": 33, - "kind": "text", - "text": "record" - }, - { - "id": 124, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 123, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 46, - "kind": "list", - "list": [ - { - "id": 36, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 35, - "kind": "text", - "text": "Count" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 37, - "kind": "text", - "text": " :" - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 45, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 42, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 41, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 40, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "text", - "text": "Integer" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 43, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "text", - "text": "case " - }, - { - "id": 52, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 51, - "kind": "text", - "text": "Kind" - } - } - }, - { - "id": 53, - "kind": "text", - "text": " is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 120, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 119, - "kind": "list", - "list": [ - { - "id": 58, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 87, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 86, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "text", - "text": "when " - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 63, - "kind": "list", - "list": [ - { - "id": 60, - "kind": "text", - "text": "Bin_Op_A" - }, - { - "id": 61, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 62, - "kind": "text", - "text": "| Bin_Op_B" - } - ] - } - } - }, - { - "id": 65, - "kind": "text", - "text": " =>" - }, - { - "id": 85, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 84, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 83, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 82, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 81, - "kind": "list", - "list": [ - { - "id": 71, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 70, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "text", - "text": "L," - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 69, - "kind": "text", - "text": "R" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 72, - "kind": "text", - "text": " :" - }, - { - "id": 73, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 80, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 79, - "kind": "list", - "list": [ - { - "id": 77, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 76, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 74, - "kind": "text", - "text": "Expr_Access" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 78, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 91, - "kind": "list", - "list": [ - { - "id": 89, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 90, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 94, - "kind": "list", - "list": [ - { - "id": 92, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 93, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 118, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 95, - "kind": "text", - "text": "when " - }, - { - "id": 97, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 96, - "kind": "text", - "text": "Num" - } - } - }, - { - "id": 98, - "kind": "text", - "text": " =>" - }, - { - "id": 115, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 114, - "kind": "list", - "list": [ - { - "id": 99, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 113, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 112, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 111, - "kind": "list", - "list": [ - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "text", - "text": "Val" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 102, - "kind": "text", - "text": " :" - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 110, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 109, - "kind": "list", - "list": [ - { - "id": 107, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 106, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 105, - "kind": "list", - "list": [ - { - "id": 104, - "kind": "text", - "text": "Integer" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 108, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - } - } - }, - { - "id": 121, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 122, - "kind": "text", - "text": "end case;" - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 127, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 130, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 129, - "kind": "list", - "list": [ - { - "id": 128, - "kind": "text", - "text": "end record" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 139, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 141, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 140, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "type Expr" + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "Kind" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 7, + "kind": "text", + "text": "Expr_Kind_Type" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 18, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 14, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 23, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 28, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 138, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 137, + "kind": "list", + "list": [ + { + "id": 31, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 136, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 135, + "kind": "list", + "list": [ + { + "id": 134, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 133, + "kind": "list", + "list": [ + { + "id": 132, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 131, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "breakParent" + } + }, + { + "id": 126, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 125, + "kind": "list", + "list": [ + { + "id": 33, + "kind": "text", + "text": "record" + }, + { + "id": 124, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 123, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 46, + "kind": "list", + "list": [ + { + "id": 36, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 35, + "kind": "text", + "text": "Count" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 37, + "kind": "text", + "text": " :" + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 45, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 42, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 41, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 40, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "text", + "text": "Integer" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 43, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "text", + "text": "case " + }, + { + "id": 52, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 51, + "kind": "text", + "text": "Kind" + } + } + }, + { + "id": 53, + "kind": "text", + "text": " is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 120, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 119, + "kind": "list", + "list": [ + { + "id": 58, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "text", + "text": "when " + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 63, + "kind": "list", + "list": [ + { + "id": 60, + "kind": "text", + "text": "Bin_Op_A" + }, + { + "id": 61, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 62, + "kind": "text", + "text": "| Bin_Op_B" + } + ] + } + } + }, + { + "id": 65, + "kind": "text", + "text": " =>" + }, + { + "id": 85, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 84, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 83, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 82, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 81, + "kind": "list", + "list": [ + { + "id": 71, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 70, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "text", + "text": "L," + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 69, + "kind": "text", + "text": "R" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 72, + "kind": "text", + "text": " :" + }, + { + "id": 73, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 80, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 79, + "kind": "list", + "list": [ + { + "id": 77, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 76, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "text", + "text": "Expr_Access" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 78, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 91, + "kind": "list", + "list": [ + { + "id": 89, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 90, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 94, + "kind": "list", + "list": [ + { + "id": 92, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 93, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 118, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 117, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 116, + "kind": "list", + "list": [ + { + "id": 95, + "kind": "text", + "text": "when " + }, + { + "id": 97, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 96, + "kind": "text", + "text": "Num" + } + } + }, + { + "id": 98, + "kind": "text", + "text": " =>" + }, + { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 99, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 113, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 112, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 111, + "kind": "list", + "list": [ + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "text", + "text": "Val" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 102, + "kind": "text", + "text": " :" + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 110, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 109, + "kind": "list", + "list": [ + { + "id": 107, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 106, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 105, + "kind": "list", + "list": [ + { + "id": 104, + "kind": "text", + "text": "Integer" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 108, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + }, + { + "id": 121, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 122, + "kind": "text", + "text": "end case;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 127, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 130, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 129, + "kind": "list", + "list": [ + { + "id": 128, + "kind": "text", + "text": "end record" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 139, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/record_type_def/record_with_discriminants/doc-baseline.json b/testsuite/tests/unparsing/record_type_def/record_with_discriminants/doc-baseline.json index 4f13525b7..d1038593e 100644 --- a/testsuite/tests/unparsing/record_type_def/record_with_discriminants/doc-baseline.json +++ b/testsuite/tests/unparsing/record_type_def/record_with_discriminants/doc-baseline.json @@ -1,624 +1,624 @@ -{ - "id": 79, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 78, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "type Point" - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 28, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 13, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "text", - "text": "X," - }, - { - "id": 4, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 5, - "kind": "text", - "text": "Y" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 8, - "kind": "text", - "text": " :" - }, - { - "id": 12, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 11, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 10, - "kind": "text", - "text": "Natural" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 21, - "kind": "text", - "text": " :=" - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 23, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 20, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "text", - "text": " :=" - }, - { - "id": 16, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 17, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 32, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 36, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 37, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 76, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 75, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 74, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 73, - "kind": "list", - "list": [ - { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "command", - "command": { - "command": "breakParent" - } - }, - { - "id": 64, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 63, - "kind": "list", - "list": [ - { - "id": 42, - "kind": "text", - "text": "record" - }, - { - "id": 62, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 61, - "kind": "list", - "list": [ - { - "id": 43, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 59, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 58, - "kind": "list", - "list": [ - { - "id": 48, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 47, - "kind": "list", - "list": [ - { - "id": 44, - "kind": "text", - "text": "A," - }, - { - "id": 45, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 46, - "kind": "text", - "text": "B" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 49, - "kind": "text", - "text": " :" - }, - { - "id": 50, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 57, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 54, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 53, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 52, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "text", - "text": "Real" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 55, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 65, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 67, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "text", - "text": "end record" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 77, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 79, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 78, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "type Point" + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 28, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 6, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "text", + "text": "X," + }, + { + "id": 4, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 5, + "kind": "text", + "text": "Y" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 8, + "kind": "text", + "text": " :" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 11, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 10, + "kind": "text", + "text": "Natural" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 20, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": " :=" + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 17, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "text", + "text": " :=" + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 23, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 32, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 37, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 76, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 75, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 74, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 73, + "kind": "list", + "list": [ + { + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "command", + "command": { + "command": "breakParent" + } + }, + { + "id": 64, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 63, + "kind": "list", + "list": [ + { + "id": 42, + "kind": "text", + "text": "record" + }, + { + "id": 62, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 61, + "kind": "list", + "list": [ + { + "id": 43, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 59, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 58, + "kind": "list", + "list": [ + { + "id": 48, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 47, + "kind": "list", + "list": [ + { + "id": 44, + "kind": "text", + "text": "A," + }, + { + "id": 45, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 46, + "kind": "text", + "text": "B" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 49, + "kind": "text", + "text": " :" + }, + { + "id": 50, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 57, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 54, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 53, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 52, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "text", + "text": "Real" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 55, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 67, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "text", + "text": "end record" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 77, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/doc-baseline.json b/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/doc-baseline.json index fa8cf3a32..5ce204344 100644 --- a/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/doc-baseline.json +++ b/testsuite/tests/unparsing/record_type_def/record_with_discriminants_null_component/doc-baseline.json @@ -1,498 +1,498 @@ -{ - "id": 63, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 62, - "kind": "list", - "list": [ - { - "id": 39, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 38, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "type Point" - }, - { - "id": 35, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 34, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 33, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 28, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 13, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "text", - "text": "X," - }, - { - "id": 4, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 5, - "kind": "text", - "text": "Y" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 8, - "kind": "text", - "text": " :" - }, - { - "id": 12, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 11, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 10, - "kind": "text", - "text": "Natural" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 21, - "kind": "text", - "text": " :=" - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 23, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 20, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "text", - "text": " :=" - }, - { - "id": 16, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 17, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 32, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 36, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 37, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 60, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 59, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 57, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 54, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 53, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "command", - "command": { - "command": "breakParent" - } - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 47, - "kind": "list", - "list": [ - { - "id": 42, - "kind": "text", - "text": "record" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 45, - "kind": "list", - "list": [ - { - "id": 43, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 44, - "kind": "text", - "text": "null;" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 49, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 52, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 51, - "kind": "list", - "list": [ - { - "id": 50, - "kind": "text", - "text": "end record" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 61, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 63, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 62, + "kind": "list", + "list": [ + { + "id": 39, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 38, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "type Point" + }, + { + "id": 35, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 34, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 33, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 28, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 6, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "text", + "text": "X," + }, + { + "id": 4, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 5, + "kind": "text", + "text": "Y" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 8, + "kind": "text", + "text": " :" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 11, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 10, + "kind": "text", + "text": "Natural" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 20, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": " :=" + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 17, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "text", + "text": " :=" + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 23, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 32, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 36, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 37, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 60, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 59, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 57, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 54, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 53, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "command", + "command": { + "command": "breakParent" + } + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 47, + "kind": "list", + "list": [ + { + "id": 42, + "kind": "text", + "text": "record" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 45, + "kind": "list", + "list": [ + { + "id": 43, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 44, + "kind": "text", + "text": "null;" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 49, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 52, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 51, + "kind": "list", + "list": [ + { + "id": 50, + "kind": "text", + "text": "end record" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 61, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/doc-baseline.json b/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/doc-baseline.json index 9a6903d42..1d68880dd 100644 --- a/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/doc-baseline.json +++ b/testsuite/tests/unparsing/record_type_def/record_with_long_discriminants/doc-baseline.json @@ -1,831 +1,831 @@ -{ - "id": 106, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 105, - "kind": "list", - "list": [ - { - "id": 66, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 65, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "type Point" - }, - { - "id": 62, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 61, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 60, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 57, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 56, - "kind": "list", - "list": [ - { - "id": 29, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 28, - "kind": "list", - "list": [ - { - "id": 14, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 13, - "kind": "list", - "list": [ - { - "id": 7, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 6, - "kind": "list", - "list": [ - { - "id": 3, - "kind": "text", - "text": "Xxxxxxxxxxxxx," - }, - { - "id": 4, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 5, - "kind": "text", - "text": "Yxxxxxxxxxxxxxxx" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 8, - "kind": "text", - "text": " :" - }, - { - "id": 12, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 11, - "kind": "list", - "list": [ - { - "id": 9, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 10, - "kind": "text", - "text": "Natural" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 21, - "kind": "text", - "text": " :=" - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 23, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 20, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 19, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 18, - "kind": "list", - "list": [ - { - "id": 15, - "kind": "text", - "text": " :=" - }, - { - "id": 16, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 17, - "kind": "text", - "text": "0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 30, - "kind": "text", - "text": ";" - }, - { - "id": 31, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 55, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 54, - "kind": "list", - "list": [ - { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - { - "id": 33, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 32, - "kind": "text", - "text": "Zzzzzzzzzzzzzzzzzzzzzzzzzz" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 34, - "kind": "text", - "text": " :" - }, - { - "id": 38, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 37, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 36, - "kind": "text", - "text": "Real" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 52, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 51, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 50, - "kind": "list", - "list": [ - { - "id": 47, - "kind": "text", - "text": " :=" - }, - { - "id": 48, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 49, - "kind": "text", - "text": "0.0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 46, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 45, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 44, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "text", - "text": " :=" - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 43, - "kind": "text", - "text": "0.0" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 59, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 63, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 64, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 102, - "kind": "list", - "list": [ - { - "id": 67, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 101, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 100, - "kind": "list", - "list": [ - { - "id": 99, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 98, - "kind": "list", - "list": [ - { - "id": 97, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 96, - "kind": "list", - "list": [ - { - "id": 68, - "kind": "command", - "command": { - "command": "breakParent" - } - }, - { - "id": 91, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 90, - "kind": "list", - "list": [ - { - "id": 69, - "kind": "text", - "text": "record" - }, - { - "id": 89, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 88, - "kind": "list", - "list": [ - { - "id": 70, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 87, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 86, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 85, - "kind": "list", - "list": [ - { - "id": 75, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 74, - "kind": "list", - "list": [ - { - "id": 71, - "kind": "text", - "text": "A," - }, - { - "id": 72, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 73, - "kind": "text", - "text": "B" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 76, - "kind": "text", - "text": " :" - }, - { - "id": 77, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 84, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 83, - "kind": "list", - "list": [ - { - "id": 81, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 80, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 79, - "kind": "list", - "list": [ - { - "id": 78, - "kind": "text", - "text": "Real" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 82, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 92, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 95, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 93, - "kind": "text", - "text": "end record" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 104, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 106, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 105, + "kind": "list", + "list": [ + { + "id": 66, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 65, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "type Point" + }, + { + "id": 62, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 61, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 60, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 57, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 56, + "kind": "list", + "list": [ + { + "id": 29, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 28, + "kind": "list", + "list": [ + { + "id": 14, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 13, + "kind": "list", + "list": [ + { + "id": 7, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 6, + "kind": "list", + "list": [ + { + "id": 3, + "kind": "text", + "text": "Xxxxxxxxxxxxx," + }, + { + "id": 4, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 5, + "kind": "text", + "text": "Yxxxxxxxxxxxxxxx" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 8, + "kind": "text", + "text": " :" + }, + { + "id": 12, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 11, + "kind": "list", + "list": [ + { + "id": 9, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 10, + "kind": "text", + "text": "Natural" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 20, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 19, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 18, + "kind": "list", + "list": [ + { + "id": 15, + "kind": "text", + "text": " :=" + }, + { + "id": 16, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 17, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 21, + "kind": "text", + "text": " :=" + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 23, + "kind": "text", + "text": "0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 30, + "kind": "text", + "text": ";" + }, + { + "id": 31, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 55, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 54, + "kind": "list", + "list": [ + { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + { + "id": 33, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 32, + "kind": "text", + "text": "Zzzzzzzzzzzzzzzzzzzzzzzzzz" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 34, + "kind": "text", + "text": " :" + }, + { + "id": 38, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 37, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 36, + "kind": "text", + "text": "Real" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 46, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 45, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 44, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "text", + "text": " :=" + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 43, + "kind": "text", + "text": "0.0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 52, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 51, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 50, + "kind": "list", + "list": [ + { + "id": 47, + "kind": "text", + "text": " :=" + }, + { + "id": 48, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 49, + "kind": "text", + "text": "0.0" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 59, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 63, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 64, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 102, + "kind": "list", + "list": [ + { + "id": 67, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 101, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 100, + "kind": "list", + "list": [ + { + "id": 99, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 98, + "kind": "list", + "list": [ + { + "id": 97, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 96, + "kind": "list", + "list": [ + { + "id": 68, + "kind": "command", + "command": { + "command": "breakParent" + } + }, + { + "id": 91, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 90, + "kind": "list", + "list": [ + { + "id": 69, + "kind": "text", + "text": "record" + }, + { + "id": 89, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 88, + "kind": "list", + "list": [ + { + "id": 70, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 87, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 86, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 85, + "kind": "list", + "list": [ + { + "id": 75, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 74, + "kind": "list", + "list": [ + { + "id": 71, + "kind": "text", + "text": "A," + }, + { + "id": 72, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 73, + "kind": "text", + "text": "B" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 76, + "kind": "text", + "text": " :" + }, + { + "id": 77, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 84, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 83, + "kind": "list", + "list": [ + { + "id": 81, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 80, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 79, + "kind": "list", + "list": [ + { + "id": 78, + "kind": "text", + "text": "Real" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 82, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 92, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 95, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 93, + "kind": "text", + "text": "end record" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 104, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/record_type_def/record_with_variant/doc-baseline.json b/testsuite/tests/unparsing/record_type_def/record_with_variant/doc-baseline.json index 458dcb7ae..9024aef5a 100644 --- a/testsuite/tests/unparsing/record_type_def/record_with_variant/doc-baseline.json +++ b/testsuite/tests/unparsing/record_type_def/record_with_variant/doc-baseline.json @@ -1,975 +1,975 @@ -{ - "id": 126, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 125, - "kind": "list", - "list": [ - { - "id": 30, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 29, - "kind": "list", - "list": [ - { - "id": 0, - "kind": "text", - "text": "type Expr" - }, - { - "id": 26, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 25, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 24, - "kind": "list", - "list": [ - { - "id": 1, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 2, - "kind": "text", - "text": "(" - }, - { - "id": 22, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 1 - }, - "alignContents": { - "id": 21, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 20, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 19, - "kind": "list", - "list": [ - { - "id": 11, - "kind": "command", - "command": { - "command": "group", - "id": 1, - "groupContents": { - "id": 10, - "kind": "list", - "list": [ - { - "id": 4, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 3, - "kind": "text", - "text": "Kind" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 5, - "kind": "text", - "text": " :" - }, - { - "id": 9, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 8, - "kind": "list", - "list": [ - { - "id": 6, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 7, - "kind": "text", - "text": "Expr_Kind_Type" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 18, - "kind": "command", - "command": { - "command": "ifBreak", - "ifBreakGroupId": 1, - "breakContents": { - "id": 17, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 4 - }, - "alignContents": { - "id": 16, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 15, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - "flatContents": { - "id": 14, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 13, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 12, - "kind": "list", - "list": [ - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 23, - "kind": "text", - "text": ")" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 27, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 28, - "kind": "text", - "text": "is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 123, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 122, - "kind": "list", - "list": [ - { - "id": 31, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 121, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 120, - "kind": "list", - "list": [ - { - "id": 119, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 118, - "kind": "list", - "list": [ - { - "id": 117, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 116, - "kind": "list", - "list": [ - { - "id": 32, - "kind": "command", - "command": { - "command": "breakParent" - } - }, - { - "id": 111, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 110, - "kind": "list", - "list": [ - { - "id": 33, - "kind": "text", - "text": "record" - }, - { - "id": 109, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 108, - "kind": "list", - "list": [ - { - "id": 34, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 40, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 39, - "kind": "list", - "list": [ - { - "id": 35, - "kind": "text", - "text": "case " - }, - { - "id": 37, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 36, - "kind": "text", - "text": "Kind" - } - } - }, - { - "id": 38, - "kind": "text", - "text": " is" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 105, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 104, - "kind": "list", - "list": [ - { - "id": 43, - "kind": "list", - "list": [ - { - "id": 41, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 42, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 73, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 72, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 71, - "kind": "list", - "list": [ - { - "id": 44, - "kind": "text", - "text": "when " - }, - { - "id": 49, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 48, - "kind": "list", - "list": [ - { - "id": 45, - "kind": "text", - "text": "Bin_Op_A" - }, - { - "id": 46, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 47, - "kind": "text", - "text": "| Bin_Op_B" - } - ] - } - } - }, - { - "id": 50, - "kind": "text", - "text": " =>" - }, - { - "id": 70, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 69, - "kind": "list", - "list": [ - { - "id": 51, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 68, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 67, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 66, - "kind": "list", - "list": [ - { - "id": 56, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 55, - "kind": "list", - "list": [ - { - "id": 52, - "kind": "text", - "text": "L," - }, - { - "id": 53, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 54, - "kind": "text", - "text": "R" - } - ] - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 57, - "kind": "text", - "text": " :" - }, - { - "id": 58, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 65, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 64, - "kind": "list", - "list": [ - { - "id": 62, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 61, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 60, - "kind": "list", - "list": [ - { - "id": 59, - "kind": "text", - "text": "Expr_Access" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 63, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 76, - "kind": "list", - "list": [ - { - "id": 74, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 75, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 79, - "kind": "list", - "list": [ - { - "id": 77, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 78, - "kind": "command", - "command": { - "command": "breakParent" - } - } - ] - }, - { - "id": 103, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 102, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 101, - "kind": "list", - "list": [ - { - "id": 80, - "kind": "text", - "text": "when " - }, - { - "id": 82, - "kind": "command", - "command": { - "command": "indent", - "indentContents": { - "id": 81, - "kind": "text", - "text": "Num" - } - } - }, - { - "id": 83, - "kind": "text", - "text": " =>" - }, - { - "id": 100, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 99, - "kind": "list", - "list": [ - { - "id": 84, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 98, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 97, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 96, - "kind": "list", - "list": [ - { - "id": 86, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 85, - "kind": "text", - "text": "Val" - }, - "break": false, - "expandedStates": null - } - }, - { - "id": 87, - "kind": "text", - "text": " :" - }, - { - "id": 88, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": false - } - }, - { - "id": 95, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 94, - "kind": "list", - "list": [ - { - "id": 92, - "kind": "command", - "command": { - "command": "align", - "alignData": { - "kind": "width", - "n": 2 - }, - "alignContents": { - "id": 91, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 90, - "kind": "list", - "list": [ - { - "id": 89, - "kind": "text", - "text": "Integer" - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - }, - { - "id": 93, - "kind": "text", - "text": ";" - } - ] - } - } - } - ] - }, - "break": false, - "expandedStates": null - } - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": false, - "expandedStates": null - } - } - } - } - ] - } - } - }, - { - "id": 106, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 107, - "kind": "text", - "text": "end case;" - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 112, - "kind": "command", - "command": { - "command": "line", - "literal": false, - "soft": false, - "hard": true - } - }, - { - "id": 115, - "kind": "command", - "command": { - "command": "group", - "id": 0, - "groupContents": { - "id": 114, - "kind": "list", - "list": [ - { - "id": 113, - "kind": "text", - "text": "end record" - } - ] - }, - "break": false, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - }, - "break": true, - "expandedStates": null - } - } - ] - } - } - }, - { - "id": 124, - "kind": "text", - "text": ";" - } - ] - }, - "break": true, - "expandedStates": null - } -} +{ + "id": 126, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 125, + "kind": "list", + "list": [ + { + "id": 30, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 29, + "kind": "list", + "list": [ + { + "id": 0, + "kind": "text", + "text": "type Expr" + }, + { + "id": 26, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 25, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 24, + "kind": "list", + "list": [ + { + "id": 1, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 2, + "kind": "text", + "text": "(" + }, + { + "id": 22, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 1 + }, + "alignContents": { + "id": 21, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 20, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 19, + "kind": "list", + "list": [ + { + "id": 11, + "kind": "command", + "command": { + "command": "group", + "id": 1, + "groupContents": { + "id": 10, + "kind": "list", + "list": [ + { + "id": 4, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 3, + "kind": "text", + "text": "Kind" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 5, + "kind": "text", + "text": " :" + }, + { + "id": 9, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 8, + "kind": "list", + "list": [ + { + "id": 6, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 7, + "kind": "text", + "text": "Expr_Kind_Type" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 18, + "kind": "command", + "command": { + "command": "ifBreak", + "ifBreakGroupId": 1, + "breakContents": { + "id": 14, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 4 + }, + "alignContents": { + "id": 13, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 12, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + "flatContents": { + "id": 17, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 16, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 15, + "kind": "list", + "list": [ + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 23, + "kind": "text", + "text": ")" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 27, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 28, + "kind": "text", + "text": "is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 123, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 122, + "kind": "list", + "list": [ + { + "id": 31, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 121, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 120, + "kind": "list", + "list": [ + { + "id": 119, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 118, + "kind": "list", + "list": [ + { + "id": 117, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 116, + "kind": "list", + "list": [ + { + "id": 32, + "kind": "command", + "command": { + "command": "breakParent" + } + }, + { + "id": 111, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 110, + "kind": "list", + "list": [ + { + "id": 33, + "kind": "text", + "text": "record" + }, + { + "id": 109, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 108, + "kind": "list", + "list": [ + { + "id": 34, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 40, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 39, + "kind": "list", + "list": [ + { + "id": 35, + "kind": "text", + "text": "case " + }, + { + "id": 37, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 36, + "kind": "text", + "text": "Kind" + } + } + }, + { + "id": 38, + "kind": "text", + "text": " is" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 105, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 104, + "kind": "list", + "list": [ + { + "id": 43, + "kind": "list", + "list": [ + { + "id": 41, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 42, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 73, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 72, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 71, + "kind": "list", + "list": [ + { + "id": 44, + "kind": "text", + "text": "when " + }, + { + "id": 49, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 48, + "kind": "list", + "list": [ + { + "id": 45, + "kind": "text", + "text": "Bin_Op_A" + }, + { + "id": 46, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 47, + "kind": "text", + "text": "| Bin_Op_B" + } + ] + } + } + }, + { + "id": 50, + "kind": "text", + "text": " =>" + }, + { + "id": 70, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 69, + "kind": "list", + "list": [ + { + "id": 51, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 68, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 67, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 66, + "kind": "list", + "list": [ + { + "id": 56, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 55, + "kind": "list", + "list": [ + { + "id": 52, + "kind": "text", + "text": "L," + }, + { + "id": 53, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 54, + "kind": "text", + "text": "R" + } + ] + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 57, + "kind": "text", + "text": " :" + }, + { + "id": 58, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 65, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 64, + "kind": "list", + "list": [ + { + "id": 62, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 61, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 60, + "kind": "list", + "list": [ + { + "id": 59, + "kind": "text", + "text": "Expr_Access" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 63, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 76, + "kind": "list", + "list": [ + { + "id": 74, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 75, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 79, + "kind": "list", + "list": [ + { + "id": 77, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 78, + "kind": "command", + "command": { + "command": "breakParent" + } + } + ] + }, + { + "id": 103, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 102, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 101, + "kind": "list", + "list": [ + { + "id": 80, + "kind": "text", + "text": "when " + }, + { + "id": 82, + "kind": "command", + "command": { + "command": "indent", + "indentContents": { + "id": 81, + "kind": "text", + "text": "Num" + } + } + }, + { + "id": 83, + "kind": "text", + "text": " =>" + }, + { + "id": 100, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 99, + "kind": "list", + "list": [ + { + "id": 84, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 98, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 97, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 96, + "kind": "list", + "list": [ + { + "id": 86, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 85, + "kind": "text", + "text": "Val" + }, + "break": false, + "expandedStates": null + } + }, + { + "id": 87, + "kind": "text", + "text": " :" + }, + { + "id": 88, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": false + } + }, + { + "id": 95, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 94, + "kind": "list", + "list": [ + { + "id": 92, + "kind": "command", + "command": { + "command": "align", + "alignData": { + "kind": "width", + "n": 2 + }, + "alignContents": { + "id": 91, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 90, + "kind": "list", + "list": [ + { + "id": 89, + "kind": "text", + "text": "Integer" + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + }, + { + "id": 93, + "kind": "text", + "text": ";" + } + ] + } + } + } + ] + }, + "break": false, + "expandedStates": null + } + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": false, + "expandedStates": null + } + } + } + } + ] + } + } + }, + { + "id": 106, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 107, + "kind": "text", + "text": "end case;" + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 112, + "kind": "command", + "command": { + "command": "line", + "literal": false, + "soft": false, + "hard": true + } + }, + { + "id": 115, + "kind": "command", + "command": { + "command": "group", + "id": 0, + "groupContents": { + "id": 114, + "kind": "list", + "list": [ + { + "id": 113, + "kind": "text", + "text": "end record" + } + ] + }, + "break": false, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + }, + "break": true, + "expandedStates": null + } + } + ] + } + } + }, + { + "id": 124, + "kind": "text", + "text": ";" + } + ] + }, + "break": true, + "expandedStates": null + } +} diff --git a/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json b/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json index 4eade099a..9283b80d9 100644 --- a/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body/no_end_name/doc-baseline.json @@ -189,7 +189,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -198,13 +198,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -216,7 +216,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -225,13 +225,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -366,7 +366,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -375,13 +375,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -393,7 +393,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -402,13 +402,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -543,7 +543,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -552,13 +552,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -570,7 +570,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -579,13 +579,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -720,7 +720,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -729,13 +729,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -747,7 +747,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -756,13 +756,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json b/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json index 3293de806..a92a1226a 100644 --- a/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_body/with_decls/doc-baseline.json @@ -189,7 +189,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -198,13 +198,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -216,7 +216,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -225,13 +225,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -366,7 +366,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -375,13 +375,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -393,7 +393,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -402,13 +402,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -543,7 +543,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -552,13 +552,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -570,7 +570,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -579,13 +579,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -720,7 +720,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -729,13 +729,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -747,7 +747,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -756,13 +756,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json index ddd7a8778..8bbfd2474 100644 --- a/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_not_overriding/doc-baseline.json @@ -214,7 +214,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 21, + "id": 18, "kind": "command", "command": { "command": "align", @@ -223,13 +223,13 @@ "n": 4 }, "alignContents": { - "id": 20, + "id": 17, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 19, + "id": 16, "kind": "list", "list": [ ] @@ -241,7 +241,7 @@ } }, "flatContents": { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "align", @@ -250,13 +250,13 @@ "n": 2 }, "alignContents": { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ ] @@ -391,7 +391,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 43, + "id": 40, "kind": "command", "command": { "command": "align", @@ -400,13 +400,13 @@ "n": 4 }, "alignContents": { - "id": 42, + "id": 39, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 41, + "id": 38, "kind": "list", "list": [ ] @@ -418,7 +418,7 @@ } }, "flatContents": { - "id": 40, + "id": 43, "kind": "command", "command": { "command": "align", @@ -427,13 +427,13 @@ "n": 2 }, "alignContents": { - "id": 39, + "id": 42, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 38, + "id": 41, "kind": "list", "list": [ ] @@ -568,7 +568,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 65, + "id": 62, "kind": "command", "command": { "command": "align", @@ -577,13 +577,13 @@ "n": 4 }, "alignContents": { - "id": 64, + "id": 61, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 63, + "id": 60, "kind": "list", "list": [ ] @@ -595,7 +595,7 @@ } }, "flatContents": { - "id": 62, + "id": 65, "kind": "command", "command": { "command": "align", @@ -604,13 +604,13 @@ "n": 2 }, "alignContents": { - "id": 61, + "id": 64, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 60, + "id": 63, "kind": "list", "list": [ ] @@ -745,7 +745,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 87, + "id": 84, "kind": "command", "command": { "command": "align", @@ -754,13 +754,13 @@ "n": 4 }, "alignContents": { - "id": 86, + "id": 83, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 85, + "id": 82, "kind": "list", "list": [ ] @@ -772,7 +772,7 @@ } }, "flatContents": { - "id": 84, + "id": 87, "kind": "command", "command": { "command": "align", @@ -781,13 +781,13 @@ "n": 2 }, "alignContents": { - "id": 83, + "id": 86, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 82, + "id": 85, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json index 089b81d3a..91d1fd90e 100644 --- a/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_with_long_aspects/doc-baseline.json @@ -199,7 +199,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -208,13 +208,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -226,7 +226,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -235,13 +235,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -376,7 +376,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -385,13 +385,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -403,7 +403,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -412,13 +412,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -553,7 +553,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -562,13 +562,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -580,7 +580,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -589,13 +589,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -730,7 +730,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -739,13 +739,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -757,7 +757,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -766,13 +766,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json index dd7511cf3..63bd23d20 100644 --- a/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/long_with_short_aspects/doc-baseline.json @@ -199,7 +199,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -208,13 +208,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -226,7 +226,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -235,13 +235,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -376,7 +376,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -385,13 +385,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -403,7 +403,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -412,13 +412,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -553,7 +553,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -562,13 +562,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -580,7 +580,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -589,13 +589,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -730,7 +730,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -739,13 +739,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -757,7 +757,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -766,13 +766,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json index 97d6e3571..b0a9d4a94 100644 --- a/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/short_overriding/doc-baseline.json @@ -214,7 +214,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 21, + "id": 18, "kind": "command", "command": { "command": "align", @@ -223,13 +223,13 @@ "n": 4 }, "alignContents": { - "id": 20, + "id": 17, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 19, + "id": 16, "kind": "list", "list": [ ] @@ -241,7 +241,7 @@ } }, "flatContents": { - "id": 18, + "id": 21, "kind": "command", "command": { "command": "align", @@ -250,13 +250,13 @@ "n": 2 }, "alignContents": { - "id": 17, + "id": 20, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 16, + "id": 19, "kind": "list", "list": [ ] @@ -391,7 +391,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 43, + "id": 40, "kind": "command", "command": { "command": "align", @@ -400,13 +400,13 @@ "n": 4 }, "alignContents": { - "id": 42, + "id": 39, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 41, + "id": 38, "kind": "list", "list": [ ] @@ -418,7 +418,7 @@ } }, "flatContents": { - "id": 40, + "id": 43, "kind": "command", "command": { "command": "align", @@ -427,13 +427,13 @@ "n": 2 }, "alignContents": { - "id": 39, + "id": 42, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 38, + "id": 41, "kind": "list", "list": [ ] @@ -568,7 +568,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 65, + "id": 62, "kind": "command", "command": { "command": "align", @@ -577,13 +577,13 @@ "n": 4 }, "alignContents": { - "id": 64, + "id": 61, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 63, + "id": 60, "kind": "list", "list": [ ] @@ -595,7 +595,7 @@ } }, "flatContents": { - "id": 62, + "id": 65, "kind": "command", "command": { "command": "align", @@ -604,13 +604,13 @@ "n": 2 }, "alignContents": { - "id": 61, + "id": 64, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 60, + "id": 63, "kind": "list", "list": [ ] @@ -745,7 +745,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 87, + "id": 84, "kind": "command", "command": { "command": "align", @@ -754,13 +754,13 @@ "n": 4 }, "alignContents": { - "id": 86, + "id": 83, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 85, + "id": 82, "kind": "list", "list": [ ] @@ -772,7 +772,7 @@ } }, "flatContents": { - "id": 84, + "id": 87, "kind": "command", "command": { "command": "align", @@ -781,13 +781,13 @@ "n": 2 }, "alignContents": { - "id": 83, + "id": 86, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 82, + "id": 85, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json b/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json index 3ee008a23..af9c622c4 100644 --- a/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_decl/short_with_long_aspects/doc-baseline.json @@ -199,7 +199,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -208,13 +208,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -226,7 +226,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -235,13 +235,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -376,7 +376,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -385,13 +385,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -403,7 +403,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -412,13 +412,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -553,7 +553,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -562,13 +562,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -580,7 +580,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -589,13 +589,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -730,7 +730,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -739,13 +739,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -757,7 +757,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -766,13 +766,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json index 07a9f238b..869b3431b 100644 --- a/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/everything_long/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json index 2364bd0b8..7003a1428 100644 --- a/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/everything_short/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json index ed4a3f2b1..9a0fd9125 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_name/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json index 1a7ea4b3f..b6c10f80b 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_params/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json index 6229fb21b..464868e28 100644 --- a/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/function/long_return/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] diff --git a/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json b/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json index 21310db25..8a16d6841 100644 --- a/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json +++ b/testsuite/tests/unparsing/subp_spec/procedure/everything_short/doc-baseline.json @@ -179,7 +179,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 19, + "id": 16, "kind": "command", "command": { "command": "align", @@ -188,13 +188,13 @@ "n": 4 }, "alignContents": { - "id": 18, + "id": 15, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 17, + "id": 14, "kind": "list", "list": [ ] @@ -206,7 +206,7 @@ } }, "flatContents": { - "id": 16, + "id": 19, "kind": "command", "command": { "command": "align", @@ -215,13 +215,13 @@ "n": 2 }, "alignContents": { - "id": 15, + "id": 18, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 14, + "id": 17, "kind": "list", "list": [ ] @@ -356,7 +356,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 41, + "id": 38, "kind": "command", "command": { "command": "align", @@ -365,13 +365,13 @@ "n": 4 }, "alignContents": { - "id": 40, + "id": 37, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 39, + "id": 36, "kind": "list", "list": [ ] @@ -383,7 +383,7 @@ } }, "flatContents": { - "id": 38, + "id": 41, "kind": "command", "command": { "command": "align", @@ -392,13 +392,13 @@ "n": 2 }, "alignContents": { - "id": 37, + "id": 40, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 36, + "id": 39, "kind": "list", "list": [ ] @@ -533,7 +533,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 63, + "id": 60, "kind": "command", "command": { "command": "align", @@ -542,13 +542,13 @@ "n": 4 }, "alignContents": { - "id": 62, + "id": 59, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 61, + "id": 58, "kind": "list", "list": [ ] @@ -560,7 +560,7 @@ } }, "flatContents": { - "id": 60, + "id": 63, "kind": "command", "command": { "command": "align", @@ -569,13 +569,13 @@ "n": 2 }, "alignContents": { - "id": 59, + "id": 62, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 58, + "id": 61, "kind": "list", "list": [ ] @@ -710,7 +710,7 @@ "command": "ifBreak", "ifBreakGroupId": 1, "breakContents": { - "id": 85, + "id": 82, "kind": "command", "command": { "command": "align", @@ -719,13 +719,13 @@ "n": 4 }, "alignContents": { - "id": 84, + "id": 81, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 83, + "id": 80, "kind": "list", "list": [ ] @@ -737,7 +737,7 @@ } }, "flatContents": { - "id": 82, + "id": 85, "kind": "command", "command": { "command": "align", @@ -746,13 +746,13 @@ "n": 2 }, "alignContents": { - "id": 81, + "id": 84, "kind": "command", "command": { "command": "group", "id": 0, "groupContents": { - "id": 80, + "id": 83, "kind": "list", "list": [ ] From d570974eeae5226de061ab1c2992cb16a2a89fc8 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Fri, 15 Mar 2024 09:01:05 +0000 Subject: [PATCH 2/2] Revert "Testsuite: disable unparsing tests in Valgrind mode" This reverts commit 9e8933965a5ec4d63967a7e132c4e85fcf0b2392. Now that Prettier-Ada no longer has memory leaks, it makes sense to check leaks when Libadalang uses it. --- testsuite/drivers/unparser_driver.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testsuite/drivers/unparser_driver.py b/testsuite/drivers/unparser_driver.py index 577e80b08..cd68cb9ea 100644 --- a/testsuite/drivers/unparser_driver.py +++ b/testsuite/drivers/unparser_driver.py @@ -2,8 +2,6 @@ import os.path -from e3.testsuite.driver.classic import TestSkip - from drivers.base_driver import BaseDriver @@ -30,12 +28,6 @@ def unparsing_config_filename(self) -> str: ) def run(self) -> None: - # TODO (eng/libadalang/prettier-ada#10) Prettier-ada is known to leak - # memory. Until this is fixed, do not bother running related tests in - # Valgrind mode. - if self.env.options.valgrind: - raise TestSkip("Prettier-ada is known to leak memory") - # Run the unparser on "input.ada" for the given grammar rule and # unparse it with the default unparsing configuration, with a dump of # the Prettier document.