Regen expectations

2024-12-23 18:21:38 +03:00 · 2022-10-05 23:52:37 -07:00 · 2022-10-05 23:52:37 -07:00 · e1a148a93e
commit e1a148a93e
parent 35f77f2a12
520 changed files with 3173 additions and 3128 deletions
--- a/tests/expectations/compiler/address/binary.out
+++ b/tests/expectations/compiler/address/binary.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 6fe794fb01d1487fb7a345b0f102dd7c36d6d8c20eb4714d573b75355247271f
+      - initial_input_ast: 30ff54da2da7a73c10f6cc96ea951755d57840fe3bcd0c9d6c68b8ed6c4024e2
-    initial_ast: 4b433452cabd226703a35283f97ae91be2c402990efde4494f7a145eb01a6d61
+    initial_ast: a4bcf661e9661a1d9981c74efaca0886dd31270a9b1a505afd9a0353d3fbef86
-    unrolled_ast: 4b433452cabd226703a35283f97ae91be2c402990efde4494f7a145eb01a6d61
+    unrolled_ast: a4bcf661e9661a1d9981c74efaca0886dd31270a9b1a505afd9a0353d3fbef86
-    ssa_ast: 549e96deea6326ca5fe4804d7fee458faa41dd66b21ba5de8735a5787889fb56
+    ssa_ast: 798b6c449008ed6a38d603593dd3edf53aa30827e4ad2e0db6ef754999d1d807
-    flattened_ast: 366800014f01c02f43ca28ded769ff46d7b88af41bbd6f120cdcc40dcda57080
+    flattened_ast: 305593c39dc0c26ccccb1ed5f1e4fdb932af847cab04990449c0193bc7a2c20f
--- a/tests/expectations/compiler/address/branch.out
+++ b/tests/expectations/compiler/address/branch.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 1fc3274ffc0507598234994ec6bcc4e12298f627eeeb2f36144ca81a4893f1ce
+      - initial_input_ast: 613969730f6ac4ff47e6975f79edf83ac2d5398d029657cbe28d53dd74847d1c
-    initial_ast: 9800992ba52cc84527023aad7e49eab0696a382b561041476c6096165a87bf7e
+    initial_ast: b781ab4e896a31f33b4c80137639326117147b9499f3e6d086ac5d9c495a2ac0
-    unrolled_ast: 9800992ba52cc84527023aad7e49eab0696a382b561041476c6096165a87bf7e
+    unrolled_ast: b781ab4e896a31f33b4c80137639326117147b9499f3e6d086ac5d9c495a2ac0
-    ssa_ast: e9a3b3e3891fc448d2b06f42dff81688c3be0fbfba462593c58ebc618b288b50
+    ssa_ast: f128dc2ee3b1a636526c27b196e0b755b244cd9d8e52067541214b7909f38cf0
-    flattened_ast: 5f80f623329f09f5638afdf2692223a1185b9c45ce0d6bf3b0732de4755aff6d
+    flattened_ast: 1675206b4e0435049515729daa4468b6d4aab041812bf20758f74b79c40259aa
--- a/tests/expectations/compiler/address/equal.out
+++ b/tests/expectations/compiler/address/equal.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: f533691685959fa0cc55933850fc5bc8095c4b436fc8bd2b973db3441cb9129e
+      - initial_input_ast: 508ac917fe0d0779f2d43ae7695945dbe1fd00c457f08716dc51bbb2fe14e452
-    initial_ast: 5fd42a6ef049246a3ea47fcfd8d8967db4ff45e8469dc1c6349560d66b6f2e12
+    initial_ast: f85497aee759dfa93d5e40be89ce95a3011523e2fa2ffa8c6ba23ffe50476fdc
-    unrolled_ast: 5fd42a6ef049246a3ea47fcfd8d8967db4ff45e8469dc1c6349560d66b6f2e12
+    unrolled_ast: f85497aee759dfa93d5e40be89ce95a3011523e2fa2ffa8c6ba23ffe50476fdc
-    ssa_ast: dbde7e44b2037cef50d0a1eed6465acc7220abcca580039df50bdc3d244719df
+    ssa_ast: fda8333d6142536467e05fb5129198882eb028e6a2c0c6ed1d2339b9a716aba1
-    flattened_ast: ff15fe203325d73618e68905a1dcd443d5ef5c86ff04c0aad2a853aa07ce7e44
+    flattened_ast: ab7783ad36c7540c555836b66e7c6b07f7681824dfcb58d5bbd3f0ea5fbf6bbd
--- a/tests/expectations/compiler/address/gt_fail.out
+++ b/tests/expectations/compiler/address/gt_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372021]: Comparison `>` is not supported for the address type.\n    --> compiler-test:6:12\n     |\n   6 |     return x > sender;\n     |            ^^^^^^^^^^\n"
+  - "Error [ETYC0372021]: Comparison `>` is not supported for the address type.\n    --> compiler-test:7:16\n     |\n   7 |         return x > sender;\n     |                ^^^^^^^^^^\n"
--- a/tests/expectations/compiler/address/gte_fail.out
+++ b/tests/expectations/compiler/address/gte_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372021]: Comparison `>=` is not supported for the address type.\n    --> compiler-test:6:12\n     |\n   6 |     return x >= sender;\n     |            ^^^^^^^^^^^\n"
+  - "Error [ETYC0372021]: Comparison `>=` is not supported for the address type.\n    --> compiler-test:7:16\n     |\n   7 |         return x >= sender;\n     |                ^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/address/lt_fail.out
+++ b/tests/expectations/compiler/address/lt_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372021]: Comparison `<` is not supported for the address type.\n    --> compiler-test:6:12\n     |\n   6 |     return x < sender;\n     |            ^^^^^^^^^^\n"
+  - "Error [ETYC0372021]: Comparison `<` is not supported for the address type.\n    --> compiler-test:7:16\n     |\n   7 |         return x < sender;\n     |                ^^^^^^^^^^\n"
--- a/tests/expectations/compiler/address/lte_fail.out
+++ b/tests/expectations/compiler/address/lte_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372021]: Comparison `<=` is not supported for the address type.\n    --> compiler-test:6:12\n     |\n   6 |     return x <= sender;\n     |            ^^^^^^^^^^^\n"
+  - "Error [ETYC0372021]: Comparison `<=` is not supported for the address type.\n    --> compiler-test:7:16\n     |\n   7 |         return x <= sender;\n     |                ^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/address/ternary.out
+++ b/tests/expectations/compiler/address/ternary.out
@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 3ed9fa4d7694017e6c211b84086e737ae95a531ea215f218a7740840c657bdb5
+      - initial_input_ast: 64247a73944a1639b17e3fd8ae0777b6725a754160afb476f9b0b6b8495d9884
-      - initial_input_ast: 9747dbc5ec73ecb92aebac80cf6b78370ffa92acf93b818675ad98a1b5c8960f
+      - initial_input_ast: 9546ede7c01cbe3a4cbedf2296fbc6605f657c2e1843e8f50ef683bc3eedd18a
-    initial_ast: 4fea0c3ba86a2dd6c45f8ab99492c1b893517d0f99e239752edff437494bf240
+    initial_ast: c21c646c2e7f7b776a057934e4893c2411259c7cd94061dd8006a0ed284ba669
-    unrolled_ast: 4fea0c3ba86a2dd6c45f8ab99492c1b893517d0f99e239752edff437494bf240
+    unrolled_ast: c21c646c2e7f7b776a057934e4893c2411259c7cd94061dd8006a0ed284ba669
-    ssa_ast: e9a5290a4b94a75185f709731d3d6d106b1d7e4cf20222924843dc5447be96cb
+    ssa_ast: 38d2140f8bc0308859260c927be943d2671ce80eb9ef4c22b42a4090ffab9728
-    flattened_ast: 34ea57788c30161d443db8cca7a0676fff14b0555cae0471e3336cf99fb2eb19
+    flattened_ast: a0e0a2c74ebd61346d568368f55cacaa7417070467925dbfc10754b5c1fa4437
--- a/tests/expectations/compiler/boolean/and.out
+++ b/tests/expectations/compiler/boolean/and.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 2996703a385f0e9519667b452e3d1803f37a54824304e1f6ebb8d8cbcfaad285
+      - initial_input_ast: 6e3cf48bb32894a233f4d42f1db095b566039af54587bdc0a9d34a2d6d0f277a
-      - initial_input_ast: df912de94f28f402813992d45668cedf1b23134f1b00edd3552f42f3e297c9e7
+      - initial_input_ast: 37716c2fa42ffae9077a4a85bb1efeb2f57ea313defd50fd490884db90feab9f
-      - initial_input_ast: c0ee452696789431f1934562eea2aa0729fdb31199a4348e1482b2ca369cd097
+      - initial_input_ast: 97d29f6252adc86e152adf3bfde485a50154cdefa8ec4ffcd70dfe7c86a8ce10
-      - initial_input_ast: 8e9d186d86023770e382c5525118b7df20018ca5bde5553130a3793a5ea9b7ec
+      - initial_input_ast: 31529bed8d853012affec3525b28f05d69a8f3398e75efed74e49709ff89e5d0
-    initial_ast: e632e0e82ab557d81c81da2d048318a75a91e84791ee8f53885f3fe208764de2
+    initial_ast: 9269fac5a002cab579fa96fba2683e139480f7cb36e17e1a97ad0f978bc41d2c
-    unrolled_ast: e632e0e82ab557d81c81da2d048318a75a91e84791ee8f53885f3fe208764de2
+    unrolled_ast: 9269fac5a002cab579fa96fba2683e139480f7cb36e17e1a97ad0f978bc41d2c
-    ssa_ast: 33eeb5120914489f39a0e7a967fdd0ca77990bd9cb59fbf5b5e093e074e60d3e
+    ssa_ast: 055c1482321089f1c84759b6fb827627ccd6f4e8f460912850409523a551f1b2
-    flattened_ast: 10235a27d6a9afdfec379fe2061d1a7393c4caf290029d45ae0cb235a7908386
+    flattened_ast: da73712d568e808ed59b4fde16e169cd93c37785d2b108a23f896b115ad8b080
--- a/tests/expectations/compiler/boolean/conditional.out
+++ b/tests/expectations/compiler/boolean/conditional.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: d967db9b28561003af3cfc19a9ce782b55cd0bcdb555af6a2158b347a548aaa4
+      - initial_input_ast: de04f0888b01f0df0b1c9999dccdae6876da884e7e62a903099dcb81ee09401c
-      - initial_input_ast: f049b2866e2ec8e876ccaa3221109137b3d895d7ebfa0917506009861c15c687
+      - initial_input_ast: 878da6994882b56aa391034af5c1076219b172a8ba22273a2d467636644cfdad
-      - initial_input_ast: e047d07a8d39dbab50f3b02256ff7a58f9ba2a8b9128ef7f79867add3fd4416e
+      - initial_input_ast: 83d4066d6132815226ebd5db047fa658f136075c99ec054064109c9becb1c82c
-      - initial_input_ast: 5dd6a99b2d55a543947f75934bbbc7f32ab8478a5b1a567e6c917aaa1800d4ec
+      - initial_input_ast: 6ce34942fbaaedb6bba77dbe80723ee803508964445ca437e600b5868e1ed4fd
-    initial_ast: 94ab81ebab8c2f9cd23cb7f918298c3ce5faf19c879e9dd88527f4bde3e5af64
+    initial_ast: 891b9ffdd456bb562967d74ad2afdd8066450ef63fdca4f234a60435dcd0296a
-    unrolled_ast: 94ab81ebab8c2f9cd23cb7f918298c3ce5faf19c879e9dd88527f4bde3e5af64
+    unrolled_ast: 891b9ffdd456bb562967d74ad2afdd8066450ef63fdca4f234a60435dcd0296a
-    ssa_ast: 52a12ffe792a9956e7b2c0ccb697b6b0d729970ed480781974172dffafc2120e
+    ssa_ast: 0e38a8a2cbb256836bd031ef65135645f2a5a531ca199cab96d569009ed89fa7
-    flattened_ast: c722a8810758e3bd6d98ec9c573b4ecc641a12bb01b107564362ed136cd26dff
+    flattened_ast: 3503363a685653128309a3f28e24df051b8fd66bdb8d287db26bfd182fbb576b
--- a/tests/expectations/compiler/boolean/equal.out
+++ b/tests/expectations/compiler/boolean/equal.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 2996703a385f0e9519667b452e3d1803f37a54824304e1f6ebb8d8cbcfaad285
+      - initial_input_ast: 6e3cf48bb32894a233f4d42f1db095b566039af54587bdc0a9d34a2d6d0f277a
-      - initial_input_ast: df912de94f28f402813992d45668cedf1b23134f1b00edd3552f42f3e297c9e7
+      - initial_input_ast: 37716c2fa42ffae9077a4a85bb1efeb2f57ea313defd50fd490884db90feab9f
-      - initial_input_ast: c0ee452696789431f1934562eea2aa0729fdb31199a4348e1482b2ca369cd097
+      - initial_input_ast: 97d29f6252adc86e152adf3bfde485a50154cdefa8ec4ffcd70dfe7c86a8ce10
-      - initial_input_ast: 8e9d186d86023770e382c5525118b7df20018ca5bde5553130a3793a5ea9b7ec
+      - initial_input_ast: 31529bed8d853012affec3525b28f05d69a8f3398e75efed74e49709ff89e5d0
-    initial_ast: 59db66e983bdbe15694d36c06fd949881cee4a3980fc5fe8a4a01952526c36fb
+    initial_ast: cd14a221e3a2df0159db5218598bf1c511a28be47dd74200aaa8f1d6250ea4c7
-    unrolled_ast: 59db66e983bdbe15694d36c06fd949881cee4a3980fc5fe8a4a01952526c36fb
+    unrolled_ast: cd14a221e3a2df0159db5218598bf1c511a28be47dd74200aaa8f1d6250ea4c7
-    ssa_ast: 3941ab2b472a47760197987c89a180bf981c1d3f23380c214e6076baf17b477b
+    ssa_ast: da168bc2b396c6c0f76ddf29b2ee5993a40bf35921fcd7f61afe29fdaca734e9
-    flattened_ast: 3ad5f4831aa7153bd223b268643e4f6642380bf3051762c466dacaa3639f38a0
+    flattened_ast: 9ee5708390c3f6902822fd4da5e891c0adf565a4c62978f65a1c33a4ef9c3dbc
--- a/tests/expectations/compiler/boolean/not_equal.out
+++ b/tests/expectations/compiler/boolean/not_equal.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 2996703a385f0e9519667b452e3d1803f37a54824304e1f6ebb8d8cbcfaad285
+      - initial_input_ast: 6e3cf48bb32894a233f4d42f1db095b566039af54587bdc0a9d34a2d6d0f277a
-      - initial_input_ast: df912de94f28f402813992d45668cedf1b23134f1b00edd3552f42f3e297c9e7
+      - initial_input_ast: 37716c2fa42ffae9077a4a85bb1efeb2f57ea313defd50fd490884db90feab9f
-      - initial_input_ast: c0ee452696789431f1934562eea2aa0729fdb31199a4348e1482b2ca369cd097
+      - initial_input_ast: 97d29f6252adc86e152adf3bfde485a50154cdefa8ec4ffcd70dfe7c86a8ce10
-      - initial_input_ast: 8e9d186d86023770e382c5525118b7df20018ca5bde5553130a3793a5ea9b7ec
+      - initial_input_ast: 31529bed8d853012affec3525b28f05d69a8f3398e75efed74e49709ff89e5d0
-    initial_ast: be497f3d700b211736125d989bacd754b578ec5b7ac3439c955d52878e29c702
+    initial_ast: 4fff7b86b673dd71d0221173551ac8221806ed7092a06a0bd196beaeb9465de8
-    unrolled_ast: be497f3d700b211736125d989bacd754b578ec5b7ac3439c955d52878e29c702
+    unrolled_ast: 4fff7b86b673dd71d0221173551ac8221806ed7092a06a0bd196beaeb9465de8
-    ssa_ast: 20455e04a9a3aae37c2bbed53881b09439e22d8b938eba58567d7af7c607e094
+    ssa_ast: a1ab719005fb5c32680c96ac814bf6d1918e403d487e943a73e0a4e6a1875604
-    flattened_ast: c77733d19f566fc9a9c1b3ff02093201951dd7412f4eb151dd7d55fac8407762
+    flattened_ast: 1d6cbbabe9abfec1c515e82160f90f5251a48115b0eb12b02cd8432d01ea38f6
--- a/tests/expectations/compiler/boolean/operator_methods.out
+++ b/tests/expectations/compiler/boolean/operator_methods.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 79e5fac1bdedc2ff9432d537961faef3f87934d4e96161dd98cce9e2a26c291c
+      - initial_input_ast: 5f11995ed14c13eaa07df13fe2096463b28aae70e6b95dee5135057efe463d39
-      - initial_input_ast: 107197449062224df0b31c16ff2c5ac36698067656225ff5fd7c22d7f1712089
+      - initial_input_ast: 0451346a1d2b8c41fd8d6e016a3fc18a61229489550227f58f359ff06332e7b7
-      - initial_input_ast: 5e4465affcf1bfc682d23de48ef309aed64d016949b678c4cc1bd6d3379f7761
+      - initial_input_ast: 5ccafdeac9624b759f4fd6897adbec48d73986d63247fbbadbffa3cf84470674
-      - initial_input_ast: 2c1ee08a24d8e8d46d298b32a6aa1c430891ff0bdada13ab95f0a4397dc9a947
+      - initial_input_ast: ff196123ef62fc63cd552315d870c2407c085734c28fd440be7a1a0bb0dc114e
-    initial_ast: dbde92b2e73509383de1f9b04a33c07cb79f098fa4e538cc136987e465149982
+    initial_ast: 5c952bb0bbe8a3847db42d4e4f5f4d7aac86ad3cbc48f6899971d5b3dea7d8cb
-    unrolled_ast: dbde92b2e73509383de1f9b04a33c07cb79f098fa4e538cc136987e465149982
+    unrolled_ast: 5c952bb0bbe8a3847db42d4e4f5f4d7aac86ad3cbc48f6899971d5b3dea7d8cb
-    ssa_ast: 168d22e53cf2c913cd969f2579e8ef5783469a65c299fe773835ca2fa28c20ee
+    ssa_ast: 8d96cba8107bd0d1a71cd355a9b1aa46f18b5ed45ee874315ef97e29e305bb2d
-    flattened_ast: 5c07f3a3e7f74ce0315e02d7d67154cb96050cce64911c11344b3b2c6dca12a4
+    flattened_ast: 4dce24b3f5f0df6010c894eda15c02dcef029a04bd0048b30ff70e6647b986d1
--- a/tests/expectations/compiler/boolean/or.out
+++ b/tests/expectations/compiler/boolean/or.out
@ -3,11 +3,11 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 2996703a385f0e9519667b452e3d1803f37a54824304e1f6ebb8d8cbcfaad285
+      - initial_input_ast: 6e3cf48bb32894a233f4d42f1db095b566039af54587bdc0a9d34a2d6d0f277a
-      - initial_input_ast: df912de94f28f402813992d45668cedf1b23134f1b00edd3552f42f3e297c9e7
+      - initial_input_ast: 37716c2fa42ffae9077a4a85bb1efeb2f57ea313defd50fd490884db90feab9f
-      - initial_input_ast: c0ee452696789431f1934562eea2aa0729fdb31199a4348e1482b2ca369cd097
+      - initial_input_ast: 97d29f6252adc86e152adf3bfde485a50154cdefa8ec4ffcd70dfe7c86a8ce10
-      - initial_input_ast: 8e9d186d86023770e382c5525118b7df20018ca5bde5553130a3793a5ea9b7ec
+      - initial_input_ast: 31529bed8d853012affec3525b28f05d69a8f3398e75efed74e49709ff89e5d0
-    initial_ast: eb5c1f74ce6d07159bbb38c2158132de88cc6534942dcdc831d6dcb9552b9597
+    initial_ast: c004484db4a7dd5dc0b2c764cf61b140e86955ffcd079a59951dfbfd504e269d
-    unrolled_ast: eb5c1f74ce6d07159bbb38c2158132de88cc6534942dcdc831d6dcb9552b9597
+    unrolled_ast: c004484db4a7dd5dc0b2c764cf61b140e86955ffcd079a59951dfbfd504e269d
-    ssa_ast: 890db0aab9e0b9ebc1e2476fd1c0d0e50fa66d022ac72ba371c40c2aed147e35
+    ssa_ast: 3185c86f842257ed17cd1b6111d5c6fb7fcd125fc1382b491913228fe37a1aa4
-    flattened_ast: 842ac2c22a10b23fe2f577b9faae52526fdb52e7c4e3afdc5e311ac2fb8e3679
+    flattened_ast: af518c0d1c4b8b25c6deffa6976ba54d48e92ac71f6920b9373bc0f009341099
--- a/tests/expectations/compiler/console/assert.out
+++ b/tests/expectations/compiler/console/assert.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: e563a352fedc555c7444abf3086e59f3cefb014c2a03197d38dbec625614849c
+      - initial_input_ast: e7874e1d569eadaa5313be245f71202463aef0100ae21305a8212812f2881555
-    initial_ast: e3cbf9c52dc72616fc115a8d9b486b53220ffef2cf5ed94a2c912b0de320d694
+    initial_ast: 3de295c355d0f2ddff68a436df6e4455752e69a7f956dfb3d8dabb0d83080c93
-    unrolled_ast: e3cbf9c52dc72616fc115a8d9b486b53220ffef2cf5ed94a2c912b0de320d694
+    unrolled_ast: 3de295c355d0f2ddff68a436df6e4455752e69a7f956dfb3d8dabb0d83080c93
-    ssa_ast: 80099ae4422fd9546af52a21c0139ab49b461b5dadd43f0f4f3f127a504d7013
+    ssa_ast: 932ec44b122ddf173798d31be23c176f72c1eee03d7cecfdce17242977ca75b4
-    flattened_ast: 7d787e7c307117bf07eba2275f9429ac3d22b213e045deaa442162f2c805a0b8
+    flattened_ast: 385b716fa95d33eb36179087b85ffe4d15c0fd9e294174f88bcd61d834473147
--- a/tests/expectations/compiler/console/assert_fail.out
+++ b/tests/expectations/compiler/console/assert_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected , -- found ')'\n    --> compiler-test:5:31\n     |\n   5 |     console.assert_eq(a == 1u8);\n     |                               ^"
+  - "Error [EPAR0370005]: expected , -- found ')'\n    --> compiler-test:6:35\n     |\n   6 |         console.assert_eq(a == 1u8);\n     |                                   ^"
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: da3db1e9e48290b7b26786da2865227f6674ab8dd30dbd18cacf7d110040a384
+      - initial_input_ast: a30505e4422e13fcbf395f44b70bfd5fbe3a59c5328814405df5cfeaab639d55
-    initial_ast: ed4c9b47e5ff374b0c33c85a589175bd2a2b5cf780e14c15e97a13f212b7b74c
+    initial_ast: 81312b812ffd99514218a2b97a285a071355acd771dd73da553716d4a6088a24
-    unrolled_ast: ed4c9b47e5ff374b0c33c85a589175bd2a2b5cf780e14c15e97a13f212b7b74c
+    unrolled_ast: 81312b812ffd99514218a2b97a285a071355acd771dd73da553716d4a6088a24
-    ssa_ast: 61aa8c14f146a8314c6d71db5da7e97ef3b1e2e4851507b0042ca8e0c00549d5
+    ssa_ast: 3bf4465fa7037bae8c4ddf07fd4a1a67e72558865b22fe4e1108a6d00d11fa75
-    flattened_ast: 92930b8d3b1a88e0a46b237e24147680402a1928bb16f547296d9de0ad586239
+    flattened_ast: efd6c65caf99fb00467b08626d3aaa8bc93186e8424fc5c23610ecf6a9c7dae2
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 9cd80ad50d1260fe5113b074779d142cc03aebaa157f2e8fc4d47ca4869f8bcc
+      - initial_input_ast: 9df63ce5d0366e8ba31fb07e696dc2e67f64371f629c66d3a9ddb715c923692e
-    initial_ast: 8977bff94f11109acd37c8b6644a387c09081dfde51392b8a0b2fe6bd0166ff7
+    initial_ast: b8769ff525e6f258bb27fe13eb1c0828f5ceaee62f2bc0a5537dbd6e26dbf5a3
-    unrolled_ast: 8977bff94f11109acd37c8b6644a387c09081dfde51392b8a0b2fe6bd0166ff7
+    unrolled_ast: b8769ff525e6f258bb27fe13eb1c0828f5ceaee62f2bc0a5537dbd6e26dbf5a3
-    ssa_ast: 876727299d271c3840af98e5493bdd257b9f49e15bd6591347dc4bc55524a557
+    ssa_ast: 04ed79c5f4a1faf52032b353d8f8297a467d8e02ed447f7f81e393b3ddf24ed3
-    flattened_ast: c713bb4b288c6dd23a8d2485a245024e22e452425aa90f64121306a2ce4f93df
+    flattened_ast: 0c95bcbb644f61776a20fb9b885b6cb48f9adb552192d7acf5a80670ccde21e0
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8a2c46277f1758d0fef5e0e0024b36279001addac2a0eb81c21ec4bb0eb930c3
+      - initial_input_ast: 81e7b4b48e21c631f656aa65b6d19ebb7d784b43229356b918f908a046734261
-    initial_ast: 2d9d2b156a8a6e218a7cd3f21734da0fb047d7a4da09580a495aeb3a34071aad
+    initial_ast: 8e87f090c0609b94b233cfb06a5e04668522a1d64ee3df7690da3626dd7de722
-    unrolled_ast: 2d9d2b156a8a6e218a7cd3f21734da0fb047d7a4da09580a495aeb3a34071aad
+    unrolled_ast: 8e87f090c0609b94b233cfb06a5e04668522a1d64ee3df7690da3626dd7de722
-    ssa_ast: 1009967aaafadef66c262a80d302a04ea5e3d33b7f0f50ae370679b9376c2d7a
+    ssa_ast: 232eaa57f15cacf6dc99d9a0599915b1adee632e5de070dfa6c5aa9e117e5d61
-    flattened_ast: 83c5e5372cacb159a7c588321d8265a6e975e1847d9efcd2870da994b7d8a1a5
+    flattened_ast: 0e223b52044c42ab29c340998ee76946a5ebcab27b7311c19b26b2072276b3c5
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8e3a97af382bb560e176d56aa42e695e6926204ffdbb30bafe6b5b4544a35ca5
+      - initial_input_ast: 3cb982a5d4144e548fca897ceb686ad1f638971bb22fff7b935363eacc1b3473
-    initial_ast: 9b36cd2879cbdd38f1916cf00038f3ad2f70abbe24797cb9830103cf5d331ebd
+    initial_ast: 0409d264a9e7132f14f312781b404b0a4ba7a9835af7145bd82e74e90f20dba7
-    unrolled_ast: 9b36cd2879cbdd38f1916cf00038f3ad2f70abbe24797cb9830103cf5d331ebd
+    unrolled_ast: 0409d264a9e7132f14f312781b404b0a4ba7a9835af7145bd82e74e90f20dba7
-    ssa_ast: 07ba103d12db6e293e9eeeb4b64dd87a1bd1901a7ec738ff308c5b1dbeff7372
+    ssa_ast: 7801e83d9bc93fa26a769c94cc7a08b8676f761869da8e6ca4523e5d144cb5e6
-    flattened_ast: 410b955c66b321bc75ff6a55f9eb196b25584d6172a94af8bb36a0e2c92c8e55
+    flattened_ast: 2bbafd8b601c9475cb180e254dabbf08a2d9da07c63cadd6b21252a38e4129c5
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8a2c46277f1758d0fef5e0e0024b36279001addac2a0eb81c21ec4bb0eb930c3
+      - initial_input_ast: 81e7b4b48e21c631f656aa65b6d19ebb7d784b43229356b918f908a046734261
-    initial_ast: e2fa84f9513a3188095e45373b19d85638b3a04f650328a86a38393489dd97c1
+    initial_ast: f6dd9e4cab9891cb96d73505558bb9294dcff1756ebee57fb6c44c3424bce63d
-    unrolled_ast: e2fa84f9513a3188095e45373b19d85638b3a04f650328a86a38393489dd97c1
+    unrolled_ast: f6dd9e4cab9891cb96d73505558bb9294dcff1756ebee57fb6c44c3424bce63d
-    ssa_ast: 562dbb7cedc1dc535fef67d2b83f58f1c683b8b3d7fbc01f7eafe6c82f49355f
+    ssa_ast: 3d812d01adde60b0a3201ecea2ac6e3b8589ed5b9a00994522835a579c11af55
-    flattened_ast: 9bf21bd9caf89fc87560d235c7a399702006acefa00ec982cecfa75f5a1174bb
+    flattened_ast: 2ad8be7ffefae31b19fbb3cddc9f7c3615225185b54d2c20e6456fe9d8502614
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8e3a97af382bb560e176d56aa42e695e6926204ffdbb30bafe6b5b4544a35ca5
+      - initial_input_ast: 3cb982a5d4144e548fca897ceb686ad1f638971bb22fff7b935363eacc1b3473
-    initial_ast: dafc6bd6ae500cf4e35d68e4bf53a6acfb2cdae279fd7a055b670ffdaae24447
+    initial_ast: 302d16dc5e96221e8a683499eb9535d643ab076d99e0cd8a4b7eccff7f1d89b6
-    unrolled_ast: dafc6bd6ae500cf4e35d68e4bf53a6acfb2cdae279fd7a055b670ffdaae24447
+    unrolled_ast: 302d16dc5e96221e8a683499eb9535d643ab076d99e0cd8a4b7eccff7f1d89b6
-    ssa_ast: 7e13d21a756d551066f58ee9db89d1961872cef0a7beeb3257973ecdd631ecad
+    ssa_ast: fd34527ae5871a81df9dc16df2e5030f0195cffdf6dea4f78ed19aedea6da621
-    flattened_ast: 0c55171f9fa022d939c30583e2bf39fb3c16ddd702d5b88390d7b675a4772b49
+    flattened_ast: 151a5163d81bdd8d15ad4af804e3a8b6e8ed6e5c97fd7470a13c83b68f979d6c
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8a2c46277f1758d0fef5e0e0024b36279001addac2a0eb81c21ec4bb0eb930c3
+      - initial_input_ast: 81e7b4b48e21c631f656aa65b6d19ebb7d784b43229356b918f908a046734261
-    initial_ast: 4a83bf698ae459da1cad0956d226e054efc2015c9dccb4e5fa747aeee08b9583
+    initial_ast: c7837681390498ab152504151a8aca4b46618e4c035b9b265bc6937ef55224e8
-    unrolled_ast: 4a83bf698ae459da1cad0956d226e054efc2015c9dccb4e5fa747aeee08b9583
+    unrolled_ast: c7837681390498ab152504151a8aca4b46618e4c035b9b265bc6937ef55224e8
-    ssa_ast: 34d6d7d343903a0ff4f843a3c16ea5c8eec1ecd297d9cfc492bfd92aa0df66bd
+    ssa_ast: 70f05a3e659eb20d8e605e1c9b91338ee90c123f7453a240bf1a3950e5815042
-    flattened_ast: 85b27276ee3097604181f5067eaca1d038095b3edc7908215a1112dc890d494a
+    flattened_ast: d54cbd75ce1a0d7e6dd679659ccd4307f77bffc19f6234415225df9bcef09879
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 8e3a97af382bb560e176d56aa42e695e6926204ffdbb30bafe6b5b4544a35ca5
+      - initial_input_ast: 3cb982a5d4144e548fca897ceb686ad1f638971bb22fff7b935363eacc1b3473
-    initial_ast: 8485f8f6be09485942679a26c562e8fbb61f31c67b25febee830c488e07e89de
+    initial_ast: 1aabdddc327e544526ccdeba2f44080b544ee07f2374eca4fea4dad7ff6b54ad
-    unrolled_ast: 8485f8f6be09485942679a26c562e8fbb61f31c67b25febee830c488e07e89de
+    unrolled_ast: 1aabdddc327e544526ccdeba2f44080b544ee07f2374eca4fea4dad7ff6b54ad
-    ssa_ast: 0233b87d639454c928f9758b07695321a92fe8fe3d9126d6a925f4de954ee691
+    ssa_ast: de05aeb7675088006960519444a10897077b9080ebe1ce5e6e3f2439536101c5
-    flattened_ast: 922689ae4f5bc1953fbb4af53ceeefc7ce2a4ddad0c3ec507b6738ab4b024527
+    flattened_ast: ba2389349ba5155169389732da800d08def0aa26882c6a0a93e8fab257dc9a2b
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 74e6ea1af57cff9ff446de8c2a012465f2f86f4722d24cc922fafd7503d88aa6
+      - initial_input_ast: 46d3cef7b6dd6e951fe93d550206bdd658d6d435f71c776a39ae3b443770d33d
-    initial_ast: e78d7b075c989ff9b4314a32df11ba897f8474a17b05d1b0b10429e6f6621000
+    initial_ast: 54cff476c6e46b52a00015597c70c32f23cecae6e3086d167c26ef26820f6577
-    unrolled_ast: e78d7b075c989ff9b4314a32df11ba897f8474a17b05d1b0b10429e6f6621000
+    unrolled_ast: 54cff476c6e46b52a00015597c70c32f23cecae6e3086d167c26ef26820f6577
-    ssa_ast: 8ebaa3d33b413cac63c5bcf64125904d836c251fb70f58bbb67ed7a9ae2d9529
+    ssa_ast: 1b2af30d0034ea32bd630884142157796f6c8f8f9e2ef7e9701ed62a2f92424b
-    flattened_ast: eaf0badb689b5cbd68ea4417149c44d449278920d8e5a7836a575a27b41cfc7b
+    flattened_ast: c100fdd0403a9d8d6a38609d37f4e36ce54e3d6257db1d19d1e973274326906b
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: af48f597617b1fe06347026e00fb99bc4a49984c2c54692ab6b6318b78b59f9a
+      - initial_input_ast: 7155146c3f0887e6298bfabe9cad16d78c150419e8d0d584616d5dd76c5c3bac
-    initial_ast: a37c516ef51028a1eee04e84ec9fecd9d286fe4a2742525491169c3369a75b19
+    initial_ast: 8c9dfdb9055c528b1656ae95fc7763c79d3399127c49c22be15c716ad8b80b88
-    unrolled_ast: a37c516ef51028a1eee04e84ec9fecd9d286fe4a2742525491169c3369a75b19
+    unrolled_ast: 8c9dfdb9055c528b1656ae95fc7763c79d3399127c49c22be15c716ad8b80b88
-    ssa_ast: b827f818b59e265acd9cfa298c8c798b794bd58377b840011cba05aa2152d655
+    ssa_ast: 44237ce1986b38c34c5d2a624676e64c53257648436d82b9d333d6ab0c37102d
-    flattened_ast: 09eb94c63cecdbc14de8849d471ca0dbd183a738c945bda35cb41d52d1abb3fa
+    flattened_ast: c5d401aa71f99eabd1db84264069cb3a904019b93282296020a4e2db537cbcba
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: faa082d85ff553200c2727a5c3936f2285781fc0b85509d83b5022d47b448b63
+      - initial_input_ast: 591fe9942b59bad76b636a1c9e6ebe93ad85df562b09b7a900acfe12a9caffe2
-    initial_ast: d3de246bfe8f7ca78c6cd7bdb77d33d670a6dc3c033a94733249fc91a5ac1074
+    initial_ast: c1a7388455ac3e97ca3a063ad7812ff3ee27be822768d35a03ab608b1648c2d1
-    unrolled_ast: d3de246bfe8f7ca78c6cd7bdb77d33d670a6dc3c033a94733249fc91a5ac1074
+    unrolled_ast: c1a7388455ac3e97ca3a063ad7812ff3ee27be822768d35a03ab608b1648c2d1
-    ssa_ast: 396b211ace7b41bbf36063ff5cc9cdc82f1234ad7c942776659e6d5f4e806a4f
+    ssa_ast: 4f51f745379cb8078a6512104b27f778d6a36cd4bc92e6e06b74f95d8204ba37
-    flattened_ast: c54d3f6913fb0f3609f62bb1a9681a6bff7be669fef77a9ee1437f38cb774141
+    flattened_ast: 1fd5c458c8f61a818f6409f20e430c37d7a9d4a1aceae7a96b370fa9dca03c94
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 2e1717f04f9e1bb479d2aabc9920d76a9409e01b117e905928e12688bf8a204f
+      - initial_input_ast: 6b64b3a4fd7cafc2ead15efb8a91f8fc102947ccf4c091e4b6e54df82811fe82
-    initial_ast: 623eff3f0993154a1e6eafacbc6ae0238b6f84ce4731d06d6440b6ff7af5295f
+    initial_ast: 784374ed8ef0e9feae88329064908c5dab22ee9c7f5828e09f4980ca862e372a
-    unrolled_ast: 623eff3f0993154a1e6eafacbc6ae0238b6f84ce4731d06d6440b6ff7af5295f
+    unrolled_ast: 784374ed8ef0e9feae88329064908c5dab22ee9c7f5828e09f4980ca862e372a
-    ssa_ast: dd78fb25cd6f9486c36815db6631723b990aaf69c5bdcddc6b34f3989ce5414b
+    ssa_ast: 406dfc7b88282780532453da30e06d04fb6398fbb5f8934aa6951bc57e785af2
-    flattened_ast: 365ff1c855ca2499848f5454482b7b793e623210766f948bc1508d7a693f76bd
+    flattened_ast: 0ab17f84c7bb560a48f49bce7e29384f3439028f2fcb55f93649fa7e615a66fa
--- a/tests/expectations/compiler/core/algorithms/pedersen_fail.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372046]: Invalid type `u128`\n    --> compiler-test:4:37\n     |\n   4 |     let a: group = Pedersen64::hash(1u128);\n     |                                     ^^^^^\nError [ETYC0372003]: Expected type `group` but type `field` was found\n    --> compiler-test:4:20\n     |\n   4 |     let a: group = Pedersen64::hash(1u128);\n     |                    ^^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Error [ETYC0372046]: Invalid type `u128`\n    --> compiler-test:5:41\n     |\n   5 |         let a: group = Pedersen64::hash(1u128);\n     |                                         ^^^^^\nError [ETYC0372003]: Expected type `group` but type `field` was found\n    --> compiler-test:5:24\n     |\n   5 |         let a: group = Pedersen64::hash(1u128);\n     |                        ^^^^^^^^^^^^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 6c94126e25019f9c686f625109de1826fd33d5e270211ccc36db318c35100148
+      - initial_input_ast: 1e9c68e82f6c0dc9eaa4babbc5cb9e46d79f8f0661607b48efd2e9870a636f33
-    initial_ast: e68d56668327bd9bd32a4c1fd1f1911f81553a5959d7e49ec05646342cdb5eb7
+    initial_ast: afc9c5673e33e40261e666fb353fcb5632f4b2fec015be8689d4e55efca47907
-    unrolled_ast: e68d56668327bd9bd32a4c1fd1f1911f81553a5959d7e49ec05646342cdb5eb7
+    unrolled_ast: afc9c5673e33e40261e666fb353fcb5632f4b2fec015be8689d4e55efca47907
-    ssa_ast: a6a601eebc5ba9e3121032f2528993ae3ce589f1e84a952ff62e0a8c0b20f200
+    ssa_ast: cfbd02fec7cde8cb7de3cabe033207e0aa025d0c1eadf5b27f4aeff4b2f48c30
-    flattened_ast: 141121bd5982122dd30d7e1e87d9083ce411e18b498a7ac7709063f357830407
+    flattened_ast: c86be4a932e4a91d25b8cca98ebadb1875d30a7409585b1cbeab3c7bf511e7fa
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 6c94126e25019f9c686f625109de1826fd33d5e270211ccc36db318c35100148
+      - initial_input_ast: 1e9c68e82f6c0dc9eaa4babbc5cb9e46d79f8f0661607b48efd2e9870a636f33
-    initial_ast: f65b676d08f2d315f2d7e781241aa5e4431815cbab5caed48709e579bf3e81ef
+    initial_ast: 86b9e70b72058d64fb1461e72d9be08e9a9c776feae3233ae3aac7c947bd5726
-    unrolled_ast: f65b676d08f2d315f2d7e781241aa5e4431815cbab5caed48709e579bf3e81ef
+    unrolled_ast: 86b9e70b72058d64fb1461e72d9be08e9a9c776feae3233ae3aac7c947bd5726
-    ssa_ast: fa506e6c50bd7945ff3614e5cd81efd582c494afe2fad96afe7920d36b21d781
+    ssa_ast: 535712b468cd7472f115e1a3a4edd8e8e57ab80afb8fbb5922fcf0e41af9c6ee
-    flattened_ast: 34ecb876b82c544c6b9d776e7c5398a1337f4419c6f0b79dfbc08ce40feaa97b
+    flattened_ast: 3843c47a4d735398cbdda45f1815a14fce9e83dcab0cc318b1f11b5b21d95a39
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 6c94126e25019f9c686f625109de1826fd33d5e270211ccc36db318c35100148
+      - initial_input_ast: 1e9c68e82f6c0dc9eaa4babbc5cb9e46d79f8f0661607b48efd2e9870a636f33
-    initial_ast: af3f28a93059c5b288405cd6b75a7a7062185e435a2486835581b4496618818c
+    initial_ast: a2e29f76757bd9ca5ede2fbcb1383e3f6bddc809b870637db0e3e53f644de255
-    unrolled_ast: af3f28a93059c5b288405cd6b75a7a7062185e435a2486835581b4496618818c
+    unrolled_ast: a2e29f76757bd9ca5ede2fbcb1383e3f6bddc809b870637db0e3e53f644de255
-    ssa_ast: c9dd714471dbac73416570bab2ca1c34b764b8351081a219fdad2ffaf4326353
+    ssa_ast: 05f1c0703a0987f866b19bcbc72a1e1cf4d7253a1fc75b1474b9f49aafb26cc4
-    flattened_ast: d406d1776fe0eaee0ca2299e74864b4c80706cc6535e4948e159b443b5e01970
+    flattened_ast: 699fdee0dcb831f86fb19c14b4f0387aec3ddfe4c6658a77e3cc7b450cc30e15
--- a/tests/expectations/compiler/definition/out_of_order.out
+++ b/tests/expectations/compiler/definition/out_of_order.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: aacf667f0e64ba5e12fdd219a26ba8669841c2a3219dae36c01e1b9929f36371
+      - initial_input_ast: b7b12742359f67e9b9fcd6772715e2a972f8462844bd97dbb4e54265935166b2
-    initial_ast: 73ee61073d312112534b10c487bd5674d8286d1581f68c9673fd910583fd99b9
+    initial_ast: 60a5b01bf0103928fdb728241663fc40e0ddf3d8c3ccbbed32b659053d2d16bb
-    unrolled_ast: 73ee61073d312112534b10c487bd5674d8286d1581f68c9673fd910583fd99b9
+    unrolled_ast: 60a5b01bf0103928fdb728241663fc40e0ddf3d8c3ccbbed32b659053d2d16bb
-    ssa_ast: fb65a298bbba8e54ea551db1598bfea0ca0888ce225434ebca973e67b9aa7cc8
+    ssa_ast: 76f9c60d9da5a01a1cbfc1ae2b117ac774022a19445c8ce1cd265997f91d8c0a
-    flattened_ast: ecac3e07078b3949a733bdf38c0bd9e7c8e106bf63550df2d399a6b120d17a5e
+    flattened_ast: f1c6685559a001f403e04a21f2b334dbd2124540f5816f22f0995ae4af104aeb
--- a/tests/expectations/compiler/definition/use_decl_variable_as_assign_fail.out
+++ b/tests/expectations/compiler/definition/use_decl_variable_as_assign_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372005]: Unknown variable `b`\n    --> compiler-test:4:14\n     |\n   4 | \tlet b: u8 = b;\n     |              ^\n"
+  - "Error [ETYC0372005]: Unknown variable `b`\n    --> compiler-test:5:18\n     |\n   5 |     \tlet b: u8 = b;\n     |                  ^\n"
--- a/tests/expectations/compiler/field/add.out
+++ b/tests/expectations/compiler/field/add.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: cecd32055c33241c0b18081a47e7a24226d576569a480ae078964e02c01c722e
+      - initial_input_ast: 61129a0f8f768e3b6ac64a3108c250edac7bc6d2166c8682959ed70d087c9ea8
-    initial_ast: 636c38f5854e8f03eed8287e8b3218891507061bbbce6339a31d231c6ecfa979
+    initial_ast: b2cb62aebdc589f0966d653b8e27e87bc364dfe968f2cb3b1b4e2529f6ec3bbd
-    unrolled_ast: 636c38f5854e8f03eed8287e8b3218891507061bbbce6339a31d231c6ecfa979
+    unrolled_ast: b2cb62aebdc589f0966d653b8e27e87bc364dfe968f2cb3b1b4e2529f6ec3bbd
-    ssa_ast: 7afa076331577bfab2cd00e009b9fdc5634cc26ad9333f6b58b90fb61a26f380
+    ssa_ast: 4ddd554ed231cde10acb5603d8ca51d4d97e6b140ea4a7bba580d3db79261f43
-    flattened_ast: f3aa50591143b4cda8a6e18eb93822c49e57c95de62183eca86c3cf6b186a3a6
+    flattened_ast: 815c3628e9d39f378168bb34b5c656a9f1ef9d4a95d4e30c25896d5df41f5032
--- a/tests/expectations/compiler/field/div.out
+++ b/tests/expectations/compiler/field/div.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 31a67061e3e288068f84dca8d9f6c686a8f499f4950a4c1461e70e3b1af69877
+      - initial_input_ast: f7a296977806330a0ba3de16adf46a59c32560a0035c9f386122943126382502
-    initial_ast: b2b3760e87a696f9758e2be35eeed46c2d3a2ec8f3ac42eb7fcd3cbbc6f5d352
+    initial_ast: 4890275fa885093609199d0128f194a81cc28582c7b56bec2fa8667047234b87
-    unrolled_ast: b2b3760e87a696f9758e2be35eeed46c2d3a2ec8f3ac42eb7fcd3cbbc6f5d352
+    unrolled_ast: 4890275fa885093609199d0128f194a81cc28582c7b56bec2fa8667047234b87
-    ssa_ast: 2e61f055f1df188f0af631c0e44f1268fd4090d88f867a3865a40af9559c4491
+    ssa_ast: fe5de537242393614910d4cfe9a7a83c48a7c068d7ca4bf691e96b7ca57ca10e
-    flattened_ast: d76d16d26c3b24c77ad38d1ae9d8ed24bf89761aa93fd196833e54611cdfd285
+    flattened_ast: 25f16dbb4bd3f76160184f05b1b062bfc320b8f01e617873cf8994c5f12fe798
--- a/tests/expectations/compiler/field/eq.out
+++ b/tests/expectations/compiler/field/eq.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: bd80085ee77cd1ff541409a9dbe4feab3ddb3e032d6b74152234ccc6d1a975cf
+      - initial_input_ast: f88034cbb0521ef299913fc7f13280ea5af4cf984cb54c476c9860d9f93a5cba
-    initial_ast: f53cf567a3736a8972d2361b3dcf400b11dc04af9a80fb3f9ecc1087dc8bff02
+    initial_ast: e49a3434e8a50a36fb49fc00585b778f49ebdd3809323ca5b5895286d56b7f52
-    unrolled_ast: f53cf567a3736a8972d2361b3dcf400b11dc04af9a80fb3f9ecc1087dc8bff02
+    unrolled_ast: e49a3434e8a50a36fb49fc00585b778f49ebdd3809323ca5b5895286d56b7f52
-    ssa_ast: 98abd0a3b6da340b31fa36212c94491f35a0d957b0d8ac3d9133ceb7cc1086c5
+    ssa_ast: de1ad7586a39f888f09c8ff00954a4dcac8ad842249d6102f08cc27979b8ae52
-    flattened_ast: 33fdb3541fa7af3b6e11732241e4cab3fc1b1940482d0946ab2365dd6e59adf1
+    flattened_ast: 12d3dc425871612d7b8804d64c6abf93a9591979a84eeed535f65d6774e1e0ce
--- a/tests/expectations/compiler/field/field.out
+++ b/tests/expectations/compiler/field/field.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 61fa56f24ca00f16b83c2cde4e801ce02427ce87276ad84f1b36add37a3c02ef
+      - initial_input_ast: 9dff7172de13bf9c5c1bf0e225ebb3132da11ea695a97692edacd36b18e5d86c
-    initial_ast: a62d52954ce14a846e6fcb2001673e3afe0b490f5fe10eb52c90f92093a75ab0
+    initial_ast: 67395cdd81b7d95fe82ae4c021fb24f68cbf7b6c34f70210dba63e812611b7f2
-    unrolled_ast: a62d52954ce14a846e6fcb2001673e3afe0b490f5fe10eb52c90f92093a75ab0
+    unrolled_ast: 67395cdd81b7d95fe82ae4c021fb24f68cbf7b6c34f70210dba63e812611b7f2
-    ssa_ast: 04e286d8720d3ef8eca14a409241f5612f9815936d71ab9ece11bbccc689877c
+    ssa_ast: 03c6805324171292b0291c7578681fa9a4c69e06a5463693ffc12984806e0e29
-    flattened_ast: 8cf2a8ec951e2984f182ca2c6c2ead8c7ed0e3303dce2478d912894bc0407992
+    flattened_ast: 45786b6a26579552c3b7142eec3cd0dc87d7c703ad250b7811bfdd269fc3c073
--- a/tests/expectations/compiler/field/mul.out
+++ b/tests/expectations/compiler/field/mul.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: cecd32055c33241c0b18081a47e7a24226d576569a480ae078964e02c01c722e
+      - initial_input_ast: 61129a0f8f768e3b6ac64a3108c250edac7bc6d2166c8682959ed70d087c9ea8
-    initial_ast: c00f3134d1cecc2b62a1700e88c77013363f17aea71ca4af4b52cf8c792c58ce
+    initial_ast: 38aa3123bf3a04cefe13cab572fe4d5655fa253899c06ec2ff00063147c71adf
-    unrolled_ast: c00f3134d1cecc2b62a1700e88c77013363f17aea71ca4af4b52cf8c792c58ce
+    unrolled_ast: 38aa3123bf3a04cefe13cab572fe4d5655fa253899c06ec2ff00063147c71adf
-    ssa_ast: d18a3ba0bbf0adc0a3627925db28c375d1262f3636216a4afd29794400409f83
+    ssa_ast: c912349b3dba6986ad724166f15fc4130a8258bbc1f4a343ba6fb9beb5fd3ca2
-    flattened_ast: 2fb8969bf556d1c3daaff0d3d98257ab5da842da220ee19feec448374247e5ca
+    flattened_ast: be364827c618105c97d59dc8fa3b1a6dfe9abcd553af8754123d6bcf5224b3c2
--- a/tests/expectations/compiler/field/negate.out
+++ b/tests/expectations/compiler/field/negate.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 741f62479560a9702881eb58a0de3ed69b6781d5ff44386a0ddfba8af248370d
+      - initial_input_ast: 429366c4335599a16406a6ffffe140ff35a28c8129327477a23a692792ab630a
-    initial_ast: 4413648042bec42de70525380c6687b16e871069daadb38979622e0f057bdbd1
+    initial_ast: a835b88d353dfe064d68aa517c09da7caf0ffe9bcaece973463c98637e19f15d
-    unrolled_ast: 4413648042bec42de70525380c6687b16e871069daadb38979622e0f057bdbd1
+    unrolled_ast: a835b88d353dfe064d68aa517c09da7caf0ffe9bcaece973463c98637e19f15d
-    ssa_ast: d7b67ee7aee42c4f9b7aa1ff4613e6c17ea8b90b4b7cff4f53bb41caf52db4dd
+    ssa_ast: d62bc50f6421bece080cb58bfcf996c04d91b5eaf2e4145765ca61f82c76e97b
-    flattened_ast: 5edcf16d2342d390b4d0b22a2da203b37b9e5b2456f98984b15c99df69a208c8
+    flattened_ast: f8d267d7f537f6b14b752dbbef59709e7c04027a2dc1116f347f14e5c66ada06
--- a/tests/expectations/compiler/field/no_space_between_literal.out
+++ b/tests/expectations/compiler/field/no_space_between_literal.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:11\n     |\n   4 |   const f = 1 field;\n     |           ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:5:15\n     |\n   5 |       const f = 1 field;\n     |               ^"
--- a/tests/expectations/compiler/field/operator_methods.out
+++ b/tests/expectations/compiler/field/operator_methods.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: b61596e0847cc8448e6ff13a0496284115ae58019223a2d0024d4910887584ec
+      - initial_input_ast: a6d4afdd7375c43967b7a3be380ac83f7b1a351203a2f521ca8ce9824f29df71
-    initial_ast: bc3a8f7a1f49f719114c76eb94e2c944e69bebbb2cbd810abd742c9139a0274f
+    initial_ast: df6d46969b3d8046ff7ceb0c8395a5726d004b29bf7b3c22254938219809d7a7
-    unrolled_ast: bc3a8f7a1f49f719114c76eb94e2c944e69bebbb2cbd810abd742c9139a0274f
+    unrolled_ast: df6d46969b3d8046ff7ceb0c8395a5726d004b29bf7b3c22254938219809d7a7
-    ssa_ast: 93f623111c49c7ced216d481dbf9744e845ac693baca95cbe5370f8c3b8d6ad5
+    ssa_ast: 9f1ccb67dd1845e23cc51eaa7de1fa1de0ab2035d4a14ef6290f24e8b890511b
-    flattened_ast: 947ce7399db5d79f971b26cf89da4b8614283afcd52fe6df58a2059c4e30282f
+    flattened_ast: 2858a14218cb5f670950c60b32dae9c579fe73638553ea3eb56cae7073fc2039
--- a/tests/expectations/compiler/field/pow.out
+++ b/tests/expectations/compiler/field/pow.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: bb1d25d6233673546c139e70c13196b8c4d693ebe3cd0bee7515b7b072940a0c
+      - initial_input_ast: 4e24333952c4eaea2c19106c9651e0bef29519e51632cc17f3ba1d07123306eb
-    initial_ast: 77db09f4d43302495520854ae9d38557215de1cbb46a289ff65a976c0a4679ad
+    initial_ast: e4e85067d7ebcd9e8f9a075b1dbec886d9668637642b1aa15742497914633908
-    unrolled_ast: 77db09f4d43302495520854ae9d38557215de1cbb46a289ff65a976c0a4679ad
+    unrolled_ast: e4e85067d7ebcd9e8f9a075b1dbec886d9668637642b1aa15742497914633908
-    ssa_ast: d898c0552643bf43d223343bfe61daa277764852d71627f007a535d50a4ec9d8
+    ssa_ast: 61769373206b7e2a87db43b9c6e35657749a373910584e137ceee4cf175ae9b6
-    flattened_ast: a2e9531cd17efd581df9ce0aff59a0cb66199835d0490b7e308cb76683b01439
+    flattened_ast: af9344ccab440497931207afc1d7efca6f5f6591b00f468848fc6296bfa1dc89
--- a/tests/expectations/compiler/field/sub.out
+++ b/tests/expectations/compiler/field/sub.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 31a67061e3e288068f84dca8d9f6c686a8f499f4950a4c1461e70e3b1af69877
+      - initial_input_ast: f7a296977806330a0ba3de16adf46a59c32560a0035c9f386122943126382502
-    initial_ast: b06081cf128402b2565b63387f42f39375dda7ebde25280e89c37bb91a849cb3
+    initial_ast: 18a724022cab3f33e4be21d338c0494d827abb82da6f25e7f2bcd4bdf2d1aabe
-    unrolled_ast: b06081cf128402b2565b63387f42f39375dda7ebde25280e89c37bb91a849cb3
+    unrolled_ast: 18a724022cab3f33e4be21d338c0494d827abb82da6f25e7f2bcd4bdf2d1aabe
-    ssa_ast: 57a17bb06bc1a8a58416ff78642fb64a5912c7b8a2dde0d98a657ddb25a4e769
+    ssa_ast: 3e10be6d2154ae4c7457a6560aa1b1449423f80d4e135b9340205ec28c691508
-    flattened_ast: a2b9cdf4f0c670dca81986047334e486d7572b82a995b948d9c7a64107a768a6
+    flattened_ast: 1982adc0014172bf8a3479f03631e586c7841533286dc9174ce5575b774eca1f
--- a/tests/expectations/compiler/field/ternary.out
+++ b/tests/expectations/compiler/field/ternary.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: dae37ef637eab393ba88004d65f7817b699f3901d4bd11d6dad14cfd5c75234f
+      - initial_input_ast: 4b32cb2874e8e59815b3b0bdcad1a5e5732de23853d85d2feb4bd3cecb1c594d
-    initial_ast: 9b4cf8f367abf8f298400a398111140a7d87cd1d0d2403ce7cb0a1c9883d8475
+    initial_ast: cacf29acb24375c88d221d7026eaa7b06a944388c56804b70dcc61c7396afc6e
-    unrolled_ast: 9b4cf8f367abf8f298400a398111140a7d87cd1d0d2403ce7cb0a1c9883d8475
+    unrolled_ast: cacf29acb24375c88d221d7026eaa7b06a944388c56804b70dcc61c7396afc6e
-    ssa_ast: da08b6121bf8b93127f282648fdd738687a850660c605bc7cc63d6afd0c77584
+    ssa_ast: cbef14d834982c0dd4e63f501381cd89d6c3131e44fb8410a7d99e9cd8ef810d
-    flattened_ast: 8b783cfff960e8769cb1c34bda0cc4832c59628df153a7ea754e37b8ab04910a
+    flattened_ast: 39a261879a26158b2c9590c381dd4f6a9cc8813cee959e231b5b3cb96a2f7d3c
--- a/tests/expectations/compiler/finalize/closure_with_finalize_fail.out
+++ b/tests/expectations/compiler/finalize/closure_with_finalize_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372036]: Cannot use a `finalize` statement without a `finalize` block.\n    --> compiler-test:4:11\n     |\n   4 |     async finalize(a, b);\n     |           ^^^^^^^^^^^^^^\nError [ETYC0372044]: Function must contain a `finalize` statement on all execution paths.\n    --> compiler-test:8:1\n     |\n   8 | function bar(a: u8, b: u8) -> u8 {\n   9 |     return a + b;\n  10 | }\n     | ^\nError [ETYC0372032]: Only transition functions can have a `finalize` block.\n    --> compiler-test:12:1\n     |\n  12 | finalize bar(a: u8, b: u8) -> u8 {\n  13 |     return a + b;\n  14 | }\n     | ^\n     |\n     = Remove the `finalize` block or use the keyword `transition` instead of `function`.\nError [ETYC0372032]: Only transition functions can have a `finalize` block.\n    --> compiler-test:21:1\n     |\n  21 | finalize mint_public(receiver: address, amount: u64) {\n  22 |     increment(account, receiver, amount);\n  23 | }\n     | ^\n     |\n     = Remove the `finalize` block or use the keyword `transition` instead of `function`.\nError [ETYC0372005]: Unknown variable `account`\n    --> compiler-test:22:15\n     |\n  22 |     increment(account, receiver, amount);\n     |               ^^^^^^^\nError [ETYC0372004]: Could not determine the type of `account`\n    --> compiler-test:22:15\n     |\n  22 |     increment(account, receiver, amount);\n     |               ^^^^^^^\n"
+  - "Error [ETYC0372036]: Cannot use a `finalize` statement without a `finalize` block.\n    --> compiler-test:5:15\n     |\n   5 |         async finalize(a, b);\n     |               ^^^^^^^^^^^^^^\nError [ETYC0372044]: Function must contain a `finalize` statement on all execution paths.\n    --> compiler-test:9:5\n     |\n   9 |     function bar(a: u8, b: u8) -> u8 {\n  10 |         return a + b;\n  11 |     }\n     |     ^\nError [ETYC0372032]: Only transition functions can have a `finalize` block.\n    --> compiler-test:13:5\n     |\n  13 |     finalize bar(a: u8, b: u8) -> u8 {\n  14 |         return a + b;\n  15 |     }\n     |     ^\n     |\n     = Remove the `finalize` block or use the keyword `transition` instead of `function`.\nError [ETYC0372032]: Only transition functions can have a `finalize` block.\n    --> compiler-test:22:5\n     |\n  22 |     finalize mint_public(receiver: address, amount: u64) {\n  23 |         increment(account, receiver, amount);\n  24 |     }\n     |     ^\n     |\n     = Remove the `finalize` block or use the keyword `transition` instead of `function`.\nError [ETYC0372005]: Unknown variable `account`\n    --> compiler-test:23:19\n     |\n  23 |         increment(account, receiver, amount);\n     |                   ^^^^^^^\nError [ETYC0372004]: Could not determine the type of `account`\n    --> compiler-test:23:19\n     |\n  23 |         increment(account, receiver, amount);\n     |                   ^^^^^^^\n"
--- a/tests/expectations/compiler/finalize/decrement.out
+++ b/tests/expectations/compiler/finalize/decrement.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 4a975ffb4cf9fe045910ff5575f5a90c3a3c11a435f418f251cd8b248f5a598b
+    initial_ast: 9e0977be23e1c4d1abdf9c225bb751bb8ae83afb8c764c4ac7b8a128c1a5c793
-    unrolled_ast: 4a975ffb4cf9fe045910ff5575f5a90c3a3c11a435f418f251cd8b248f5a598b
+    unrolled_ast: 9e0977be23e1c4d1abdf9c225bb751bb8ae83afb8c764c4ac7b8a128c1a5c793
-    ssa_ast: 4a975ffb4cf9fe045910ff5575f5a90c3a3c11a435f418f251cd8b248f5a598b
+    ssa_ast: 9e0977be23e1c4d1abdf9c225bb751bb8ae83afb8c764c4ac7b8a128c1a5c793
-    flattened_ast: 0823f3dc63570c1eed36f33a42f18d3e38199b991d60a6e49958dac127586e4b
+    flattened_ast: 51634dc9946dfdb2ece132702f717235d56f844ed73301a19b6f448b81f3a8ea
--- a/tests/expectations/compiler/finalize/decrement_incorrect_type.out
+++ b/tests/expectations/compiler/finalize/decrement_incorrect_type.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372007]: Expected one type from `Token`, but got `u128`\n    --> compiler-test:17:29\n     |\n  17 |     decrement(tokens, addr, amount);\n     |                             ^^^^^^\nError [ETYC0372007]: Expected one type from `address`, but got `u8`\n    --> compiler-test:18:24\n     |\n  18 |     decrement(amounts, 1u8, amount);\n     |                        ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `u8`\n    --> compiler-test:19:30\n     |\n  19 |     decrement(amounts, addr, 1u8);\n     |                              ^^^\nError [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:20:57\n     |\n  20 |     decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                                                         ^^^\nError [ETYC0372003]: Expected type `u128` but type `u8` was found\n    --> compiler-test:20:70\n     |\n  20 |     decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                                                                      ^^^\nError [ETYC0372007]: Expected one type from `field, group, scalar, i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `Token`\n    --> compiler-test:20:29\n     |\n  20 |     decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown variable `foo`\n    --> compiler-test:21:15\n     |\n  21 |     decrement(foo, addr, amount);\n     |               ^^^\nError [ETYC0372004]: Could not determine the type of `foo`\n    --> compiler-test:21:15\n     |\n  21 |     decrement(foo, addr, amount);\n     |               ^^^\n"
+  - "Error [ETYC0372007]: Expected one type from `Token`, but got `u128`\n    --> compiler-test:18:33\n     |\n  18 |         decrement(tokens, addr, amount);\n     |                                 ^^^^^^\nError [ETYC0372007]: Expected one type from `address`, but got `u8`\n    --> compiler-test:19:28\n     |\n  19 |         decrement(amounts, 1u8, amount);\n     |                            ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `u8`\n    --> compiler-test:20:34\n     |\n  20 |         decrement(amounts, addr, 1u8);\n     |                                  ^^^\nError [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:21:61\n     |\n  21 |         decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                                                             ^^^\nError [ETYC0372003]: Expected type `u128` but type `u8` was found\n    --> compiler-test:21:74\n     |\n  21 |         decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                                                                          ^^^\nError [ETYC0372007]: Expected one type from `field, group, scalar, i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `Token`\n    --> compiler-test:21:33\n     |\n  21 |         decrement(tokens, addr, Token { owner: addr, gates: 1u8, amount: 1u8 });\n     |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown variable `foo`\n    --> compiler-test:22:19\n     |\n  22 |         decrement(foo, addr, amount);\n     |                   ^^^\nError [ETYC0372004]: Could not determine the type of `foo`\n    --> compiler-test:22:19\n     |\n  22 |         decrement(foo, addr, amount);\n     |                   ^^^\n"
--- a/tests/expectations/compiler/finalize/empty_finalize_fail.out
+++ b/tests/expectations/compiler/finalize/empty_finalize_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372039]: A finalize block cannot be empty.\n    --> compiler-test:8:1\n     |\n   8 | finalize mint_public (public receiver: address, public amount: u64) {}\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Error [ETYC0372039]: A finalize block cannot be empty.\n    --> compiler-test:9:5\n     |\n   9 |     finalize mint_public (public receiver: address, public amount: u64) {}\n     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/finalize/finalize.out
+++ b/tests/expectations/compiler/finalize/finalize.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: cbcc85f09f202034d7c755f32af4929059be4221c5822be2bdc2716ee41013c9
+    initial_ast: c180c2c668e316551d5c0d77e7febc4ef772872ef76c12e6e48dc61bc777f751
-    unrolled_ast: cbcc85f09f202034d7c755f32af4929059be4221c5822be2bdc2716ee41013c9
+    unrolled_ast: c180c2c668e316551d5c0d77e7febc4ef772872ef76c12e6e48dc61bc777f751
-    ssa_ast: 70fd65e261d2dd9baf5bf0975237a3729f190e86b3dd20a0b1ef908134715b89
+    ssa_ast: 04b3a2544c7137c8d82bd9a0085e50b2f97f61d28a1d97f434aa46f360d46baa
-    flattened_ast: 5776d9d19235426cc7d0a5a5a7e6eb9b4f52ef23874a8d4cf7a2cb41f9469351
+    flattened_ast: ab2ae56fc23c7d50ce49621b505c51a99f9ff998267ad040c9ab5d9c2b175874
--- a/tests/expectations/compiler/finalize/finalize_incorrect_modes_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_incorrect_modes_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372033]: An input to a finalize block must be public.\n    --> compiler-test:9:58\n     |\n   9 | finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n     |                                                          ^^^^^^\n     |\n     = Add a `public` modifier to the input variable declaration or remove the visibility modifier entirely.\nError [ETYC0372033]: An input to a finalize block must be public.\n    --> compiler-test:9:83\n     |\n   9 | finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n     |                                                                                   ^^^\n     |\n     = Add a `public` modifier to the input variable declaration or remove the visibility modifier entirely.\nError [ETYC0372038]: Function must return a value.\n    --> compiler-test:9:1\n     |\n   9 | finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n  10 |     increment(account, receiver, amount);\n  11 | }\n     | ^\n"
+  - "Error [ETYC0372033]: An input to a finalize block must be public.\n    --> compiler-test:10:62\n     |\n  10 |     finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n     |                                                              ^^^^^^\n     |\n     = Add a `public` modifier to the input variable declaration or remove the visibility modifier entirely.\nError [ETYC0372033]: An input to a finalize block must be public.\n    --> compiler-test:10:87\n     |\n  10 |     finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n     |                                                                                       ^^^\n     |\n     = Add a `public` modifier to the input variable declaration or remove the visibility modifier entirely.\nError [ETYC0372038]: Function must return a value.\n    --> compiler-test:10:5\n     |\n  10 |     finalize mint_public (public receiver: address, constant amount: u64) -> constant u64 {\n  11 |         increment(account, receiver, amount);\n  12 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/finalize/finalize_incorrect_return_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_incorrect_return_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:11:12\n     |\n  11 |     return 1u8 + 2u8;\n     |            ^^^\nError [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:11:18\n     |\n  11 |     return 1u8 + 2u8;\n     |                  ^^^\n"
+  - "Error [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:12:16\n     |\n  12 |         return 1u8 + 2u8;\n     |                ^^^\nError [ETYC0372003]: Expected type `u64` but type `u8` was found\n    --> compiler-test:12:22\n     |\n  12 |         return 1u8 + 2u8;\n     |                      ^^^\n"
--- a/tests/expectations/compiler/finalize/finalize_missing_return_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_missing_return_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372038]: Function must return a value.\n    --> compiler-test:10:1\n     |\n  10 | finalize mint_public (public receiver: address, public amount: u64) -> u64 {\n  11 |     increment(account, receiver, amount);\n  12 | }\n     | ^\n"
+  - "Error [ETYC0372038]: Function must return a value.\n    --> compiler-test:11:5\n     |\n  11 |     finalize mint_public (public receiver: address, public amount: u64) -> u64 {\n  12 |         increment(account, receiver, amount);\n  13 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/finalize/finalize_name_mismatch_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_name_mismatch_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372045]: `finalize` name `mint_public` does not match function name `mint_private`\n    --> compiler-test:10:1\n     |\n  10 | finalize mint_private (public receiver: address, public amount: u64) {\n  11 |     increment(account, receiver, amount);\n  12 | }\n     | ^\n"
+  - "Error [ETYC0372045]: `finalize` name `mint_public` does not match function name `mint_private`\n    --> compiler-test:11:5\n     |\n  11 |     finalize mint_private (public receiver: address, public amount: u64) {\n  12 |         increment(account, receiver, amount);\n  13 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/finalize/finalize_statement_incorrect_args_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_statement_incorrect_args_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372042]: `finalize` expected `2` args, but got `3`\n    --> compiler-test:7:11\n     |\n   7 |     async finalize(receiver, amount, amount);\n     |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Error [ETYC0372042]: `finalize` expected `2` args, but got `3`\n    --> compiler-test:8:15\n     |\n   8 |         async finalize(receiver, amount, amount);\n     |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/finalize/finalize_without_finalize_statement_fail.out
+++ b/tests/expectations/compiler/finalize/finalize_without_finalize_statement_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372044]: Function must contain a `finalize` statement on all execution paths.\n    --> compiler-test:5:1\n     |\n   5 | transition mint_public(public receiver: address, public amount: u64) {\n   6 | \n   7 | }\n     | ^\n"
+  - "Error [ETYC0372044]: Function must contain a `finalize` statement on all execution paths.\n    --> compiler-test:6:5\n     |\n   6 |     transition mint_public(public receiver: address, public amount: u64) {\n   7 |     \n   8 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/finalize/increment.out
+++ b/tests/expectations/compiler/finalize/increment.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 4fb9b7b9d2e24f7a5029956b0f35937267f4381018c4888e6a56bcf765240180
+    initial_ast: 143e4deb6fc26d2d03e40ac8ea558349a84b264bec1889a014fb45ad4858e43b
-    unrolled_ast: 4fb9b7b9d2e24f7a5029956b0f35937267f4381018c4888e6a56bcf765240180
+    unrolled_ast: 143e4deb6fc26d2d03e40ac8ea558349a84b264bec1889a014fb45ad4858e43b
-    ssa_ast: 4fb9b7b9d2e24f7a5029956b0f35937267f4381018c4888e6a56bcf765240180
+    ssa_ast: 143e4deb6fc26d2d03e40ac8ea558349a84b264bec1889a014fb45ad4858e43b
-    flattened_ast: 3a36c1f855fdef219d1daadcf0940d330b82a855ad240384c22a9f8495244c3e
+    flattened_ast: ca2ac65da9477f693168dd0074c56a000d7885cb4e2ad355e52e57d09e13e35c
--- a/tests/expectations/compiler/finalize/increment_incorrect_type.out
+++ b/tests/expectations/compiler/finalize/increment_incorrect_type.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372007]: Expected one type from `Token`, but got `u128`\n    --> compiler-test:17:29\n     |\n  17 |     increment(tokens, addr, amount);\n     |                             ^^^^^^\nError [ETYC0372007]: Expected one type from `address`, but got `u8`\n    --> compiler-test:18:24\n     |\n  18 |     increment(amounts, 1u8, amount);\n     |                        ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `u8`\n    --> compiler-test:19:30\n     |\n  19 |     increment(amounts, addr, 1u8);\n     |                              ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `Token`\n    --> compiler-test:20:30\n     |\n  20 |     increment(amounts, addr, Token { owner: addr, gates: 1u64, amount: amount });\n     |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372007]: Expected one type from `field, group, scalar, i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `Token`\n    --> compiler-test:20:30\n     |\n  20 |     increment(amounts, addr, Token { owner: addr, gates: 1u64, amount: amount });\n     |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown variable `foo`\n    --> compiler-test:21:15\n     |\n  21 |     increment(foo, addr, amount);\n     |               ^^^\nError [ETYC0372004]: Could not determine the type of `foo`\n    --> compiler-test:21:15\n     |\n  21 |     increment(foo, addr, amount);\n     |               ^^^\n"
+  - "Error [ETYC0372007]: Expected one type from `Token`, but got `u128`\n    --> compiler-test:18:33\n     |\n  18 |         increment(tokens, addr, amount);\n     |                                 ^^^^^^\nError [ETYC0372007]: Expected one type from `address`, but got `u8`\n    --> compiler-test:19:28\n     |\n  19 |         increment(amounts, 1u8, amount);\n     |                            ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `u8`\n    --> compiler-test:20:34\n     |\n  20 |         increment(amounts, addr, 1u8);\n     |                                  ^^^\nError [ETYC0372007]: Expected one type from `u128`, but got `Token`\n    --> compiler-test:21:34\n     |\n  21 |         increment(amounts, addr, Token { owner: addr, gates: 1u64, amount: amount });\n     |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372007]: Expected one type from `field, group, scalar, i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `Token`\n    --> compiler-test:21:34\n     |\n  21 |         increment(amounts, addr, Token { owner: addr, gates: 1u64, amount: amount });\n     |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown variable `foo`\n    --> compiler-test:22:19\n     |\n  22 |         increment(foo, addr, amount);\n     |                   ^^^\nError [ETYC0372004]: Could not determine the type of `foo`\n    --> compiler-test:22:19\n     |\n  22 |         increment(foo, addr, amount);\n     |                   ^^^\n"
--- a/tests/expectations/compiler/finalize/mapping.out
+++ b/tests/expectations/compiler/finalize/mapping.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: c030938d346b1142b6b0087395ab62a8e643957cc52ad06ec0bedaf7bb18f78e
+    initial_ast: 9e439c79df1fb622da95a9d0b1ccfbdf88dd08004e5f33d335abbeb61e8988e1
-    unrolled_ast: c030938d346b1142b6b0087395ab62a8e643957cc52ad06ec0bedaf7bb18f78e
+    unrolled_ast: 9e439c79df1fb622da95a9d0b1ccfbdf88dd08004e5f33d335abbeb61e8988e1
-    ssa_ast: c030938d346b1142b6b0087395ab62a8e643957cc52ad06ec0bedaf7bb18f78e
+    ssa_ast: 9e439c79df1fb622da95a9d0b1ccfbdf88dd08004e5f33d335abbeb61e8988e1
-    flattened_ast: c030938d346b1142b6b0087395ab62a8e643957cc52ad06ec0bedaf7bb18f78e
+    flattened_ast: 9e439c79df1fb622da95a9d0b1ccfbdf88dd08004e5f33d335abbeb61e8988e1
--- a/tests/expectations/compiler/finalize/mapping_fail.out
+++ b/tests/expectations/compiler/finalize/mapping_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '('\n    --> compiler-test:3:14\n     |\n   3 | mapping foo: (u32, u32) => u32;\n     |              ^"
+  - "Error [EPAR0370005]: expected 'address', 'bool', 'field', 'group', 'scalar', 'string', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128' -- found '('\n    --> compiler-test:4:18\n     |\n   4 |     mapping foo: (u32, u32) => u32;\n     |                  ^"
--- a/tests/expectations/compiler/finalize/read_write_mapping_fail.out
+++ b/tests/expectations/compiler/finalize/read_write_mapping_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected ; -- found '['\n    --> compiler-test:6:20\n     |\n   6 |     return balances[addr];\n     |                    ^"
+  - "Error [EPAR0370005]: expected ; -- found '['\n    --> compiler-test:7:24\n     |\n   7 |         return balances[addr];\n     |                        ^"
--- a/tests/expectations/compiler/finalize/shadow_mapping_fail.out
+++ b/tests/expectations/compiler/finalize/shadow_mapping_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:4:1\n     |\n   4 | mapping bar: u8 => u8;\n     | ^^^^^^^^^^^^^^^^^^^^^^\nError [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:6:1\n     |\n   6 | transition bar(a: u8) -> u8 {\n   7 |     return a + 1u8;\n   8 | }\n     | ^\n"
+  - "Error [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:5:5\n     |\n   5 |     mapping bar: u8 => u8;\n     |     ^^^^^^^^^^^^^^^^^^^^^^\nError [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:7:5\n     |\n   7 |     transition bar(a: u8) -> u8 {\n   8 |         return a + 1u8;\n   9 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/function/9_inputs_fail.out
+++ b/tests/expectations/compiler/function/9_inputs_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected ; -- found '}'\n    --> compiler-test:16:1\n     |\n  16 | }\n     | ^"
+  - "Error [EPAR0370005]: expected ; -- found '}'\n    --> compiler-test:17:5\n     |\n  17 |     }}\n     |     ^"
--- a/tests/expectations/compiler/function/annotated_function_fail.out
+++ b/tests/expectations/compiler/function/annotated_function_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372028]: Unknown annotation: `@test`.\n    --> compiler-test:3:1\n     |\n   3 | @test\n     | ^^^^^\nError [ETYC0372028]: Unknown annotation: `@program`.\n    --> compiler-test:8:1\n     |\n   8 | @program\n     | ^^^^^^^^\n"
+  - "Error [ETYC0372028]: Unknown annotation: `@test`.\n    --> compiler-test:4:5\n     |\n   4 |     @test\n     |     ^^^^^\nError [ETYC0372028]: Unknown annotation: `@program`.\n    --> compiler-test:9:5\n     |\n   9 |     @program\n     |     ^^^^^^^^\n"
--- a/tests/expectations/compiler/function/conditional_return.out
+++ b/tests/expectations/compiler/function/conditional_return.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 1516b1d06cbe326af964150ef0f5c698f48f74b83e676f98ed309cb1d930095d
+      - initial_input_ast: d46e926534142e72937a9b027c015ad4e6bfcb57a31df002fec021493f1ca2f6
-    initial_ast: cff49f56cc1ceeb4679401d351c9c8a4630cf03f69bf5ac55d6254d70a113e99
+    initial_ast: 8d324b6caf600f7134b94cd4dbd45268c83fc7238b8d58f7439b4ad0b033870d
-    unrolled_ast: cff49f56cc1ceeb4679401d351c9c8a4630cf03f69bf5ac55d6254d70a113e99
+    unrolled_ast: 8d324b6caf600f7134b94cd4dbd45268c83fc7238b8d58f7439b4ad0b033870d
-    ssa_ast: 573c4eebe56280d918ff029d816047e4900030730b0c65fcb9f40f22e0b9165d
+    ssa_ast: 6e17f05581caed4aae8d81f4d14172f11795a23d8f809fe5d6ac468b6200ec44
-    flattened_ast: ca1dad5fd5b23fe0728be3145154f3b7a5d8dafd6a81347d6f39401d0cacabc8
+    flattened_ast: 5b1c3043b3550252adddf9c8b43a19ddc6378b4f6296388ad225b9b48b8efca5
--- a/tests/expectations/compiler/function/duplicate_definition_fail.out
+++ b/tests/expectations/compiler/function/duplicate_definition_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'assert_eq', 'assert_neq' -- found 'log'\n    --> compiler-test:4:13\n     |\n   4 |     console.log(\"{}\", 1u8);\n     |             ^^^\nError [EPAR0370005]: expected ; -- found '('\n    --> compiler-test:4:16\n     |\n   4 |     console.log(\"{}\", 1u8);\n     |                ^"
+  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'assert_eq', 'assert_neq' -- found 'log'\n    --> compiler-test:5:17\n     |\n   5 |         console.log(\"{}\", 1u8);\n     |                 ^^^\nError [EPAR0370005]: expected ; -- found '('\n    --> compiler-test:5:20\n     |\n   5 |         console.log(\"{}\", 1u8);\n     |                    ^"
--- a/tests/expectations/compiler/function/duplicate_parameter_fail.out
+++ b/tests/expectations/compiler/function/duplicate_parameter_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'assert_eq', 'assert_neq' -- found 'log'\n    --> compiler-test:4:13\n     |\n   4 |     console.log(\"{}\", 1u8);\n     |             ^^^\nError [EPAR0370005]: expected ; -- found '('\n    --> compiler-test:4:16\n     |\n   4 |     console.log(\"{}\", 1u8);\n     |                ^"
+  - "Error [EPAR0370007]: unexpected identifier: expected 'assert', 'assert_eq', 'assert_neq' -- found 'log'\n    --> compiler-test:5:17\n     |\n   5 |         console.log(\"{}\", 1u8);\n     |                 ^^^\nError [EPAR0370005]: expected ; -- found '('\n    --> compiler-test:5:20\n     |\n   5 |         console.log(\"{}\", 1u8);\n     |                    ^"
--- a/tests/expectations/compiler/function/flatten_test.out
+++ b/tests/expectations/compiler/function/flatten_test.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 6e1a3b23025b12ff3c838ef7ad43f8a79a292cf6bfbe9585f1a113500d877f99
+    initial_ast: 3137ced43ba99ee2f63930ef3f2921291ad12fc206872a52eaba12920524929a
-    unrolled_ast: 6e1a3b23025b12ff3c838ef7ad43f8a79a292cf6bfbe9585f1a113500d877f99
+    unrolled_ast: 3137ced43ba99ee2f63930ef3f2921291ad12fc206872a52eaba12920524929a
-    ssa_ast: 1db5dc4698b535cd4e6d320839ba2062beac7d0de8ba702c9349c699e565b4d4
+    ssa_ast: f9ac185f4e025eb033c2bcabf720a1360286b386bbc9ff30f73634d5a9725203
-    flattened_ast: 788d887d5fe69a693e1715521c77698caecf0b15c2368d154e03474679998d28
+    flattened_ast: 9688131a7231b7794c6c3c29cee7d3c7c371eaf41c923a881cdeca572b03e853
--- a/tests/expectations/compiler/function/function_call.out
+++ b/tests/expectations/compiler/function/function_call.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 48b01b6efe52446b7011e291187cc6b68ee8e9371d8c1af249c3d22a44bcee40
+      - initial_input_ast: ab443a59dfbb4fc7a32e5ba2731ea20fc956e86b33ceb2595cf8cfe04b2f3397
-    initial_ast: e97b4d0f78072f5714267455d6f78311794bbe5137598b192cb54b206d27af16
+    initial_ast: 79c81fda32648f5f221cb72f879eb88edf26a92362546fde7260600b7191fb7b
-    unrolled_ast: e97b4d0f78072f5714267455d6f78311794bbe5137598b192cb54b206d27af16
+    unrolled_ast: 79c81fda32648f5f221cb72f879eb88edf26a92362546fde7260600b7191fb7b
-    ssa_ast: 62ad8e58a2f602f672b8d71b3c5c3d221695292f0deabbe75fe95ddb11013ddd
+    ssa_ast: 2538ae66568fbaa469d07794bc3342551374f502d1c3ed88647faac5a2ab320f
-    flattened_ast: c21e67349b5b449281f67a9606cbdb03b2ce1af0c51414f5c481ad3152ad4821
+    flattened_ast: e4d830146bf658ac87f3ace2a383a6d6c0f10954f8285371bf539e8183e3fe08
--- a/tests/expectations/compiler/function/helper_function_with_interface.out
+++ b/tests/expectations/compiler/function/helper_function_with_interface.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: d05be87e087420a1d04dc59a39e25b844321e999de35ea09111cdecf3e9782e7
+    initial_ast: 5d71dee426542f81c8bec2e80a4b5f5f7e264bcca8449f7b7d8377a3cc8d5384
-    unrolled_ast: d05be87e087420a1d04dc59a39e25b844321e999de35ea09111cdecf3e9782e7
+    unrolled_ast: 5d71dee426542f81c8bec2e80a4b5f5f7e264bcca8449f7b7d8377a3cc8d5384
-    ssa_ast: d661450ab82053366c1e7412ab38ae98da9ceb38d0b5c0c73c8d55ace469ec84
+    ssa_ast: 5f0508c0a5d301e7c5e39848ed5ca004d1ed40ee616613517a0fc110773e8123
-    flattened_ast: a5b99ba11303bb789705377ec5c78d36f32157c860d009cc026dfd8e612028f3
+    flattened_ast: 626e995bfa1c8c5ff62a4702b128a5b7fa6d200fdaa9e45ad349c06a49d92103
--- a/tests/expectations/compiler/function/no_return.out
+++ b/tests/expectations/compiler/function/no_return.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372038]: Function must return a value.\n    --> compiler-test:3:1\n     |\n   3 | transition main() -> u8 {}\n     | ^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Error [ETYC0372038]: Function must return a value.\n    --> compiler-test:4:5\n     |\n   4 |     transition main() -> u8 {}\n     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
+++ b/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 7e6b8b27b5c98d214ab9a8e4b3e52f407602ff624bbdddb690a8594367e772f5
+    initial_ast: 77b497487a2ddcfe141273f833a5a21192189675e3680727121f7c860e83acec
-    unrolled_ast: 7e6b8b27b5c98d214ab9a8e4b3e52f407602ff624bbdddb690a8594367e772f5
+    unrolled_ast: 77b497487a2ddcfe141273f833a5a21192189675e3680727121f7c860e83acec
-    ssa_ast: acf02e2c792e45f83aa0e48f68cdbadfe34237cbb6639c9501f085358ce7cc2b
+    ssa_ast: 0d56dbc6ea78dfb0138bc0830755f7f6fc80bcfc2e0fdac97e5755dfec4b7e32
-    flattened_ast: 5b7f6f1136906ad92e23ced7c5a3e0c432eb52aeea5378c058489b4ab0e4914c
+    flattened_ast: 7329ac0372ee5a92b3f8a04eaefc1ce7ab2c3c227828bb2be45c85c74e3d03a0
--- a/tests/expectations/compiler/function/program_function_empty_body.out
+++ b/tests/expectations/compiler/function/program_function_empty_body.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 63969071361fb38cb550ac148d8ac7009f450585ae67d7571ab6529d8dfb20a5
+    initial_ast: d8afca8e654b4682d5ac85264fdeaef3a37db1b97bea2dd2b18db00e73ea6621
-    unrolled_ast: 63969071361fb38cb550ac148d8ac7009f450585ae67d7571ab6529d8dfb20a5
+    unrolled_ast: d8afca8e654b4682d5ac85264fdeaef3a37db1b97bea2dd2b18db00e73ea6621
-    ssa_ast: 63969071361fb38cb550ac148d8ac7009f450585ae67d7571ab6529d8dfb20a5
+    ssa_ast: d8afca8e654b4682d5ac85264fdeaef3a37db1b97bea2dd2b18db00e73ea6621
-    flattened_ast: 63969071361fb38cb550ac148d8ac7009f450585ae67d7571ab6529d8dfb20a5
+    flattened_ast: d8afca8e654b4682d5ac85264fdeaef3a37db1b97bea2dd2b18db00e73ea6621
--- a/tests/expectations/compiler/function/program_function_no_constant_mode_fail.out
+++ b/tests/expectations/compiler/function/program_function_no_constant_mode_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372008]: function `foo` shadowed by\n    --> compiler-test:6:1\n     |\n   6 | transition foo(a: u8) -> constant u8 {\n   7 |     return a + a;\n   8 | }\n     | ^\n"
+  - "Error [EAST0372008]: function `foo` shadowed by\n    --> compiler-test:7:5\n     |\n   7 |     transition foo(a: u8) -> constant u8 {\n   8 |         return a + a;\n   9 |     }\n     |     ^\n"
--- a/tests/expectations/compiler/function/program_function_unit_type.out
+++ b/tests/expectations/compiler/function/program_function_unit_type.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 6db8f8954afb2435ecdbf223d084ff0394cee60a00bd339374d74669b89b5601
+    initial_ast: 55b4905794ce753b50a8366aa03200801c735f0a2db542725119c8ad2d94893d
-    unrolled_ast: 6db8f8954afb2435ecdbf223d084ff0394cee60a00bd339374d74669b89b5601
+    unrolled_ast: 55b4905794ce753b50a8366aa03200801c735f0a2db542725119c8ad2d94893d
-    ssa_ast: 6db8f8954afb2435ecdbf223d084ff0394cee60a00bd339374d74669b89b5601
+    ssa_ast: 55b4905794ce753b50a8366aa03200801c735f0a2db542725119c8ad2d94893d
-    flattened_ast: 6db8f8954afb2435ecdbf223d084ff0394cee60a00bd339374d74669b89b5601
+    flattened_ast: 55b4905794ce753b50a8366aa03200801c735f0a2db542725119c8ad2d94893d
--- a/tests/expectations/compiler/function/program_function_with_mode.out
+++ b/tests/expectations/compiler/function/program_function_with_mode.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 21a3efe1aec76be99a3ab24136aa49a760fbf7c1424b9882eacbf4c816925feb
+    initial_ast: f9ad661659d861ca0fd8f49e67b46898ae3e755960df7e0337ca71572a17faa8
-    unrolled_ast: 21a3efe1aec76be99a3ab24136aa49a760fbf7c1424b9882eacbf4c816925feb
+    unrolled_ast: f9ad661659d861ca0fd8f49e67b46898ae3e755960df7e0337ca71572a17faa8
-    ssa_ast: 9d4c38264ab17e46e9d82935e381a0396a3a36181c3e4b1254dd7a1ae7bd37aa
+    ssa_ast: 2420ac392de56c8b906e9b2c6d66107f78c51d2238a437fa9e3c4c4369f2d716
-    flattened_ast: 31f619df2fa49c2ca6b3cd7ae9ab68bb7cdfce358fb82f289781832c81383c19
+    flattened_ast: ad8473d6a6870141e47c2733ba29d9ba5d6d3b7ace772f54e4b27484fffd70f4
--- a/tests/expectations/compiler/function/record_in_conditional_return.out
+++ b/tests/expectations/compiler/function/record_in_conditional_return.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 52997f2072939db64bdd0fdd028299f4d53ead1c64c9f26f8f3ad31de18d5eef
+    initial_ast: b24cbee71a8cc3c995d22b70a42981906ad01c9bcdf5fed40b78ce89efd637b9
-    unrolled_ast: 52997f2072939db64bdd0fdd028299f4d53ead1c64c9f26f8f3ad31de18d5eef
+    unrolled_ast: b24cbee71a8cc3c995d22b70a42981906ad01c9bcdf5fed40b78ce89efd637b9
-    ssa_ast: 922aaa0b0f5ecab74b1b6146fc116fcfcc9e45a0e9c66903ab77439202f63b8d
+    ssa_ast: f3434ad7e0ced5cbe25012bbcfaca888c159deb5173e148e7a851dfc0a554c90
-    flattened_ast: 9d66683003f2b24853fc69bcf6f7cfc630f39d697e4be3092cc73d0d025e67ba
+    flattened_ast: 9149b476ec91c59d8bc1d9bb9c94bc143bf9c807d831c93eeaf6f5dae7c813d0
--- a/tests/expectations/compiler/function/scope_fail.out
+++ b/tests/expectations/compiler/function/scope_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:9:20\n     |\n   9 |     const myGlobal = 42field;\n     |                    ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:10:24\n     |\n  10 |         const myGlobal = 42field;\n     |                        ^"
--- a/tests/expectations/compiler/function/self.out
+++ b/tests/expectations/compiler/function/self.out
@ -4,7 +4,7 @@ expectation: Pass
 outputs:
  - output:
      - initial_input_ast: no input
-    initial_ast: 2b446ee22694f8bac763e42ff051c243534d2c05927ff943e9b597eda328d5a9
+    initial_ast: 84f4c62ad2cabcb64bf52b9b76f90f4f54fa792617dbded292a7c9764c88393f
-    unrolled_ast: 2b446ee22694f8bac763e42ff051c243534d2c05927ff943e9b597eda328d5a9
+    unrolled_ast: 84f4c62ad2cabcb64bf52b9b76f90f4f54fa792617dbded292a7c9764c88393f
-    ssa_ast: df1b0431a0c7a9ed5fd84f6ec873a82495500e7d2fb11f50d028acad9a2100ef
+    ssa_ast: 3f691dfa2f0630b5515b3806240cfb2429cfa2a128d1b80e06d642a8f92cd721
-    flattened_ast: 6a85dad5ce7848af87858bcb07c3e65a7b7f3c80451a06c60e19274aed204361
+    flattened_ast: 86366e160eacc314c1f8b054cb88970c6d249f95d713a605e8afef9472f0a32f
--- a/tests/expectations/compiler/function/self_fail.out
+++ b/tests/expectations/compiler/function/self_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372043]: The allowed accesses to `self` are `self.caller`.\n    --> compiler-test:4:17\n     |\n   4 |     return self.foo == addr;\n     |                 ^^^\nError [ETYC0372003]: Expected type `address` but type `no type` was found\n    --> compiler-test:4:12\n     |\n   4 |     return self.foo == addr;\n     |            ^^^^^^^^^^^^^^^^\n"
+  - "Error [ETYC0372043]: The allowed accesses to `self` are `self.caller`.\n    --> compiler-test:5:21\n     |\n   5 |         return self.foo == addr;\n     |                     ^^^\nError [ETYC0372003]: Expected type `address` but type `no type` was found\n    --> compiler-test:5:16\n     |\n   5 |         return self.foo == addr;\n     |                ^^^^^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/function/shadow_function_with_input_fail.out
+++ b/tests/expectations/compiler/function/shadow_function_with_input_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372008]: function `hi` shadowed by\n    --> compiler-test:7:17\n     |\n   7 | function tester(hi: u8) -> u8 {\n     |                 ^^\n"
+  - "Error [EAST0372008]: function `hi` shadowed by\n    --> compiler-test:8:21\n     |\n   8 |     function tester(hi: u8) -> u8 {\n     |                     ^^\n"
--- a/tests/expectations/compiler/function/shadow_parameter_fail.out
+++ b/tests/expectations/compiler/function/shadow_parameter_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:14\n     |\n   4 |     const hi = 2u8;\n     |              ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:5:18\n     |\n   5 |         const hi = 2u8;\n     |                  ^"
--- a/tests/expectations/compiler/function/standard_function_calls_standard_function_fail.out
+++ b/tests/expectations/compiler/function/standard_function_calls_standard_function_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:5:15\n     |\n   5 |        return adder(a, b);\n     |               ^^^^^^^^^^^\nError [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:7:16\n     |\n   7 |         return subber(a, b);\n     |                ^^^^^^^^^^^^\n"
+  - "Error [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:6:19\n     |\n   6 |            return adder(a, b);\n     |                   ^^^^^^^^^^^\nError [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:8:20\n     |\n   8 |             return subber(a, b);\n     |                    ^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/function/standard_function_calls_transition_function_fail.out
+++ b/tests/expectations/compiler/function/standard_function_calls_transition_function_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:5:15\n     |\n   5 |        return adder(a, b);\n     |               ^^^^^^^^^^^\nError [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:7:16\n     |\n   7 |         return subber(a, b);\n     |                ^^^^^^^^^^^^\n"
+  - "Error [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:6:19\n     |\n   6 |            return adder(a, b);\n     |                   ^^^^^^^^^^^\nError [ETYC0372047]: Cannot call another function from a standard function.\n    --> compiler-test:8:20\n     |\n   8 |             return subber(a, b);\n     |                    ^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/function/transition_function_calls_transition_function_fail.out
+++ b/tests/expectations/compiler/function/transition_function_calls_transition_function_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372048]: Cannot call a local transition function from a transition function.\n    --> compiler-test:5:15\n     |\n   5 |        return adder(a, b);\n     |               ^^^^^^^^^^^\nError [ETYC0372048]: Cannot call a local transition function from a transition function.\n    --> compiler-test:7:16\n     |\n   7 |         return subber(a, b);\n     |                ^^^^^^^^^^^^\n"
+  - "Error [ETYC0372048]: Cannot call a local transition function from a transition function.\n    --> compiler-test:6:19\n     |\n   6 |            return adder(a, b);\n     |                   ^^^^^^^^^^^\nError [ETYC0372048]: Cannot call a local transition function from a transition function.\n    --> compiler-test:8:20\n     |\n   8 |             return subber(a, b);\n     |                    ^^^^^^^^^^^^\n"
--- a/tests/expectations/compiler/function/undefined_fail.out
+++ b/tests/expectations/compiler/function/undefined_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370022]: Expression statements are not supported.\n    --> compiler-test:4:5\n     |\n   4 |     my_function();\n     |     ^^^^^^^^^^^^^^"
+  - "Error [EPAR0370021]: Expression statements are not supported.\n    --> compiler-test:5:9\n     |\n   5 |         my_function();\n     |         ^^^^^^^^^^^^^^"
--- a/tests/expectations/compiler/function/unknown_parameter_type_fail.out
+++ b/tests/expectations/compiler/function/unknown_parameter_type_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:3:24\n     |\n   3 | transition main(a: u8, foo: Foo) -> u8 {\n     |                        ^^^\nError [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:7:34\n     |\n   7 | transition returns_foo(a: u8) -> Foo {\n     |                                  ^^^\nError [ETYC0372003]: Expected type `Foo` but type `u8` was found\n    --> compiler-test:7:24\n     |\n   7 | transition returns_foo(a: u8) -> Foo {\n     |                        ^\nError [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:7:1\n     |\n   7 | transition returns_foo(a: u8) -> Foo {\n   8 |     return a;\n   9 | }\n     | ^\n"
+  - "Error [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:4:28\n     |\n   4 |     transition main(a: u8, foo: Foo) -> u8 {\n     |                            ^^^\nError [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:8:38\n     |\n   8 |     transition returns_foo(a: u8) -> Foo {\n     |                                      ^^^\nError [ETYC0372003]: Expected type `Foo` but type `u8` was found\n    --> compiler-test:8:28\n     |\n   8 |     transition returns_foo(a: u8) -> Foo {\n     |                            ^\nError [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:8:5\n     |\n   8 |     transition returns_foo(a: u8) -> Foo {\n   9 |         return a;\n  10 |     }}\n     |     ^\n"
--- a/tests/expectations/compiler/group/add.out
+++ b/tests/expectations/compiler/group/add.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 0bd21ccbaa9170a103798263ecbd395d48c248fee39fd4166a6f7aeac0651752
+      - initial_input_ast: 24452096d9adcaa859a76f761fb9abdc61400486eaf37d62a77c6e2896c77afb
-    initial_ast: ccf8b89f5e1b65e6adf20abf51c284b17ac4467b974fc1e183fb1923f96ace7a
+    initial_ast: 0facc88c123a32aa96e8fc97907f676ef7e2f854e8cc8858d7ffb49fc2e413f1
-    unrolled_ast: ccf8b89f5e1b65e6adf20abf51c284b17ac4467b974fc1e183fb1923f96ace7a
+    unrolled_ast: 0facc88c123a32aa96e8fc97907f676ef7e2f854e8cc8858d7ffb49fc2e413f1
-    ssa_ast: 352a47d5f5e2d74190d4350e7262a97efa2bc038184276f35e1463a4cc1f5af8
+    ssa_ast: 14e14b60785a74b90ce1c428a04d0a41a9c84cc5657aa87a66e8ada9af0d0e42
-    flattened_ast: ce3bcfaca6ee2db86ec7cf39fb088fe3e157a18ee4106d3e1dd376879766a735
+    flattened_ast: 9b481b4769faa100fa5cea2ecf410ad7750b5a637c2dc5f02e76d75515f2d7ff
--- a/tests/expectations/compiler/group/assert_eq.out
+++ b/tests/expectations/compiler/group/assert_eq.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 46101d9598f194f531885ec677b0c3d380105da7eed8cd46ee666e48eb6f434d
+      - initial_input_ast: 3797d2bdbc9f4815d1ef88b8becca656f3840b170094ddbb1bdfade4d8e567a1
-    initial_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    initial_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    unrolled_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    unrolled_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    ssa_ast: 76e2b0bc3d404551ca1b5417ad917ad88eeca7f08e261700b36bdf50d4df8ca9
+    ssa_ast: 5752e475f7afe62a2770eecf2d93ac05081d50174e39357c672e6f3a4531d6e5
-    flattened_ast: 3f04c7c7caedcda0428891f90e665e5953392b1a5cb082a26b37ff2d1ae57d7f
+    flattened_ast: ddd5e2b680c238226e37ca548c51d1a2f4d783b7e0257c42acf7b883aaad5ff7
--- a/tests/expectations/compiler/group/eq.out
+++ b/tests/expectations/compiler/group/eq.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 46101d9598f194f531885ec677b0c3d380105da7eed8cd46ee666e48eb6f434d
+      - initial_input_ast: 3797d2bdbc9f4815d1ef88b8becca656f3840b170094ddbb1bdfade4d8e567a1
-    initial_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    initial_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    unrolled_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    unrolled_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    ssa_ast: 76e2b0bc3d404551ca1b5417ad917ad88eeca7f08e261700b36bdf50d4df8ca9
+    ssa_ast: 5752e475f7afe62a2770eecf2d93ac05081d50174e39357c672e6f3a4531d6e5
-    flattened_ast: 3f04c7c7caedcda0428891f90e665e5953392b1a5cb082a26b37ff2d1ae57d7f
+    flattened_ast: ddd5e2b680c238226e37ca548c51d1a2f4d783b7e0257c42acf7b883aaad5ff7
--- a/tests/expectations/compiler/group/group_mul.out
+++ b/tests/expectations/compiler/group/group_mul.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 376b8d5e5992f0028a05693f902f486d3dfdc3d7bf9fb3617c36bf53e52a14a9
+      - initial_input_ast: d530d7963eff5ef7d1c2c2f40e26ed585da3391244bd857a61da42576e2368fd
-    initial_ast: 4fc880ddeb7072f3fd0d84281a54f8363a1c636d889c3a61ddb913beec17e0cf
+    initial_ast: ca748863847f96046db8462c3cbb5060ec449767af9ee082b10690cdf8f077c7
-    unrolled_ast: 4fc880ddeb7072f3fd0d84281a54f8363a1c636d889c3a61ddb913beec17e0cf
+    unrolled_ast: ca748863847f96046db8462c3cbb5060ec449767af9ee082b10690cdf8f077c7
-    ssa_ast: 0558c4093835aaea13b9a5eb5d26cf23052db6eae9de09a123cc11cb8173c80f
+    ssa_ast: 6a1473291566c71f843bb638c40e183339c66ec80172502802ac21995d0997c7
-    flattened_ast: 99506e95bb552960b16e112e4b0aeb1d5b468fbf1862181e7567664a8f7405ad
+    flattened_ast: 22877c98b9eee66969876c2b1b2823c850e122cd0397fbb3409ee0fcce9867db
--- a/tests/expectations/compiler/group/input.out
+++ b/tests/expectations/compiler/group/input.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: acb2bf95c6058160d1e14ba98c16882cd252d9ecc8809e234312c7f084f6d665
+      - initial_input_ast: 4d621b6b23f3eba436c7e0131354e4a260b8a98e15914e752c4839d7f5c4d25c
-    initial_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    initial_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    unrolled_ast: 389fb6dbe50447155fab1345a654f347632c59a0ecddaa117429add0cb7aa6e2
+    unrolled_ast: e20d2a0f7bb0586e4baceb6a6b0d6af267afc3817292805dcb5956bbb27a044f
-    ssa_ast: 76e2b0bc3d404551ca1b5417ad917ad88eeca7f08e261700b36bdf50d4df8ca9
+    ssa_ast: 5752e475f7afe62a2770eecf2d93ac05081d50174e39357c672e6f3a4531d6e5
-    flattened_ast: 3f04c7c7caedcda0428891f90e665e5953392b1a5cb082a26b37ff2d1ae57d7f
+    flattened_ast: ddd5e2b680c238226e37ca548c51d1a2f4d783b7e0257c42acf7b883aaad5ff7
--- a/tests/expectations/compiler/group/mul.out
+++ b/tests/expectations/compiler/group/mul.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: e39c5ad6c3a1e33376a266713aacc6d420db7bf492db841e040d613f55223b12
+      - initial_input_ast: a220b4ebad69e490bf4a2471e4c4ecde9207f9806df90c3ba99f7f77d99eb97f
-    initial_ast: f3d643684214b96cd62508e5de334a068a89499596c35549943e4eebb9cd0126
+    initial_ast: 07e7a71b7727ee073776cfd1ed51a79876d23d184e75300fc2feb849933da9c4
-    unrolled_ast: f3d643684214b96cd62508e5de334a068a89499596c35549943e4eebb9cd0126
+    unrolled_ast: 07e7a71b7727ee073776cfd1ed51a79876d23d184e75300fc2feb849933da9c4
-    ssa_ast: 70ebf596ad3e3570dd8836d3f5deba5c1ad850932b48753bef1a17bb0951bb5d
+    ssa_ast: 7a84373c29876e8797f468dbc48d665754ea74df79b50087f4ebacd98a8702d6
-    flattened_ast: 9d645b186051034d023ece873e145e9806fb96857ac2871d5fbcaa8d17b12421
+    flattened_ast: c28de0f4c552bc47c7eb80f1d98d091764fe1857ef65b74e1dfb3d8d38a22664
--- a/tests/expectations/compiler/group/mult_by_group_fail.out
+++ b/tests/expectations/compiler/group/mult_by_group_fail.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372007]: Expected one type from `scalar`, but got `group`\n    --> compiler-test:4:26\n     |\n   4 |     return (_, _)group * a;\n     |                          ^\n"
+  - "Error [ETYC0372007]: Expected one type from `scalar`, but got `group`\n    --> compiler-test:5:30\n     |\n   5 |         return (_, _)group * a;\n     |                              ^\n"
--- a/tests/expectations/compiler/group/mult_by_scalar.out
+++ b/tests/expectations/compiler/group/mult_by_scalar.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 29a005de5696e4727727aeac120c4004d71a633d198662ea549c5bd1314f5e4f
+      - initial_input_ast: c2f733a31bdf7f6f91fa96d411c99f2d702abb6bbaf9b00d35886aa51e8cbe8e
-    initial_ast: 42a6ef8b822c1d79d224ed9416abbaaf752b4448233d44fb26409cdaecca89ba
+    initial_ast: 8c705a012e5e2ebebcf25fc75dc467d5927f2663239d6781a97ef4611958df03
-    unrolled_ast: 42a6ef8b822c1d79d224ed9416abbaaf752b4448233d44fb26409cdaecca89ba
+    unrolled_ast: 8c705a012e5e2ebebcf25fc75dc467d5927f2663239d6781a97ef4611958df03
-    ssa_ast: cb65eb51b12a48c9d629a9b92376f6261fef271e5501d2b59aacfd6006e03000
+    ssa_ast: 0053a47f7b3a9c3c41e2daff0705dfd4ae188c765c0cf6c438203a56832b19a7
-    flattened_ast: 045b4a43bd1516d8a74f2fbda9fbef766c4a9da8b24164e6ef8eef0bfbf0070d
+    flattened_ast: 179a612b5543307588a7c21e26f7ebbf37a1b82d071b604b879228cfeec897ff
--- a/tests/expectations/compiler/group/negate.out
+++ b/tests/expectations/compiler/group/negate.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 75ad0540c7961129403d5ca8d21d93f03eb72dffbe7fecb012ac19f60eac31f3
+      - initial_input_ast: 1abe61a3267b558b08f1911f02c0845d05f7480beda9f84ee7111785e465cd15
-    initial_ast: 37a4e28a79a3f04368e282ff839932d7d48eaa18f571478d0a33e2b1a7e05311
+    initial_ast: ebfc2a6a99cb7ad2566aea5efcf5c5fd07ccb26ec9e15c738d95d98043197dd1
-    unrolled_ast: 37a4e28a79a3f04368e282ff839932d7d48eaa18f571478d0a33e2b1a7e05311
+    unrolled_ast: ebfc2a6a99cb7ad2566aea5efcf5c5fd07ccb26ec9e15c738d95d98043197dd1
-    ssa_ast: fc67dfedc2c766a3e82132898b60d986a654b8db87175f06a31b2fcf7c4b179e
+    ssa_ast: da468b7574c8abd9c2b4176d61a687189ba04c00ce88eb3d5c59bc05f563ed87
-    flattened_ast: 22108de0d256b7a1aca224db7af34988a7d600d9f6053be108d2755a0ddaf53f
+    flattened_ast: d44a85bb1e59c944d9d37bd42bf5678926b1f42538e921e470bc837675683462
--- a/tests/expectations/compiler/group/no_space_between_literal.out
+++ b/tests/expectations/compiler/group/no_space_between_literal.out
@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms (0,1) and group\n    --> compiler-test:4:25\n     |\n   4 |   const g: group = (0,1) group;\n     |                         ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms (0,1) and group\n    --> compiler-test:5:29\n     |\n   5 |       const g: group = (0,1) group;\n     |                             ^"
--- a/tests/expectations/compiler/group/operator_methods.out
+++ b/tests/expectations/compiler/group/operator_methods.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 00ccfdc59acbe8746c61e0600ee441fb338f7d1f5331eb4ba53d8fd470eb9989
+      - initial_input_ast: 312b6355a92e2532eb3c94405d148e2ae8046ababf19ed39064addd5341ad870
-    initial_ast: 548481585b07b5806a7fa56a850f49e7c2784bc469d455f9b06ca83ab0022571
+    initial_ast: 71dd4c460d59490006c1349772fbc0e0077d4c99c2e3cde8f5b73b5963a48844
-    unrolled_ast: 548481585b07b5806a7fa56a850f49e7c2784bc469d455f9b06ca83ab0022571
+    unrolled_ast: 71dd4c460d59490006c1349772fbc0e0077d4c99c2e3cde8f5b73b5963a48844
-    ssa_ast: e1f14c27a44e6376cd288f501d378bad1556fa536538be8b5f4901b7b7af400c
+    ssa_ast: e2d475beca3fcca92d25ab0c6077364c7a41349d9625cc477dcec0824df16ca4
-    flattened_ast: b9b7865af0d155d2698c23cc1cba1f8c6de03678cbddd8644a2b82271e19cca4
+    flattened_ast: 300975fa5eae3a97295101c50eea5897d566eda6e232973d53d3a492b7bb0312
--- a/tests/expectations/compiler/group/point_input.out
+++ b/tests/expectations/compiler/group/point_input.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 6939a961150c89cb0076fc737ead0bc9877e36a9ce808e4265113cafef4c2e1d
+      - initial_input_ast: 7e88f6837246cca096a2d19aee3186c1c07eb4e2934457f024cc34d66d74ed1a
-    initial_ast: 9f3fe793942f56b38d51e00215feacaa39c4df8b72da14f02938fa8be30facbd
+    initial_ast: cf45fa5f94e462acb9b3c7edc7f262713654fcc26c443123621cf5e742b5d361
-    unrolled_ast: 9f3fe793942f56b38d51e00215feacaa39c4df8b72da14f02938fa8be30facbd
+    unrolled_ast: cf45fa5f94e462acb9b3c7edc7f262713654fcc26c443123621cf5e742b5d361
-    ssa_ast: 22453e783371e8eb2111bc6acd5bc393e68cb50671e2efb15b63c9b5ff014562
+    ssa_ast: 960b9e39968e5457410eb74442930caf3a6a45911d6a22f01aa887b963ff7955
-    flattened_ast: e5a2273e79b69e4c9a7430f9be1899c156a0ab41cce2068349346202f4e7406f
+    flattened_ast: a8b7c5d5b199737c404bb5a6a90e9452ba641cb049ad5de873c63c2c7583e3d9
--- a/tests/expectations/compiler/group/sub.out
+++ b/tests/expectations/compiler/group/sub.out
@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
  - output:
-      - initial_input_ast: 0bd21ccbaa9170a103798263ecbd395d48c248fee39fd4166a6f7aeac0651752
+      - initial_input_ast: 24452096d9adcaa859a76f761fb9abdc61400486eaf37d62a77c6e2896c77afb
-    initial_ast: 404aca1a829f71b1b90525e955756b75fff552713e64804d44c6c12477cc976b
+    initial_ast: 1171789b08dc97f2a50941069cca8e8796e1c79597889d9291138ab87232ad24
-    unrolled_ast: 404aca1a829f71b1b90525e955756b75fff552713e64804d44c6c12477cc976b
+    unrolled_ast: 1171789b08dc97f2a50941069cca8e8796e1c79597889d9291138ab87232ad24
-    ssa_ast: 3ada8aabd318b4fe4c77bdb8fa9ab5c6cc9ca006a0978e5eef94d478bd362a5a
+    ssa_ast: 29b70b04b25fc43231835fda29130dc904f9f9e3c1e49e4e346ec2eccd09a4f2
-    flattened_ast: 047ce69d3eabf4225a696262855008f4c887318465358e4259f8c12021097743
+    flattened_ast: bd7003535b5c35d7fc00fc4551bb9468ba4244ff883a17f2ca2f2ba6af4d3765
--- a/Show More
+++ b/Show More