fix error message formatting in some instances

errors/src/common/formatted.rs

@@ -118,7 +118,7 @@ impl fmt::Display for FormattedError {
         write!(
             f,
             "\n{indent     }--> {path}:{line_start}:{start}\n\
-            {indent     } ",
+            {indent     } |\n",
             indent = INDENT,
             path = &*self.span.path,
             line_start = self.span.line_start,
@@ -128,7 +128,7 @@ impl fmt::Display for FormattedError {
         for (line_no, line) in self.span.content.lines().enumerate() {
             writeln!(
                 f,
-                "|\n{line_no:width$} | {text}",
+                "{line_no:width$} | {text}",
                 width = INDENT.len(),
                 line_no = self.span.line_start + line_no,
                 text = line,

errors/src/common/span.rs

@@ -152,11 +152,23 @@ impl std::ops::Add for Span {
             let other_lines = other.content.lines().collect::<Vec<_>>();
             for line in self.line_start.min(other.line_start)..self.line_stop.max(other.line_stop) + 1 {
                 if line >= self.line_start && line <= self.line_stop {
-                    new_content.push(self_lines.get(line - self.line_start).copied().unwrap_or_default());
+                    new_content.push(
+                        self_lines
+                            .get(line - self.line_start)
+                            .copied()
+                            .unwrap_or_default()
+                            .to_string(),
+                    );
                 } else if line >= other.line_start && line <= other.line_stop {
-                    new_content.push(other_lines.get(line - other.line_start).copied().unwrap_or_default());
+                    new_content.push(
+                        other_lines
+                            .get(line - other.line_start)
+                            .copied()
+                            .unwrap_or_default()
+                            .to_string(),
+                    );
                 } else if new_content.last().map(|x| *x != "...").unwrap_or(true) {
-                    new_content.push("...");
+                    new_content.push(format!("{:<1$}...", " ", other.col_start + 4));
                 }
             }
             let new_content = new_content.join("\n").into();

tests/expectations/compiler/compiler/address/branch.leo.out

@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 9c0c4094669cbb415b9d650a42335ba05a7026573e925d468de562577f90686b
+    initial_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
-    canonicalized_ast: 9c0c4094669cbb415b9d650a42335ba05a7026573e925d468de562577f90686b
+    canonicalized_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
-    type_inferenced_ast: 1b636553844640391e976115df709060a44e64346cbf06b4207a6f4c443e36b1
+    type_inferenced_ast: 57aa71789a8ba7ac075f734ecc0450ae4b56b2343cff19e345cdab9c7715e1ee

tests/expectations/compiler/compiler/address/equal.leo.out

@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: a98138d9c59f7f9d7a6ed08713bc78a84059734eb5ee7479abeea88ce02da881
+    initial_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
-    canonicalized_ast: a98138d9c59f7f9d7a6ed08713bc78a84059734eb5ee7479abeea88ce02da881
+    canonicalized_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
-    type_inferenced_ast: e0c1d57acb15679e25c78cc4fe3266b85ce26d4d7d23b55a78c49c33f0b3d550
+    type_inferenced_ast: 1d32fc5c118dc328274a6e2c4048c0efeea2b128fa2d2733ddf7d4fde4daf46f

tests/expectations/compiler/compiler/address/index.leo.out

@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 87761daaf7a803becfc809b948e4f34a2c38e4bfe3b8f5184e6923ad707be714
+    initial_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
-    canonicalized_ast: 87761daaf7a803becfc809b948e4f34a2c38e4bfe3b8f5184e6923ad707be714
+    canonicalized_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
-    type_inferenced_ast: 46539f9daa06cc132acaeeacf88a766d7f7673de8b9d2ea3ef01bb330520b00f
+    type_inferenced_ast: 822de2e0c4fdf74f7b476666b6a8a38782bd828dc2d216a7a68bf70edc444fbf

tests/expectations/compiler/compiler/address/ternary.leo.out

@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 08a406e8214b12bec43b41364c4d19fd81b227915ab2deb9c572b140c43aeabe
+    initial_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
-    canonicalized_ast: 08a406e8214b12bec43b41364c4d19fd81b227915ab2deb9c572b140c43aeabe
+    canonicalized_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
-    type_inferenced_ast: 5c194c9590eb53fa1a6af575e63bf54860befa24d3636610aa68c46b72d839a8
+    type_inferenced_ast: 2254abca31e4326444ef2066c8f85b3280505a3ecbaffaf7e472276a3034cc2f

tests/expectations/compiler/compiler/array/complex_access.leo.out

@@ -16,6 +16,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 10f8520f03661d994c22d2c73d8049a1b2af19a9a0d75edd6af15a8979aa299a
+    initial_ast: 589670c04ad13f8dbe2ea01562fa6bdff1c6dfaf118730e60d0a55e5bb2168b9
-    canonicalized_ast: 3b8301335066fe2bfe8eba905ab33bc816e911591a7873d9ea4ce42ea1709aee
+    canonicalized_ast: 82fd732401abaced235b6522298a454fd0491ea1dc0a80170773e1a129320657
-    type_inferenced_ast: 380dcc1b3581ded8098020e5a311d98aa17c5b19259ea0b7a4457d417ac2fe5f
+    type_inferenced_ast: 14321d2bd1a2d9da60f52372feee4c8bf6aa98d516c01bf309d219c903b7f241

tests/expectations/compiler/compiler/array/equal_initializer.leo.out

@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: fda944cb99bf4cedbfd531f2aafa9338f3d374ecbbfd40196cd82ccdfc462541
+    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
-    canonicalized_ast: 5e78fec68f5bf00fcc574930106ebf0883cc6122e3378fa245294619e7b2dc84
+    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
-    type_inferenced_ast: 7db6bf5aae7f4929e44e3d068c366a8917b937a43770b2f62ee35df4fb58eb81
+    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71

tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out

@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 7c27f9b122c5bfdff2c53d5474e99c4e7da6a4a1454f43242c87e508ed564c72
+    initial_ast: 2cbe00dbca8111c92a55dcb9a18766ddb9a407e71535ae62d3bf4d6ec409fca2
-    canonicalized_ast: 3d416efd3620b8851ac1ce3e14dc0b80baa7c11901beee61cc7e47ea7d177fe2
+    canonicalized_ast: 75d8d33b9a5376fea14bb9821abe1bc5e1661cfccbf962f58facb42e539b1b04
-    type_inferenced_ast: 34042fc568040adc10883279bd68c7efd24ba63717013aca008eeaaef32bc1c9
+    type_inferenced_ast: 45b1b5d994a229da8fb761d97c474778a65b8a5fdd87cfbd6e4aaa4a1ddef7a0

tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 218388bf03161d2c04e5aeea2c86e9c81d2bec8f080a1cf8cdaf003c15598f23
+    initial_ast: 002647d1f55a3b5f358cbd27beff81736973fc142dc3d708f8df8d634c1e8fa4
-    canonicalized_ast: dcc0c2c9f6acc9d8b565c0445e5e879ad76564c2b323587ae5d8ed84b5977d13
+    canonicalized_ast: b36a5f62c09093fcfce2797b89fe936c4bb94fe1e4aca6608cda4f529677b005
-    type_inferenced_ast: 26266c1f1ddaf309dbead42e49f4e41752e5e1fe72cdc3a24953088d08df953a
+    type_inferenced_ast: 524e0682eec030dda6f12637fb92af0122a7cf3986a8d7c974a2bc8a1554552d

tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: fda944cb99bf4cedbfd531f2aafa9338f3d374ecbbfd40196cd82ccdfc462541
+    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
-    canonicalized_ast: 5e78fec68f5bf00fcc574930106ebf0883cc6122e3378fa245294619e7b2dc84
+    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
-    type_inferenced_ast: 7db6bf5aae7f4929e44e3d068c366a8917b937a43770b2f62ee35df4fb58eb81
+    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71

tests/expectations/compiler/compiler/array/multi_initializer.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 32a53c1270d2a7384c5d1a0cbda49d9634db09dc2b69fae444fb4f36109bb8fa
+    initial_ast: 411fd383234eaff206ddb89e59c53eb3cf89cc0584065cbcc6a407f7b6c657da
-    canonicalized_ast: 88df9d661f84ad6650c5d81dd0ec07b5a07fbb2ceda5fde1ba545bc3391ac9ce
+    canonicalized_ast: 8730ae623fae334d698ea4169b630365f3026e6b39264da353e194feb07c0863
-    type_inferenced_ast: 5aaf153f3c03ac9e11e500a1e60f0ea11d1b5c736c3209118f3c67c0321a490b
+    type_inferenced_ast: 48ede78fbd4de76d6693bc2a50b813f119024f80d0a6c73f174f1a7ba56a92ce

tests/expectations/compiler/compiler/array/nested.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8f10cab9e9d44f9e2bf63d3de712fbfd56e311fe1bf9a8cdd2d29d23acdca9bd
+    initial_ast: 436ce80cb3f81cd43e5747a105b14947964f29c0c35070c394728cd2cd9b1fa3
-    canonicalized_ast: f4516c7e913f38f8fcfe8be1061ea4960a44891e92f369f7a114ff87ae08385d
+    canonicalized_ast: 3097d80c877f857bd36f1e3ca56aefd7524a2fc46239959190ae9c5ef166ba9a
-    type_inferenced_ast: 530a5d13568caa8db612d73623d876294110f2d2ca4fa57f7dc67d7a8b6bb75b
+    type_inferenced_ast: 873a71a8f9894e1967f0f750d63011597f17e0a51b5cd42ea0b74191ffa357a1

tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 896fc62bde36645825dc69df4fadb323db666acf660708e94a699f1028fff42e
+    initial_ast: 33a39a0f27f018eee2f2986d1356bcc9354ce3128447a60859f4392b8a4e4f29
-    canonicalized_ast: 7ee6031329c67e55206272781e4b790372743eaf797585428417995e833ce6e0
+    canonicalized_ast: c227ab0a4e864f62af90e4b1d843dcd41e65b65354107558cf26383831010a1d
-    type_inferenced_ast: 37f276c62c7619fc7e541006b5d70f2d628419243b561b52352ea5d944f395bb
+    type_inferenced_ast: c2515f900d7b2ae04c80ed1f7a3bf5729fec502dffc910cae03ac8cf02530dce

tests/expectations/compiler/compiler/array/registers.leo.out

@@ -22,6 +22,6 @@ outputs:
             r:
               type: "[u8; 3]"
               value: "\"123\""
-    initial_ast: 8081e76e99bf5f637adacbf3ebc7f55c0cce51add474de0bd53da72ea559f489
+    initial_ast: c6b18b6fca7fda77a9eba151f4d27d084e1ad7aa616e6ec9deb1ef5f4bff2d24
-    canonicalized_ast: 8081e76e99bf5f637adacbf3ebc7f55c0cce51add474de0bd53da72ea559f489
+    canonicalized_ast: c6b18b6fca7fda77a9eba151f4d27d084e1ad7aa616e6ec9deb1ef5f4bff2d24
-    type_inferenced_ast: 7fdc1c08d6bc57661b15407868ca23940aea04ec9e4d36d9e41f151a8cf09461
+    type_inferenced_ast: 6f6e6b35b55543bc87589005ac9a47830e3f65680a4db82e3f17d9280d6fa4ad

tests/expectations/compiler/compiler/array/slice.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: e29ed0519cc383934fa19fb0efb6d8789f973a26dbeef8d88859efb29624c3d9
+    initial_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
-    canonicalized_ast: e29ed0519cc383934fa19fb0efb6d8789f973a26dbeef8d88859efb29624c3d9
+    canonicalized_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
-    type_inferenced_ast: 7051b05b956b9b30cd64b5e7fb93837b78731742431f3210e0b67cc308fd37f4
+    type_inferenced_ast: c5a14533d3c5d0751b98beb612a88eac2c7687ae77858dfcbc3424b160f1cd7d

tests/expectations/compiler/compiler/array/slice_lower.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 847923c2af8832e5f2e9b7ba33e6da05ce6b782fc49061817bf0e8c1f308af78
+    initial_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
-    canonicalized_ast: 847923c2af8832e5f2e9b7ba33e6da05ce6b782fc49061817bf0e8c1f308af78
+    canonicalized_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
-    type_inferenced_ast: d9feb9d3324d32ade64eb50f2f49ba54f656430197085755558bc972f3d76252
+    type_inferenced_ast: 80f8d5b301bc982f189c63a4d908c7bf7a9a2d5ea351778d740035bad95f166a

tests/expectations/compiler/compiler/array/spread.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: b213065cf9a69052aa42e5e2599ebbec19429b7c8f286dd29baefdd22de5ae11
+    initial_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
-    canonicalized_ast: b213065cf9a69052aa42e5e2599ebbec19429b7c8f286dd29baefdd22de5ae11
+    canonicalized_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
-    type_inferenced_ast: 6cbb6af27980d61e07df3f9f54b77ca34463c79df3f4980870b9c184847eac27
+    type_inferenced_ast: 7294dc3dee9189573cbf54b90692869b2a02a78fb3bbb6fe3e2436d2cca377fc

tests/expectations/compiler/compiler/array/ternary_in_array.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: d073d355e5dc63d782bf7511301b7d3460b1909f20cb951275b4160818f91e96
+    initial_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
-    canonicalized_ast: d073d355e5dc63d782bf7511301b7d3460b1909f20cb951275b4160818f91e96
+    canonicalized_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
-    type_inferenced_ast: e896efa565b20c373020f3e3fb2ca68c2ee836512b4968d61b920e9ed6889fdb
+    type_inferenced_ast: edcba3eea639506ff172054105ac6533c6d184c131240e73f896f307983ba3c2

tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2d243135efb97b9b091ce0e5c7286b71ff3561da860cae9db7af5cbeb696f6c
+    initial_ast: f92dd478e6c8fdb9a7f0dfd3ad0cf9e6e0239c59e5ee1fda0851fdcdfb2ca589
-    canonicalized_ast: 28d1ec3e1349fa7d140bbb51cdefbe85dc73ce6e1ef540fa4cf9ce7700411a8c
+    canonicalized_ast: 0ce7eb5522cc65d45b259560b138eca8750b7a4231435f6b5df21c906db4d5ba
-    type_inferenced_ast: 9928c37278b67a3d0882f1cb7b2b1fe630ad0771ac1e95509028c3e9241a3bbf
+    type_inferenced_ast: 1aeacac3268aed9b99f7d5a7736e9f32cd1a65905d3234d11ec5f6027bd68c66

tests/expectations/compiler/compiler/array/type_input_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: ddb20cbb9ecf52a8f9d61766f0bdf76d01d3a7854c5ca018f88e226592e44940
+    initial_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
-    canonicalized_ast: ddb20cbb9ecf52a8f9d61766f0bdf76d01d3a7854c5ca018f88e226592e44940
+    canonicalized_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
-    type_inferenced_ast: c7c2205a1fb4587b6281f21d34a2cafae1583106e19af3beaead87b623cb61d6
+    type_inferenced_ast: f870e0b5181e4187da90ea8f7ea562596f0fea420425a403a972d761131718af

tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 8b5cb35e1fe17071cd7aa404be247a325dde350d6954aaa1c58ee0bb0dd4d333
+    initial_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
-    canonicalized_ast: 8b5cb35e1fe17071cd7aa404be247a325dde350d6954aaa1c58ee0bb0dd4d333
+    canonicalized_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
-    type_inferenced_ast: 4661ca8ff2e993ddae82000b6db73db86b63af8c4557d22975abbe9a63cb14e5
+    type_inferenced_ast: a1307016717f76519ff0f813ead70ed5460644e0e8414827665a1bd066159a76

tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: af5c8bc684c384ee78844b52c6752ba286378bb41218faf63446caf1d7d98c6f
+    initial_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
-    canonicalized_ast: af5c8bc684c384ee78844b52c6752ba286378bb41218faf63446caf1d7d98c6f
+    canonicalized_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
-    type_inferenced_ast: c15b64210f2f8afad3f9819f877f287c2a6a08e2edd6adeb4375527c4d1f426b
+    type_inferenced_ast: a61912871814695d648b0f176feaa0409b3d6bae3cb7c7a1234bf6543e015a5f

tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 98381a0a6fe09deaba7e43c014332664b608098bed9855ce1c19b6494b26cebd
+    initial_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
-    canonicalized_ast: 98381a0a6fe09deaba7e43c014332664b608098bed9855ce1c19b6494b26cebd
+    canonicalized_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
-    type_inferenced_ast: 40c047076318d5931ad0d3a3aaa6ddd8245a012b68f5ae3792c1b6334e444bbb
+    type_inferenced_ast: 4be69d8478185f5b9d4dcee3fc16ad4af858b7a47122bbc8e757d0dbc4bf92d8

tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e51e19607178661b8069b140d903234ad67047f876e428cd98577a317c1c63ea
+    initial_ast: ce12666930386785c7a5afe142793c47eae62145ff1d50c590dc82c2b4baded6
-    canonicalized_ast: 9ece5eb8b7cfd8d9f46e1f5d56932463bfade9ed0dc7aa5cb4ea1a02710fabb6
+    canonicalized_ast: 8220bc2881fe07bbfa873376696618fc182aff993d2a7d1a23ace5cc00965ff8
-    type_inferenced_ast: 75035a66a260d555fd66fc58a8c349cf77a88e649d9af5a21620b1d0ce69ab76
+    type_inferenced_ast: c14a7e89debd9289883db476fdbc814d14bfc410d40d1ac100bbece88d35b7c8

tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c7388d8c25c6c593bbf9df42442c773fde414f17c608ea3f44e7d2b1d2da742a
+    initial_ast: 609dfd962592e1dbf90051979163cead865cb69c0722c641517fad4f3091ec57
-    canonicalized_ast: 1f78e26797ec426580278599d668230e3ff5c73f8bfe5ee34aa2cfeb2bc8f501
+    canonicalized_ast: 4d6b8380c844ac6655c7dcc4c4a2ff45f14001577c82f21d87b4546e04c7e776
-    type_inferenced_ast: e1850f46b6a18ce3fdc6be9fe8cd71df61b47c11cf4b6904e9006feec39724a7
+    type_inferenced_ast: d86da787361b7cea05474815138f2a1f98642b93232641bf399647788c0d5ecd

tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5ef47c66a7103fb79151a128b79e270c775761f85ba7b600fa62feedb9d776a1
+    initial_ast: 67cb2ae1b5b3e19a7c7aa8783d0f566b69bfb995e7848ec7746e1af0448c1aa8
-    canonicalized_ast: d85e3d11bcb9ea34f4c0115bc19ab6cc9706e24f337127a5deb76a23762b1cc7
+    canonicalized_ast: 4aba053c866851bfcd22da037e0270ad43a7fabbdc263629af52eea38d577b7a
-    type_inferenced_ast: 4b484d40365dd5e0440645a4ae057979e008f58b9072977da44a4936d6844201
+    type_inferenced_ast: b44ceb7749802ff53c82221efad075565264531500665a01aa94f745e0c304cd

tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9c4ccc3962870de33739e88f016f9ad2a26fce1dd9d83777e75146a770a7c843
+    initial_ast: 9867f722c5ce3ccbc3701238c216acc2b7e37bdc6163a8f7a4a4d88b7f19b73a
-    canonicalized_ast: 342998b2e6b4e15992c0ae8f8f9e88fd61028b9f5251a1a44eb0a5e748fb914a
+    canonicalized_ast: d5f9deb2b7806ec665a6c6a5a6a0bee2c76310ecec4f34a8a479aa6934902b3a
-    type_inferenced_ast: bcb57fa0c03974b04bab42f1000a0896442859aefed0b3da4122f9e2eb6d3bcb
+    type_inferenced_ast: ed9cee663a3a9dc51ba06a80e5f192fdcc49e62b8e4cb0ae9582f3a7f7b1de25

tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f58024907a398764d1f82717bfb3c428f3bcaf199612fb58f57da612dc0f31d9
+    initial_ast: 222950738e89721363dd15b8f5d240befa46d434c45f486857ec4898806d0e84
-    canonicalized_ast: f08780773dfd122a26f9afb8a17ead2177a7741fe658510d4cb3e00e80ac43e6
+    canonicalized_ast: b89098b4159b284f07be789cfb5b196515c9d33821be1411c4bc25ae3c90425f
-    type_inferenced_ast: cfb5f5e51dede0eb87e637bfc6cf995c8f15c32fea3caf92c0a73b5af430a9fb
+    type_inferenced_ast: 4e0acee05ff837a30c1057dec0c5cc18a6ce573e5891218990f88584fef683a7

tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aabfd4724373f68e44dac450426c84c619f8441e02f4cec46bf1a96b01d687c6
+    initial_ast: a312fb26b99d2c4a7891d482079f0220663dba780bc68b9f651def2cd9bad960
-    canonicalized_ast: 2768446224453862bedd1449de91a6f9e82a06ce41a23dc4afef2e8bc2faf078
+    canonicalized_ast: 01c472ee0495bbb164f67159e86483a29421918178a7115ebd3b905d6909150f
-    type_inferenced_ast: 24346a907649334e87888b2744dfda551e8ca3248b1e357d432ce0d027f44a9b
+    type_inferenced_ast: ac2c37891e21027028b4a1e4b8f5972e5ee64f91f6b2ba6a85218c622192ce02

tests/expectations/compiler/compiler/boolean/and.leo.out

@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: e412bc079077d0894afdfb1b2bdcb0627216e64e05b93d53c065acaab6602648
+    initial_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
-    canonicalized_ast: e412bc079077d0894afdfb1b2bdcb0627216e64e05b93d53c065acaab6602648
+    canonicalized_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
-    type_inferenced_ast: 8455cc489d00cc4c2efb999f238544d267605c78c4a3711f3968daff8b1b691f
+    type_inferenced_ast: b41ada9ca834d73d94641fa3f28c95bea6e6862819bab431ac4b02cc342fb659

tests/expectations/compiler/compiler/boolean/conditional.leo.out

@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 76acb7e9a4a70256e7a92d168c9455fed850a3773a9ea92ec5216456b2f3f5ca
+    initial_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
-    canonicalized_ast: 76acb7e9a4a70256e7a92d168c9455fed850a3773a9ea92ec5216456b2f3f5ca
+    canonicalized_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
-    type_inferenced_ast: ae2c4bcde83fa9bddf1c0a7a2c32a910f7f8e43abf52bcb2275c8fce1349af1f
+    type_inferenced_ast: 53a91ffe37b6a96f1c239669f04ab600f51d2a200a8aed2dee0dc50bb5fa4f7d

tests/expectations/compiler/compiler/boolean/equal.leo.out

@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 9ca546550b286113dcfe9e345b58f996e01e7f3429b33f4829bdeda7a09939a1
+    initial_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
-    canonicalized_ast: 9ca546550b286113dcfe9e345b58f996e01e7f3429b33f4829bdeda7a09939a1
+    canonicalized_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
-    type_inferenced_ast: f5ad424921b7256fb2553793ee3a83d11cb70e2c6f7d6df99d93631bb534ab90
+    type_inferenced_ast: 5c851d6f023000766f370ec5bc048af431212368c68fb1ba674500ae7451a36e

tests/expectations/compiler/compiler/boolean/not_equal.leo.out

@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
+    initial_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    canonicalized_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
+    canonicalized_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
-    type_inferenced_ast: 30507ab22a8ebd6bb0f239d34923201b6381a722e11649c0b1ee73acd9317902
+    type_inferenced_ast: 5b110c3aa3e0d65942f7a7fdbdccfc745aa810ea7d71137358f220d2bfecb0b7

tests/expectations/compiler/compiler/boolean/or.leo.out

@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: b511fd260063b7d9608269bd67b0fdbe8ad9bd4ea1263fe1de4487ae071ce373
+    initial_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
-    canonicalized_ast: b511fd260063b7d9608269bd67b0fdbe8ad9bd4ea1263fe1de4487ae071ce373
+    canonicalized_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
-    type_inferenced_ast: e1844ed06868262cb955e23c6844a44e64c156897ab166356a5ce4b1e0f6ce16
+    type_inferenced_ast: 3dd86ce4e1ecce14619b49e274f1c3275ec7561f82655eadda4752f20e771802

tests/expectations/compiler/compiler/char/circuit.leo.out

@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: cd951a04ce5ef7c9de242229574bea37ff8b7b9f74ab673b01c3d41527de2179
+    initial_ast: aa3eb0c4de0eebada9490b11e35c36923316559727a3afce28fe3852a805354a
-    canonicalized_ast: cd951a04ce5ef7c9de242229574bea37ff8b7b9f74ab673b01c3d41527de2179
+    canonicalized_ast: aa3eb0c4de0eebada9490b11e35c36923316559727a3afce28fe3852a805354a
-    type_inferenced_ast: 3fe7acb8144387410019e5bdfaff1b87c7969a25f68184df6b11091ac1bf64bf
+    type_inferenced_ast: 73309200d30bf2831847477f3da7ede4ba9f4aa377e6ebf15c9c34774f53bcb5

tests/expectations/compiler/compiler/char/neq.leo.out

@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'a'"
-    initial_ast: be224a09ae4accb70784b57ed46907da9ffec12019023cd93d57c0496f508fd3
+    initial_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
-    canonicalized_ast: be224a09ae4accb70784b57ed46907da9ffec12019023cd93d57c0496f508fd3
+    canonicalized_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
-    type_inferenced_ast: b287f08b3e9cf836b40d4ed75dc0195fa6e70e84051976e33529a7708790fc6f
+    type_inferenced_ast: 460b284982e0fb9819768800b2c84ab682929bba1b6056f03e5e90bfe7f92420

tests/expectations/compiler/compiler/char/nonprinting.leo.out

@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: 740e6bb885f1daaa7fee1d7f54a885a46315be42cfbdc3ccce59e1c5fc9ca9f1
+    initial_ast: b03b0ea8ad821952fa64e477900b43c830e9fbd9693478018ad4b13abd12b027
-    canonicalized_ast: 740e6bb885f1daaa7fee1d7f54a885a46315be42cfbdc3ccce59e1c5fc9ca9f1
+    canonicalized_ast: b03b0ea8ad821952fa64e477900b43c830e9fbd9693478018ad4b13abd12b027
-    type_inferenced_ast: fd2b61864849e92b4ff3ba2e6d116db22e260754db0cd4cc4f09396cb065387a
+    type_inferenced_ast: 4ded1909fcd3fa1edf7de8111d3f7b97fced37b5b2d18b316f9fee3aad246f5e

tests/expectations/compiler/compiler/char/out.leo.out

@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: d99f5828d608a8276317325e26e0160a8f715a3f12d336a1ad4c7a487665ab2b
+    initial_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
-    canonicalized_ast: d99f5828d608a8276317325e26e0160a8f715a3f12d336a1ad4c7a487665ab2b
+    canonicalized_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
-    type_inferenced_ast: a183d62d41415685263e16f9f434b96b110421d5f9344e29f96f9a3ba6bdd63f
+    type_inferenced_ast: 40d126753bfa96341a167671ffc7244c6430d8f40934d8197c969baa9b49c785

tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 12a3a0966e472cd150c9be3488ef8fa05c2acbd8e6bd7a8b4e60810060100717
+    initial_ast: 776ea4bb946bb5d56430c22be58f3539dbecb25a11ec07e5e8bd3db49be7f937
-    canonicalized_ast: 376cd2cd19920d2e08a647a65a94320e6921bb9bdd93307c3958fc25fa4d3073
+    canonicalized_ast: 6a95acbcb25193b7b9f9e7a2bbcaeafa83ec09163e097b12076ea512a9daaf14
-    type_inferenced_ast: 85e9c164aea5fc92e5351b8bec47ec1e65620d56f01423e11fe034259b67d7da
+    type_inferenced_ast: d71ab34660bf998f236dfe59e55050f9f5fba8671bacbbdde04b4902927ec571

tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e381c58c3d3af3336ded12b5db5a2f2a71b420cd1fdbbf7eaa2dbe0ec903d547
+    initial_ast: b438fb664bd7b8683beabd5044efba7669d3fcab093994b1c386a30ad63fff14
-    canonicalized_ast: e381c58c3d3af3336ded12b5db5a2f2a71b420cd1fdbbf7eaa2dbe0ec903d547
+    canonicalized_ast: b438fb664bd7b8683beabd5044efba7669d3fcab093994b1c386a30ad63fff14
-    type_inferenced_ast: 208f0a2681d12c62b60bdd85c25c28c60b479c20846792d2a5b06426c045edc1
+    type_inferenced_ast: 9094424be690a804ae2e5d3ca2787104de01dc6bca89fe6d349db5709c5161ac

tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 71afd59d48b7a5725c040ba4f5cbc217bd46d0fbaad0bd82047032b20dc1cea7
+    initial_ast: 7221141253b1998cbddad5f0c1385e7b53450a535112c0eb112b5af01474ce20
-    canonicalized_ast: 71afd59d48b7a5725c040ba4f5cbc217bd46d0fbaad0bd82047032b20dc1cea7
+    canonicalized_ast: 7221141253b1998cbddad5f0c1385e7b53450a535112c0eb112b5af01474ce20
-    type_inferenced_ast: 47ad2c3e7620a0ae7b24169100607802fad08cf9f0ab595ebd78addbc5359d12
+    type_inferenced_ast: f208046c46de9c4a42c47079504791711c9b0c8b3fb35dd413243fcbfd7dbd90

tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 111c8bca8f07afa989ca6c7e90e66bf6951e04d59aa2ef60f64d0038f6bd06a6
+    initial_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
-    canonicalized_ast: 111c8bca8f07afa989ca6c7e90e66bf6951e04d59aa2ef60f64d0038f6bd06a6
+    canonicalized_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
-    type_inferenced_ast: 19623dcb1932cbfa82b16d5708cbe3283c7ffce9d1af1e177276e7ebcbe7e951
+    type_inferenced_ast: e5cdf935d34157bdbc2eb228c94e2222887c91fc3bc1c9f24bc6e84fddde9730

tests/expectations/compiler/compiler/circuits/inline.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: u32
               value: "100"
-    initial_ast: 181f6d20025c125f510c3bbf9dab7936155b23a046e30663b602543262690efe
+    initial_ast: ba821e922e3b934581e39a58e2ef08d14b6cb0355500ed79f017dc0ecd39651c
-    canonicalized_ast: 181f6d20025c125f510c3bbf9dab7936155b23a046e30663b602543262690efe
+    canonicalized_ast: ba821e922e3b934581e39a58e2ef08d14b6cb0355500ed79f017dc0ecd39651c
-    type_inferenced_ast: f6ab78af624e7e102515f1ee9f50a84e987db4584307141d526775cdb80da506
+    type_inferenced_ast: 03fadaa1772f83ffa18a67a2279a65bad0715a6077f7219ff8955b45707c0437

tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d5e8c08c6a19699ff2be86d39e9ebd41e323dc284576ba6f52c49a62eeab79c9
+    initial_ast: 58d028cbd020f04ef3b1025a07dabbc8bc4f5a2adf7e2ca4bb67cc229d4f64cd
-    canonicalized_ast: 2433daf73b2335fc2db4f00f8804ca516f04072e273a5e7217a5b290445043e1
+    canonicalized_ast: 5e72d67df40e8ecd2ae9999419888ade6ebf1c054f1f80f91a274360e294d361
-    type_inferenced_ast: 3199daaafcb76155503937860b663a8a92162e84e0b4c942f94fd2b1dbe0dc66
+    type_inferenced_ast: 177f3be4bed2ca8e1a9543b8bb71a75a751d6835dcac15910bc4bd5fa9e25897

tests/expectations/compiler/compiler/circuits/member_function.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5289f23055d0851d8b154501acbbace2da9ae7d5064f78e9e870b3c0450ac3e1
+    initial_ast: 681bcdc031155971ce0dab8c8ee659df3f09b97b4e6b4525d47f4a045765a57c
-    canonicalized_ast: 5289f23055d0851d8b154501acbbace2da9ae7d5064f78e9e870b3c0450ac3e1
+    canonicalized_ast: 681bcdc031155971ce0dab8c8ee659df3f09b97b4e6b4525d47f4a045765a57c
-    type_inferenced_ast: 53668b53579ae10c6299e4ef5ccdc459dab29b35b996476334022c24fe915958
+    type_inferenced_ast: 40920da878d0316ea8fd4d1963e53843b1d8933441fd568adba5f11e4ded7246

tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 103ec635fd095c831e1b7dd0e89fb86f82380f85ac96df20e91a2f75ddb8b87d
+    initial_ast: 05ea77fc193abe91954fc2fcd338d3ebfaff6bb7939339e9dcc78e514802dd42
-    canonicalized_ast: 103ec635fd095c831e1b7dd0e89fb86f82380f85ac96df20e91a2f75ddb8b87d
+    canonicalized_ast: 05ea77fc193abe91954fc2fcd338d3ebfaff6bb7939339e9dcc78e514802dd42
-    type_inferenced_ast: 43313200085be347f7429b294e8e5edc61f6a7698df689f5ca9f9740984c8534
+    type_inferenced_ast: 9827f4b622a95714f55620295e8ce9d9cf6fc85603a869b178825c818d64d768

tests/expectations/compiler/compiler/circuits/member_static_function.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a09c26dcd49814e5df7dc933932bbcdcf502d3e40e5b9975a73f63f03bdbda21
+    initial_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
-    canonicalized_ast: a09c26dcd49814e5df7dc933932bbcdcf502d3e40e5b9975a73f63f03bdbda21
+    canonicalized_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
-    type_inferenced_ast: 2b000c5f36d84015d02ee34afe409ba569090a3744786a7c6f7fff78d397120c
+    type_inferenced_ast: 6cdc6a128cc2fb9220293b7c34ba4066cc63911f5ffbe00959142992f358e488

tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b001d188b90cae9717d631d28e5d1863c439441e17d61b0be9560b2b3bbb1e0d
+    initial_ast: 380f44a5f5d7c1ef76c593da32936d480e79240bb7cd17fce0122b18c9e7f722
-    canonicalized_ast: fbb2e8a8462d2b2da2e445d1111d0e33f89e88cc5d20ddbd3af707616c5672d5
+    canonicalized_ast: 82f1edfa14a6e28b57828bf5f4be2aaaf21fb5468c0388088a56a4e44adb31fe
-    type_inferenced_ast: ceb9c391dee91311bb2a5c7e48ac4cad327d9f1c502b559ba88df956727bd866
+    type_inferenced_ast: ab690a29d11e08699223ec4009174acdec23c3667d523af63556187d7396e66b

tests/expectations/compiler/compiler/circuits/member_variable.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3aa5764cbd902c2cc381caf3799f6444d8a751ac296d2df46836798c7c2516c7
+    initial_ast: 0723285d6c4dac924f6c86e0a6fd57eb78947cfcecd45f2520b7b0f0029f3279
-    canonicalized_ast: 3aa5764cbd902c2cc381caf3799f6444d8a751ac296d2df46836798c7c2516c7
+    canonicalized_ast: 0723285d6c4dac924f6c86e0a6fd57eb78947cfcecd45f2520b7b0f0029f3279
-    type_inferenced_ast: 81579961aa1f500134365339e17642c1e18ef0fc7c4a2231c71bbd5136be81b1
+    type_inferenced_ast: c42738de8987ca76cacc30dbf86688ff11d5dbf7dccba67947cc78eb452460fd

tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c47b15931cf28e5e59b3d179a47fcc4587983b70ca759005a857453c672e2a9e
+    initial_ast: bbad7fd765dee42c9ebaca7e07201d61befefa5e7d5af700130954ac29cdd27c
-    canonicalized_ast: c47b15931cf28e5e59b3d179a47fcc4587983b70ca759005a857453c672e2a9e
+    canonicalized_ast: bbad7fd765dee42c9ebaca7e07201d61befefa5e7d5af700130954ac29cdd27c
-    type_inferenced_ast: c3eb89894262dfa346936a88224a76a113faf0b260918a9d70b9cd9327f98ab3
+    type_inferenced_ast: cb8745ad419c19ad007a9d9d905f01c0d85d2e78cb82be0b82342c44015c322e

tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 88691b6324a60d5e0dd23b6afa9078c4e806395f9b5fc072b2d59c72d4e242f8
+    initial_ast: d2d5680f0e011b93b2e55aebb62f51b4e78cf68289ffd84a80f852d2a82a6723
-    canonicalized_ast: 9f92fbeecfc58a153d539735798e482a44deb5d1bf303463838f15639de24d7e
+    canonicalized_ast: 57c2e52b3f73e7052fdc92d0c668b598b282321cd390ed836f20b92bc528b6e0
-    type_inferenced_ast: 0c1b51a5710965c5e07f9189775e7e2f9b0e9a6bc0e368ae1162547fbf55f993
+    type_inferenced_ast: 4f8c32d94398d49ffb9b1eab3639076e77d77159411c1891d814b4946751e554

tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7c4442a07900405f1bb78d46068d1599b16183552f0878abf9c3e661b6cc5f41
+    initial_ast: 15da2283babf7f4a490bd7bdc0331522107f7ce4c88949863178ba4a00419ead
-    canonicalized_ast: d52ffd68c34f9cb3833c30936001f18de9a340873615bb5b911ef5df4e2ed5eb
+    canonicalized_ast: 96a167f8b897e9973bb7b9d13faa81da0b635a6611ef09124a5d12f817b35254
-    type_inferenced_ast: 2422a89048dd0a5f6ee26a31a095f9cab777b14886a367be90ad78fe18e71523
+    type_inferenced_ast: 82c54a8e54820fc234a7029cb4c6018df99e7a3d4b47f418efc8835889b1c6cc

tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e5d4fa7417a305e83e4af12e3dcc9e085d372068babbefa514ae9a28bc96a819
+    initial_ast: 6fd3b11431e3e71f2b628bc9c64cb51d04c77df08d7584503b76b3dff7bc90cc
-    canonicalized_ast: c588d34fa9b1fce593f783a68cd3effff86f7be33dc08a5fd7656daa3a48f208
+    canonicalized_ast: a7a942a8a40f7cf8bfd79fdea0ed81fb6b56cfd9009b01b3d0225b427ef583cd
-    type_inferenced_ast: 7d2d688ad6f94b586fd60dab4dd072d66cfeadad9e61e3009e9d83bee93f2a42
+    type_inferenced_ast: d3cc0e19adac957e11d520bf727133bfcc85eef5f306373cb5057b840b1a41f6

tests/expectations/compiler/compiler/circuits/mut_variable.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ed8aa86dd6afe56565d936044fec2b6c290e84637d27b09d25935b4c35fc70ee
+    initial_ast: 48713617e0f06ade7b443ec779e646b0ff82e025f040c8a28bf2ea7eb37f3399
-    canonicalized_ast: ed8aa86dd6afe56565d936044fec2b6c290e84637d27b09d25935b4c35fc70ee
+    canonicalized_ast: 48713617e0f06ade7b443ec779e646b0ff82e025f040c8a28bf2ea7eb37f3399
-    type_inferenced_ast: 3d7bb92c36d453181318441e251d393fd5168de3c15441a744af9b5230420b0e
+    type_inferenced_ast: 68e4f8baf01d452f42d0765f2819783adb55000238d5d57304a314fb5cff3c22

tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a65aa4129ecc625f548f2eeaa411c3949f2f5b51db559842fe889b5a063981d9
+    initial_ast: 2f6262df5e4a39a662b85cff0985d297fa2628d56fc3c036b5beb31d683a8574
-    canonicalized_ast: 0fa4ca18f2103707d382cc926b3787ebee35d00a7e29692ecbb4158b87ddbb6e
+    canonicalized_ast: 4bb2ac425c192058af2f97684019d74959bc40abc0f886a741894a89cc8e8d4f
-    type_inferenced_ast: 57c4afa4a03a741af17435b4f10907bcf65ef9f17a55a50cc779aa24af39a2dd
+    type_inferenced_ast: 6c3c3d16ba595ab33902ece671d2460c3a25347e1e33e35ec82ff8622926afd2

tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 56a342fe09244cea63c7ed0cf0b641d7347978abfc28e4f19e60b38cc94087a2
+    initial_ast: 591aa0cc25f8c009c7df6425697003904e97e74c55f887c5ed3b27984fda4176
-    canonicalized_ast: a44d595304cf53de81e57ede4bf038dbcc641d45d3776bf6fb475a0d48673b29
+    canonicalized_ast: 7232353691a314166deb747de9046b05e507b581d35132479b01c6db41e72df6
-    type_inferenced_ast: 4eee3c5c2c191e3b9bd9acf8cf52836207712259f835ffa0ae9e63769fb4fb65
+    type_inferenced_ast: ae5cb090082e845a9a058a15de6345a672864bf2ad2061930922475cc2c3f8e1

tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0e091ebf70c2e190b09debae086753f0d032504419ae0bcf42836fa4963ce48e
+    initial_ast: f7e0f5bba37e3a25b8fdf655d2588054659ff212cade431c17bb548757a7781d
-    canonicalized_ast: 290e223dacaff5c99f401c452e213c35acbba0452b24d9d590eb7c77f641cff5
+    canonicalized_ast: 8425ce431117fc5d543a83ddde9e0cf946e0435146ede09096906a0f1fe9eff2
-    type_inferenced_ast: 5849fd77de59448ac443a392fc2124d2f5df4a896150f3175b7d0e3ba5d98354
+    type_inferenced_ast: da1985f44598222e3940c14fefed9ce269e43d474aaf15b622292cd63f3efe87

tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 691004b2affad4a5a06ad6e69ad3b8a279aee131b538d5f07b6a972e18bce22c
+    initial_ast: ab5c9ec7a0930713141b84e303355a1ddf69340f5222699c2192868e0e0dc8c4
-    canonicalized_ast: c38d5fefdb424c8bac4b7684f50112bf3bfe776060895a4f95d8fe657f237c8b
+    canonicalized_ast: 3442d75d2ced2e10abfde09306d9bf91046cecd295a5e48e66a1823abff28ffc
-    type_inferenced_ast: 481ef7f98947c543be02395a827f08b5e0117df951129584661a249b4c76d144
+    type_inferenced_ast: ace67f309b2535d71ec2b277b42569fa3f89e6bcb817e8b911f7a773c9c4186e

tests/expectations/compiler/compiler/circuits/self_member.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2b9656370d8c43247d8924222ec13e2f2ee988558b13b0e52e3b8fa0b9752115
+    initial_ast: 6b54a642c55d3a7991a063c5346797a4d7facf21533c8ec7b2e22eb9394caba0
-    canonicalized_ast: 2b9656370d8c43247d8924222ec13e2f2ee988558b13b0e52e3b8fa0b9752115
+    canonicalized_ast: 6b54a642c55d3a7991a063c5346797a4d7facf21533c8ec7b2e22eb9394caba0
-    type_inferenced_ast: 0096338c25c3f93d38e41ae493fcb53396d95b83c4d277b97cca7f7692f0fefe
+    type_inferenced_ast: 5b4b8ea9431aca05e19fcf8987c4f4c824c065e2ed6fc7198cd769b8829ee4f1

tests/expectations/compiler/compiler/console/assert.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dd4fe27f2213405f1261a5dd08619e96f2164c6984ce1efbc034ebeb0f8159f6
+    initial_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
-    canonicalized_ast: dd4fe27f2213405f1261a5dd08619e96f2164c6984ce1efbc034ebeb0f8159f6
+    canonicalized_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
-    type_inferenced_ast: 72c60ddc90e6db8f7e97f9881813ece3d45d333ca4aa5d64368565113c42522f
+    type_inferenced_ast: e60210b668a87ade79886bffd2ebc8ded95f47d12d5c8b67adfd896ea3a1009e

tests/expectations/compiler/compiler/console/conditional_assert.leo.out

@@ -16,6 +16,6 @@ outputs:
       - input_file: cond_2.in
         output:
           registers: {}
-    initial_ast: bf6d2879d4bd942a4ef5eef595f5770edb8f718eab43108bce52b5864c54cdf2
+    initial_ast: 4bafaebf2c6733478fdff48ba2aca4892da0874d88a8cde9a9ea7299939cfa92
-    canonicalized_ast: 0d7d8284630e9e3a72809d48b53cd178efe4cd5652ef37ecb01d366d0c21351e
+    canonicalized_ast: 036d49891c7d9eb0c713eb9eaf7a66321fdd32ff225fa1428f9a7184ebf3679e
-    type_inferenced_ast: 1cab3711be24468ea0c8291fc6ced605fc908220a52b6444c6b0fe00571d26a7
+    type_inferenced_ast: 3d13c527af96ec05f92678c2009047200736e8799fd29875ba371fd34d95ce5a

tests/expectations/compiler/compiler/console/error.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f65d7556d2d52b3e33bfd12a70350bc67ff21a55d470e8795700e7d3fad7d04d
+    initial_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
-    canonicalized_ast: f65d7556d2d52b3e33bfd12a70350bc67ff21a55d470e8795700e7d3fad7d04d
+    canonicalized_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
-    type_inferenced_ast: 7b5616a0e84f7a6b0acfdd98a770832382914b1d3d16cbdf33605beb207475b1
+    type_inferenced_ast: f45369f6227b5fed3322d1d28718bc84382c1312214b6fa0b315b3e02c66f48b

tests/expectations/compiler/compiler/console/log.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: affca079b67e0869881ba79627ffd7ccd27ea8d5f189403d8427ef98e1056bd7
+    initial_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
-    canonicalized_ast: affca079b67e0869881ba79627ffd7ccd27ea8d5f189403d8427ef98e1056bd7
+    canonicalized_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
-    type_inferenced_ast: 521fd1f1dbc9c68595e4bdbe1e9bad8e6c44710d145438fc35269e2f8c438df1
+    type_inferenced_ast: a5345a4bf0f979eef1166902ee0e70ba3635125f1793b0b0742162cc98f46681

tests/expectations/compiler/compiler/console/log_conditional.leo.out

@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a5bd96138155ee38f07e7b41608868d053f06bb3e938fd5a90303028a8996fdd
+    initial_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
-    canonicalized_ast: a5bd96138155ee38f07e7b41608868d053f06bb3e938fd5a90303028a8996fdd
+    canonicalized_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
-    type_inferenced_ast: ad95e7881e367efc029e79d2df541305add838367a6b03816c73aed641890740
+    type_inferenced_ast: 684c132f914cd9b2bbe55cc7fa868d9f4818a5951cefba287989d787c13c40d3

tests/expectations/compiler/compiler/console/log_input.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ac8959bcbddd11b5df0b91b4986970098c022785b78391ba7e55386bdab41571
+    initial_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
-    canonicalized_ast: ac8959bcbddd11b5df0b91b4986970098c022785b78391ba7e55386bdab41571
+    canonicalized_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
-    type_inferenced_ast: 427a709da8683a8ea6cc21c64d56d77d504b647600813f13c6d29586ee76f33d
+    type_inferenced_ast: 0b2d12419a1f32d70683f171ddaad7c5d683fe7975e2315cb6167dbcd16f382d

tests/expectations/compiler/compiler/console/log_parameter.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 84f235f5e82fd83c0d4ac44037b460ab8c4ee985e834f4cbb1cdf7ab0516bc8d
+    initial_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
-    canonicalized_ast: 84f235f5e82fd83c0d4ac44037b460ab8c4ee985e834f4cbb1cdf7ab0516bc8d
+    canonicalized_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
-    type_inferenced_ast: cab71b6db461a948e4ce6de5f49976a50619e84de81e22f26f73b38f30db0e57
+    type_inferenced_ast: 0af520b7cbdb4f67914880e62a5ba7ead23ee6c3f173d4573b0d306532f4bf03

tests/expectations/compiler/compiler/console/log_parameter_many.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8826a62285bb93b0aaacfda5ed2ae4cdef50948a7b2472700b72cfb328edc1dc
+    initial_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
-    canonicalized_ast: 8826a62285bb93b0aaacfda5ed2ae4cdef50948a7b2472700b72cfb328edc1dc
+    canonicalized_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
-    type_inferenced_ast: 0c40ac594ca6adf8cf625b3ac63d9d925975be323bf358ca55aaa4f3aa39aa46
+    type_inferenced_ast: a586b22d1a595440d7a0262c959ae1b668be2980d131c056ebc6536827606454

tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n     |\n     |"

tests/expectations/compiler/compiler/core/core_package_invalid.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n     |\n     |"

tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core.unstable'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core.unstable'\n    --> :0:0\n     |\n     |"

tests/expectations/compiler/compiler/definition/out_of_order.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9a3c1d44f1c7e23b08441e6b429e0aaf96b9091a85884a892e046b6213872adf
+    initial_ast: 61087d13f528efabd02f9993e0e5ff23051fa0de9e93a96ef8835f3a0457d87c
-    canonicalized_ast: 52166ba1dada6040b5bb273a3778a719751baf263f27da2ebb43e4fcaff1707e
+    canonicalized_ast: 36bde977c62949baf95dd50d0cfaadd1a4a926a2a4d7f55388b21beaefd5e43c
-    type_inferenced_ast: 8251d737314510e1f1d4d029dea6d3b529d64bd92714d006f1bfcb08539867f3
+    type_inferenced_ast: ab6c6ed97331a676348142fb242cf0f589468f893f97c3e4832f60d4736fc0ca

tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1ee4aa8742bab66bd1342ff64083c537ebd3cc0bd2a7c27274129696c04d5523
+    initial_ast: e1792bcb7fe5be2fdb8ca2abd21feb63c9aadbc367d2cba1750fff1b34b8d1b2
-    canonicalized_ast: 1bbf3438c4ab147d1fb3c76bdbe77fef1787c173376b8677485c30acf27561fb
+    canonicalized_ast: 9badf16677c761fbcb56ea79f0e67b46f8e12c3dc83a9c3fc35559cbc509ff88
-    type_inferenced_ast: 1b1ffd1f7a17e597fc1118606ddf872d363febf800e6d84dfaa7bacfdff63c61
+    type_inferenced_ast: 571f7723bd45c3e54c04038aa20707640282efe293ba23dfff65b1b318a3a173

tests/expectations/compiler/compiler/field/add.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 41ce88a99d310e57e8e58fed720ecd68fd372944aa309541fb75b5eda51a9f39
+    initial_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
-    canonicalized_ast: 41ce88a99d310e57e8e58fed720ecd68fd372944aa309541fb75b5eda51a9f39
+    canonicalized_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
-    type_inferenced_ast: 3047d9e127644a596e0836ebe715098c1bf7dedbd8a4cdbf3443ee91612298f6
+    type_inferenced_ast: af10005d855a2c6277340bd98a1a8893dbc90827eda252f9956e25b131a4dc6c

tests/expectations/compiler/compiler/field/div.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: ebb9776abaaf0b45d2c83013db7decbf4c71e9844be91a435d9bca6f0956465e
+    initial_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
-    canonicalized_ast: ebb9776abaaf0b45d2c83013db7decbf4c71e9844be91a435d9bca6f0956465e
+    canonicalized_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
-    type_inferenced_ast: 1aab2a3f766a4216073d86ec4c3dd1444459863c16e2db69890f9d7662eea006
+    type_inferenced_ast: 3c72b501b373df6d34d8c9a20c7d73e1e1e6f61cbaa3713b3324c157036f866e

tests/expectations/compiler/compiler/field/eq.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: a15fced3bedb13d55187bb839abbb5db8ea20e23bb8ceb4e24ee8636a43c22da
+    initial_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
-    canonicalized_ast: a15fced3bedb13d55187bb839abbb5db8ea20e23bb8ceb4e24ee8636a43c22da
+    canonicalized_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
-    type_inferenced_ast: 083d96a04074a68d7cbaba40c460e743e6ff6fcd37994730914d4a1345f524d9
+    type_inferenced_ast: 786b1a7c74542185e90e6690d6034487b19b1ba7047e3985cc9b85824c98b26f

tests/expectations/compiler/compiler/field/field.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: ac26e1ea6dcfa33791349731ab9cf1481764a0b365feffb261f96f24f92b5534
+    initial_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
-    canonicalized_ast: ac26e1ea6dcfa33791349731ab9cf1481764a0b365feffb261f96f24f92b5534
+    canonicalized_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
-    type_inferenced_ast: e4e48995001316d9851878018c999cd5babec0c5396d0eb0136f3e0a7469a4c9
+    type_inferenced_ast: b63f0f712a535d3f14f8c1a443568c3af9f140440e6b115de23e463a1728debf

tests/expectations/compiler/compiler/field/mul.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "false"
-    initial_ast: b0f186baff2a170ec1cc2400380ecf7fc7e9b5ce16765eadc5bde530a9d14a85
+    initial_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
-    canonicalized_ast: b0f186baff2a170ec1cc2400380ecf7fc7e9b5ce16765eadc5bde530a9d14a85
+    canonicalized_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
-    type_inferenced_ast: 5bf8ce5327801fc84fe90818827c733f0be2794e2feeaa8dee27ad5e1d9a3cdf
+    type_inferenced_ast: 813b8fb791cf91468b34722fb4cb8b2a0005cddb135eee6e1688675104794ab5

tests/expectations/compiler/compiler/field/negate.leo.out

@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: c6944601ce98355c6050683c7efeccca59566b281dc9e33d364ea5eaeeede8aa
+    initial_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
-    canonicalized_ast: c6944601ce98355c6050683c7efeccca59566b281dc9e33d364ea5eaeeede8aa
+    canonicalized_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
-    type_inferenced_ast: a807a5420a071df5a2c1281cf44cf98bd32a3066ad35c1ebd2cf585405e7e044
+    type_inferenced_ast: 336ecb6f4ead5395c4c5ad52fa5eb29993aa7db2ab65749acdb39c068961e64b

tests/expectations/compiler/compiler/function/array_input.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 50cc91a73be6ea74dab65fa196daf6931f84a56896a4a8e398aedba47f4cf005
+    initial_ast: f57c7199a6f40d6f898133390fc69cc7ac17c6522adc2653eba92635eddad340
-    canonicalized_ast: e2421a0ffcef3eb9f57640168d92313c9b6b95b5dcf55ccdee6807327b418eed
+    canonicalized_ast: 6402aa395f7030e58a146ed91755220ee495693e59b9b544f7db59e190b3ef17
-    type_inferenced_ast: 4b0f0827da9e66d8acdc11415820a06dc4fd2ada3ab3b29f1553bfde827565da
+    type_inferenced_ast: 94a3c2e3632d3ab5fd7af3ea51b9f8bedb82f00762686a10764d103b35787261

tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2001b1f9372ef49090e86f4a1dcaac8e2cc0492f5eaa3650cb9823b809c17e0
+    initial_ast: 8e231f37db8feb5d0490f9ee8ad1b4844327cc213238b849b9250dcd416c578c
-    canonicalized_ast: 57c23bdefab42e9a131f70d784df69646dfc4e0c2963981e6bc52223c81db63b
+    canonicalized_ast: 63c46bc9757274e52cecf05bdab4b2adaa2177ccc3ced0a8e6a6e0d3ec73038d
-    type_inferenced_ast: edcb6ee24685782a3c1fb8fd0eb98ad095288bd7afa87ae4349267a6eb65c7c1
+    type_inferenced_ast: 958cf68742c142d071df29899bb8b81f66e9c5d325325b71d94543762c804001

tests/expectations/compiler/compiler/function/conditional_return.leo.out

@@ -16,6 +16,6 @@ outputs:
             a:
               type: u32
               value: "4"
-    initial_ast: f26cde6c2a1b4b3a97821353bdbfdc9d56ef657a478e9a25624f66c564cc5eee
+    initial_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
-    canonicalized_ast: f26cde6c2a1b4b3a97821353bdbfdc9d56ef657a478e9a25624f66c564cc5eee
+    canonicalized_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
-    type_inferenced_ast: 84a23e71e8a617ff4446a4183fba5fa8fdb410f876ee6ca97c93cc26085c0884
+    type_inferenced_ast: 74c63a94510e5e000a5b6fb213f34c89bc1d35c69a549eea3b5aad627dd7c43a

tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n|\n   9 | ...\n|\n  10 | }\n     | ^"
+  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n   9 |      ...\n  10 | }\n     | ^"

tests/expectations/compiler/compiler/function/empty.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 25dcbe87acec22191a60e99bb9abff5d6502b398b2cff423565af816f1e13544
+    initial_ast: 2dd3bd6fa202a0356e48f757a1e745888aafab1c89721e272eb65534f658a8ef
-    canonicalized_ast: c6623025e0169b5548d537b9d6bef8fa8aa1d3aa5bf7ede5f90fbf159b511e34
+    canonicalized_ast: 689cc7ed7957d488050014971ea55b69970e43a8863fe36176f95224fa601323
-    type_inferenced_ast: 00a616f64800ec97e30df10fedef4993adc14368cad2e4be757e46ff6052d055
+    type_inferenced_ast: c8b358ff7af51a9f0e11db6ceb465ff36142bbc14159a7aaeefba55ce9c18a69

tests/expectations/compiler/compiler/function/iteration.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3f4e82eda9825e87ed21e40d62213aedaf757134c41a204dad8e81e89341db52
+    initial_ast: bce6dc51b76cc0f285be76d5c35f28dc1121a2b814e60e0094c858d58e83272e
-    canonicalized_ast: 509f630dfca7c3b33cad307f42342005c1c0519fdf5ab444dc147ddbfe35a3f2
+    canonicalized_ast: ac7e9987e1a6c30c0ee21665fa824e201b58e186b2d662b6f3817eab3ac3dfa9
-    type_inferenced_ast: 6358553eed92aa8c1ae4fd2a8712d95bc198a40b96fa6e6ff8ada4a9d98fb453
+    type_inferenced_ast: bd8524c62243e04203ac7b1f1ce7f22c7969c8511463eef2d63ae55ea5d21b69

tests/expectations/compiler/compiler/function/iteration_repeated.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4ae2929cc0c72fd75f38a87f49b83e37b29e2131f2cf15db7e55a4da5b007f10
+    initial_ast: e00d6916d7234d7ed9f405c02e281301bc5482800ca70c5b6d3f72e84ea22f58
-    canonicalized_ast: 1a0c36ef1c6108a7a84dc7c43d012d0e9f0bcf3ae15634128a98ea04c4f335ed
+    canonicalized_ast: bfba19b1a25966ba895c0b318845f4e0e2bf32eb98cba02c1a332fb6f211c532
-    type_inferenced_ast: 3c270a3472eb019d1426c8c1a8e184f6b4dda7c88bb8d136cb59bd94120d1ca8
+    type_inferenced_ast: f6c7f08d785a0dc516a4ffd1165e63b54b7e04c6e9d4b22c12ffd3c282562d0b

tests/expectations/compiler/compiler/function/multiple_returns.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c4d98a91631a78bb154e70846486e0ff12472f7cdf0dba1ff706fadafdcc4424
+    initial_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
-    canonicalized_ast: c4d98a91631a78bb154e70846486e0ff12472f7cdf0dba1ff706fadafdcc4424
+    canonicalized_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
-    type_inferenced_ast: 0eb7c97884a7b1cd58e40cd51d0707892654c1083819ba1653767876b8b6aa27
+    type_inferenced_ast: 88fbd7fea3a02a091f2f00347f1e862710a621898f80d8acc91d4041e3adc9f2

tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:4:5\n     |\n   4 |     if true {\n|\n   5 | ...\n|\n   6 |     }\n     |     ^"
+  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:4:5\n     |\n   4 |     if true {\n   5 |          ...\n   6 |     }\n     |     ^"

tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out

@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n|\n   4 | ...\n|\n   5 | }\n|\n   6 | \n|\n   7 | \n|\n   8 | \n|\n   9 | \n|\n  10 | \n     | ^"
+  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n   4 |      ...\n   5 |      ...\n   6 |      ...\n   7 |      ...\n   8 |      ...\n   9 |      ...\n  10 |      ...\n  11 | }\n     | ^"

tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out

@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: c571bc844b073f4a4c66ab9b0bdcee6745271a80298dc5d871e1036d13213187
+    initial_ast: f982480cc10a58594b1ed75be2d2dcd29ed874fa666497f2c14b58c338a4443f
-    canonicalized_ast: c571bc844b073f4a4c66ab9b0bdcee6745271a80298dc5d871e1036d13213187
+    canonicalized_ast: f982480cc10a58594b1ed75be2d2dcd29ed874fa666497f2c14b58c338a4443f
-    type_inferenced_ast: 89a7dcde1fb148fed4f5bcc6412b4275a1c2b0009e7960b7df8db0217da14e5e
+    type_inferenced_ast: f70e1d694f99f56777ac863e764615c6bc496ebb4f476c2faf8356e9246f4d24

tests/expectations/compiler/compiler/function/newlines.leo.out

@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "0"
-    initial_ast: 1cd1942f945063ca28425deb842703edaf7c9c41101a06b0b8471ef47fd3ae88
+    initial_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
-    canonicalized_ast: 1cd1942f945063ca28425deb842703edaf7c9c41101a06b0b8471ef47fd3ae88
+    canonicalized_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
-    type_inferenced_ast: 865cad30a2aeae6615efb2f4dbaed8c7fd6c6b0a5adc0d0050ee4617ec393866
+    type_inferenced_ast: 80d4650ca4846bc858164dc5d39d8e9333046ed58a655a0c739a5fb2b3018b90

tests/expectations/compiler/compiler/function/repeated.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e0ed84f76e2a79b3b784ed989db10d1893968fd0ae07eb3b28eafb45afa3762f
+    initial_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
-    canonicalized_ast: e0ed84f76e2a79b3b784ed989db10d1893968fd0ae07eb3b28eafb45afa3762f
+    canonicalized_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
-    type_inferenced_ast: c9f98a09d0a48fbbaaf43032a7050ea4e01e90595b321ec70b7fdabb4a6322dd
+    type_inferenced_ast: 1383b0311db00a303f411f023eb3d87c8c29b95776bcf09d8b9622ab3af789f6

tests/expectations/compiler/compiler/function/return.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7e9cf69f95600d12d299b37a52a2ba19e1194da8349d2aa4b9d082a0c90c36c8
+    initial_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
-    canonicalized_ast: 7e9cf69f95600d12d299b37a52a2ba19e1194da8349d2aa4b9d082a0c90c36c8
+    canonicalized_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
-    type_inferenced_ast: 21ea10f8ab44c8c521ac7216555775d7c8e23439e21ae25a4fe142a39df891fa
+    type_inferenced_ast: fb793f59586351711471dd75136a8c380c154690feccf9cf7174cef82591e6f7

tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2cb5bb420cacd6ac0012ed38f3081a124842fe7b4ccc37a21a009e2353049b2b
+    initial_ast: 0d5b759de15703ed61e503ca8d70f2f8423e29dc817d2612ca384fb29d204f15
-    canonicalized_ast: eeb7d6efb45cfffe4d11bf2235fac0c5ad44693aad4935053ad3d964af342d70
+    canonicalized_ast: 9698b926f7b85ac3fbb6183a37a08b4681eeea8ccae65aeaa66e691f62487d0b
-    type_inferenced_ast: 643e5e8709c1d8c473a42906fa549d893839506cbc138313d6e3dbdf1299b8a0
+    type_inferenced_ast: 3bf56872a33b1c61d71dd0141acb87050cef59915ea7dbf6559f15345c9d6736

tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6625f9dae21c9ee661f29e7b22c466f9ed4d7bcd9571e4e8b4d451fb052d4bfa
+    initial_ast: 3c4dacd555f9a91ffe40ddc302bb764ef757462cfad20f6461707b8bf6005196
-    canonicalized_ast: 15f43abb1cab938d6c93efcfb37774cb40a489aa33f8d40a7bdeaa2e08236876
+    canonicalized_ast: 5913a06c38457b98f8aac60740450faf1ebc25760ccb8d6cb86edefd0c217cc6
-    type_inferenced_ast: 22bdd3e29298099053079c14ecf002ffd51bb60c8fceca2441b7cf95058c5d02
+    type_inferenced_ast: 697c8ad6d1d6ecff77818d3ee92733cd9210c2d151ec8b15093e54ef21cd3b64

tests/expectations/compiler/compiler/function/return_tuple.leo.out

@@ -19,6 +19,6 @@ outputs:
             r1:
               type: u32
               value: "103"
-    initial_ast: 8f5a723bcf45dfefb932723af97f4aeccfdd8e14ede2011a07b6499c517f87e0
+    initial_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
-    canonicalized_ast: 8f5a723bcf45dfefb932723af97f4aeccfdd8e14ede2011a07b6499c517f87e0
+    canonicalized_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
-    type_inferenced_ast: f10f80d86887b764f5177202c36f538eaa7d255216be58fda9804f3bfb370251
+    type_inferenced_ast: 81ba2fb5f7c788306b516c750361f7984a1a04ef35d72a47ed8ea0c3acf3cb7f

tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out

@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "1"
-    initial_ast: 3313971add9f81c5da70cdd66fc134e8bab9437d8ca7a50f41721250d5fa0225
+    initial_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
-    canonicalized_ast: 3313971add9f81c5da70cdd66fc134e8bab9437d8ca7a50f41721250d5fa0225
+    canonicalized_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
-    type_inferenced_ast: 0a9387bf11f5c88d719463b8b0c3fa1b935a83ef3a382b575de21d3aafa955e6
+    type_inferenced_ast: bfefba5d47f28d8939c2f296d1a52559fbcefc88d75cedde390233f4d4db1e98

tests/expectations/compiler/compiler/function/value_unchanged.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 65b078bf25edb054039cb244fbef0316a865274d6c44a2ceea72d3aefa90626b
+    initial_ast: d3d54367b0fcc1b5a01185aec3cfe669941bd0a1b6f4218a73a1928f9dea5dbc
-    canonicalized_ast: 7ec00e4ae76e7ed97f272ef523a462662bb6032cfafeeb9e8f11c266f45835f5
+    canonicalized_ast: eb82bb09e23368391dca2472a6838bb7f9d704a9bb1ca53169550fafb79b6eed
-    type_inferenced_ast: 77195eeb9765908133dec5cf01abd1ad744a5a61139d808f91218706487f9fdd
+    type_inferenced_ast: eeae07f387addad134aca399c105f020006f79fa64e4d1395abd2e27d42e0ae8

tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 9347e76e49daae38da61524f6c0ec6c2e4b0384a01c8c7773c6dae9aa75e20dd
+    initial_ast: 97024a9c26e890afe8f4dc64b727a72e837f46b27ff56cddc1231c29671dc2b4
-    canonicalized_ast: c9e8250d4cfe44fcb7f3e836aae5753b9a87a58bf20d13c4d712a6181e486f90
+    canonicalized_ast: 8674af05f953dfda5eb360e367447912e9d0ec5abf513eaba14444bd66bd9cae
-    type_inferenced_ast: 3b8b47a915814590af43fc237a72bfb976ead7485b2b2a901571cbb29be55976
+    type_inferenced_ast: 33017f3824095dcb4431f73db16a3fe1e845d30d7a6366182b247a23445eb26d

tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out

@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3f359dbec82cacf3b542a67b0e90fa59ae410b9c2eaa2f2e4ce71746176c6049
+    initial_ast: 3f1b8c03ff4676240e6a1deaf46094a95f87b0c5375b7af09b9fd796ee9d7639
-    canonicalized_ast: 2c036d46e9e8ee9278fdce6c0b11297e1e74f36c320f94eec6c3bc85025a19ef
+    canonicalized_ast: d677dff4951f6b48675b4b38c3725b21914619c5af9494510f0ea9fdb50bec74
-    type_inferenced_ast: e21be9e68e24ccefe83cd5a8ea330fe9931b3fa8b2a9c4298d798c2429c78907
+    type_inferenced_ast: e053cf66b0a4b1ed0208c18d45566d8cd6277bbcb56f3547a28ef095deb25153