type aliases

2024-11-24 02:42:21 +03:00 · 2021-08-19 06:04:44 -07:00 · 2021-08-19 06:04:44 -07:00 · e90228b295
commit e90228b295
parent 4fc6c5f586
365 changed files with 1431 additions and 1294 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -97,7 +97,10 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all --features ci_skip
+          args: --all
+      
+      - name: Install sccache Ubuntu
+        if: matrix.os == 'ubuntu-latest'

      - name: Print sccache stats
        run: sccache --show-stats
@ -161,7 +164,7 @@ jobs:
        run: |
          SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) \
          MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) \
-          cargo test --all --features ci_skip
+          cargo test --all

      - name: Print sccache stats
        run: sccache --show-stats
@ -297,7 +300,7 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --all --features ci_skip
+          args: --all
        env:
          CARGO_INCREMENTAL: "0"

--- a/asg/src/scope.rs
+++ b/asg/src/scope.rs
@ -179,7 +179,7 @@ impl<'a> Scope<'a> {
                    .collect::<Result<Vec<_>>>()?,
            ),
            SelfType => return Err(AsgError::unexpected_big_self(span).into()),
-            Circuit(name) => Type::Circuit(
+            CircuitOrAlias(name) => Type::Circuit(
                self.resolve_circuit(&name.name)
                    .ok_or_else(|| AsgError::unresolved_circuit(&name.name, &name.span))?,
            ),
--- a/asg/src/type_.rs
+++ b/asg/src/type_.rs
@ -212,7 +212,7 @@ impl<'a> Into<leo_ast::Type> for &Type<'a> {
                }]),
            ),
            Tuple(subtypes) => leo_ast::Type::Tuple(subtypes.iter().map(Into::into).collect()),
-            Circuit(circuit) => leo_ast::Type::Circuit(circuit.name.borrow().clone()),
+            Circuit(circuit) => leo_ast::Type::CircuitOrAlias(circuit.name.borrow().clone()),
        }
    }
 }
--- a/ast-passes/src/canonicalization/canonicalizer.rs
+++ b/ast-passes/src/canonicalization/canonicalizer.rs
@ -17,6 +17,8 @@
 use leo_ast::*;
 use leo_errors::{AstError, Result, Span};

+use indexmap::IndexMap;
+
 /// Replace Self when it is in a enclosing circuit type.
 /// Error when Self is outside an enclosing circuit type.
 /// Tuple array types and expressions expand to nested arrays.
@ -27,26 +29,26 @@ pub struct Canonicalizer {
    // If we are in a circuit keep track of the circuit name.
    circuit_name: Option<Identifier>,
    in_circuit: bool,
-}
-
-impl Default for Canonicalizer {
-    fn default() -> Self {
-        Self {
-            circuit_name: None,
-            in_circuit: false,
-        }
-    }
+    alias_lookup: Box<dyn Fn(String) -> Option<(Type, Span)>>,
 }

 impl AstPass for Canonicalizer {
    fn do_pass(ast: Program) -> Result<Ast> {
        Ok(Ast::new(
-            ReconstructingDirector::new(Self::default()).reduce_program(&ast)?,
+            ReconstructingDirector::new(Self::new(ast.aliases.clone())).reduce_program(&ast)?,
        ))
    }
 }

 impl Canonicalizer {
+    pub fn new(aliases: IndexMap<String, (Type, Span)>) -> Self {
+        Self {
+            circuit_name: None,
+            in_circuit: false,
+            alias_lookup: Box::new(move |alias: String| -> Option<(Type, Span)> { aliases.get(&alias).cloned() }),
+        }
+    }
+
    pub fn canonicalize_accesses(
        &mut self,
        start: Expression,
@ -115,7 +117,7 @@ impl Canonicalizer {
    fn canonicalize_self_type(&self, type_option: Option<&Type>) -> Option<Type> {
        match type_option {
            Some(type_) => match type_ {
-                Type::SelfType => Some(Type::Circuit(self.circuit_name.as_ref().unwrap().clone())),
+                Type::SelfType => Some(Type::CircuitOrAlias(self.circuit_name.as_ref().unwrap().clone())),
                Type::Array(type_, dimensions) => Some(Type::Array(
                    Box::new(self.canonicalize_self_type(Some(type_)).unwrap()),
                    dimensions.clone(),
@ -477,7 +479,7 @@ impl ReconstructingReducer for Canonicalizer {
        self.in_circuit = !self.in_circuit;
    }

-    fn reduce_type(&mut self, _type_: &Type, new: Type, span: &Span) -> Result<Type> {
+    fn reduce_type(&mut self, type_: &Type, new: Type, span: &Span) -> Result<Type> {
        match new {
            Type::Array(type_, mut dimensions) => {
                if dimensions.is_zero() {
@ -498,6 +500,13 @@ impl ReconstructingReducer for Canonicalizer {

                Ok(array)
            }
+            Type::CircuitOrAlias(identifier) => {
+                if let Some(alias_type) = (self.alias_lookup)(identifier.name.to_string()) {
+                    return self.reduce_type(type_, alias_type.0, &alias_type.1);
+                }
+
+                Ok(Type::CircuitOrAlias(identifier))
+            }
            Type::SelfType if !self.in_circuit => Err(AstError::big_self_outside_of_circuit(span).into()),
            _ => Ok(new.clone()),
        }
--- a/ast-passes/src/import_resolution/importer.rs
+++ b/ast-passes/src/import_resolution/importer.rs
@ -125,6 +125,7 @@ where
        expected_input: Vec<FunctionInput>,
        import_statements: Vec<ImportStatement>,
        empty_imports: IndexMap<String, Program>,
+        mut aliases: IndexMap<String, (Type, Span)>,
        mut circuits: IndexMap<String, Circuit>,
        mut functions: IndexMap<String, Function>,
        mut global_consts: IndexMap<String, DefinitionStatement>,
@ -170,12 +171,15 @@ where

            match symbol {
                ImportSymbol::All => {
+                    aliases.extend(resolved_package.aliases.clone().into_iter());
                    functions.extend(resolved_package.functions.clone().into_iter());
                    circuits.extend(resolved_package.circuits.clone().into_iter());
                    global_consts.extend(resolved_package.global_consts.clone().into_iter());
                }
                ImportSymbol::Direct(name) => {
-                    if let Some(function) = resolved_package.functions.get(&name) {
+                    if let Some(alias) = resolved_package.aliases.get(&name) {
+                        aliases.insert(name.clone(), alias.clone());
+                    } else if let Some(function) = resolved_package.functions.get(&name) {
                        functions.insert(name.clone(), function.clone());
                    } else if let Some(circuit) = resolved_package.circuits.get(&name) {
                        circuits.insert(name.clone(), circuit.clone());
@ -186,7 +190,9 @@ where
                    }
                }
                ImportSymbol::Alias(name, alias) => {
-                    if let Some(function) = resolved_package.functions.get(&name) {
+                    if let Some(type_alias) = resolved_package.aliases.get(&name) {
+                        aliases.insert(alias.clone(), type_alias.clone());
+                    } else if let Some(function) = resolved_package.functions.get(&name) {
                        functions.insert(alias.clone(), function.clone());
                    } else if let Some(circuit) = resolved_package.circuits.get(&name) {
                        circuits.insert(alias.clone(), circuit.clone());
@ -207,6 +213,7 @@ where
                .into_iter()
                .map(|(package, program)| (package.join("."), program))
                .collect(),
+            aliases,
            circuits,
            functions,
            global_consts,
--- a/ast/src/program.rs
+++ b/ast/src/program.rs
@ -17,7 +17,9 @@
 //! A Leo program consists of import, circuit, and function definitions.
 //! Each defined type consists of ast statements and expressions.

-use crate::{Circuit, DefinitionStatement, Function, FunctionInput, ImportStatement};
+use crate::{Circuit, DefinitionStatement, Function, FunctionInput, ImportStatement, Type};
+
+use leo_errors::Span;

 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
@ -30,6 +32,7 @@ pub struct Program {
    pub expected_input: Vec<FunctionInput>,
    pub import_statements: Vec<ImportStatement>,
    pub imports: IndexMap<String, Program>,
+    pub aliases: IndexMap<String, (Type, Span)>,
    pub circuits: IndexMap<String, Circuit>,
    pub global_consts: IndexMap<String, DefinitionStatement>,
    pub functions: IndexMap<String, Function>,
@ -48,6 +51,11 @@ impl fmt::Display for Program {
            writeln!(f,)?;
        }
        writeln!(f,)?;
+        for alias in self.aliases.iter() {
+            write!(f, "({}, {})", alias.0, alias.1 .0)?;
+            writeln!(f,)?;
+        }
+        writeln!(f,)?;
        for (_, import) in self.imports.iter() {
            import.fmt(f)?;
            writeln!(f,)?;
@ -73,6 +81,7 @@ impl Program {
            expected_input: vec![],
            import_statements: vec![],
            imports: IndexMap::new(),
+            aliases: IndexMap::new(),
            circuits: IndexMap::new(),
            global_consts: IndexMap::new(),
            functions: IndexMap::new(),
--- a/ast/src/reducer/reconstructing_director.rs
+++ b/ast/src/reducer/reconstructing_director.rs
@ -41,7 +41,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {

                Type::Tuple(reduced_types)
            }
-            Type::Circuit(identifier) => Type::Circuit(self.reduce_identifier(identifier)?),
+            Type::CircuitOrAlias(identifier) => Type::CircuitOrAlias(self.reduce_identifier(identifier)?),
            _ => type_.clone(),
        };

@ -426,6 +426,12 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
            imports.insert(ident, import);
        }

+        let mut aliases = IndexMap::new();
+        for (name, (type_, span)) in program.aliases.iter() {
+            let type_ = self.reduce_type(type_, span)?;
+            aliases.insert(name.clone(), (type_, span.clone()));
+        }
+
        let mut circuits = IndexMap::new();
        self.reducer.swap_in_circuit();
        for (name, circuit) in program.circuits.iter() {
@ -448,6 +454,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
            inputs,
            import_statements,
            imports,
+            aliases,
            circuits,
            functions,
            global_consts,
--- a/ast/src/reducer/reconstructing_reducer.rs
+++ b/ast/src/reducer/reconstructing_reducer.rs
@ -382,6 +382,7 @@ pub trait ReconstructingReducer {
        expected_input: Vec<FunctionInput>,
        import_statements: Vec<ImportStatement>,
        imports: IndexMap<String, Program>,
+        aliases: IndexMap<String, (Type, Span)>,
        circuits: IndexMap<String, Circuit>,
        functions: IndexMap<String, Function>,
        global_consts: IndexMap<String, DefinitionStatement>,
@ -391,6 +392,7 @@ pub trait ReconstructingReducer {
            expected_input,
            import_statements,
            imports,
+            aliases,
            circuits,
            functions,
            global_consts,
--- a/ast/src/types/alias.rs
+++ b/ast/src/types/alias.rs
@ -0,0 +1,32 @@
+// Copyright (C) 2019-2021 Aleo Systems Inc.
+// This file is part of the Leo library.
+
+// The Leo library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// The Leo library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::{Identifier, Type};
+
+use serde::{Deserialize, Serialize};
+use std::fmt;
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Alias {
+    pub name: Identifier,
+    pub represents: Box<Type>,
+}
+
+impl fmt::Display for Alias {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "alias {} == {}", self.name.name, self.represents)
+    }
+}
--- a/ast/src/types/mod.rs
+++ b/ast/src/types/mod.rs
@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.

+pub mod alias;
+pub use alias::*;
+
 pub mod integer_type;
 pub use integer_type::*;

--- a/ast/src/types/type_.rs
+++ b/ast/src/types/type_.rs
@ -36,7 +36,7 @@ pub enum Type {
    // Data type wrappers
    Array(Box<Type>, ArrayDimensions),
    Tuple(Vec<Type>),
-    Circuit(Identifier),
+    CircuitOrAlias(Identifier),
    SelfType,
 }

@ -52,7 +52,7 @@ impl Type {
    /// Returns `true` if the self `Type` is a `Circuit`.
    ///
    pub fn is_circuit(&self) -> bool {
-        matches!(self, Type::Circuit(_))
+        matches!(self, Type::CircuitOrAlias(_))
    }

    ///
@ -68,7 +68,7 @@ impl Type {
            (Type::Field, Type::Field) => true,
            (Type::Group, Type::Group) => true,
            (Type::IntegerType(left), Type::IntegerType(right)) => left.eq(right),
-            (Type::Circuit(left), Type::Circuit(right)) => left.eq(right),
+            (Type::CircuitOrAlias(left), Type::CircuitOrAlias(right)) => left.eq(right),
            (Type::SelfType, Type::SelfType) => true,
            (Type::Array(left_type, left_dim), Type::Array(right_type, right_dim)) => {
                // Convert array dimensions to owned.
@ -151,7 +151,7 @@ impl fmt::Display for Type {
            Type::Field => write!(f, "field"),
            Type::Group => write!(f, "group"),
            Type::IntegerType(ref integer_type) => write!(f, "{}", integer_type),
-            Type::Circuit(ref variable) => write!(f, "circuit {}", variable),
+            Type::CircuitOrAlias(ref variable) => write!(f, "circuit {}", variable),
            Type::SelfType => write!(f, "SelfType"),
            Type::Array(ref array, ref dimensions) => write!(f, "[{}; {}]", *array, dimensions),
            Type::Tuple(ref tuple) => {
--- a/compiler/src/phases/reducing_director.rs
+++ b/compiler/src/phases/reducing_director.rs
@ -644,6 +644,7 @@ impl<R: ReconstructingReducer, O: CombinerOptions> CombineAstAsgDirector<R, O> {
            ast.expected_input.clone(),
            ast.import_statements.clone(),
            imports,
+            ast.aliases.clone(),
            circuits,
            functions,
            global_consts,
--- a/errors/src/common/span.rs
+++ b/errors/src/common/span.rs
@ -78,6 +78,7 @@ impl Serialize for Span {
        state.serialize_field("line_stop", &self.line_stop)?;
        state.serialize_field("col_start", &self.col_start)?;
        state.serialize_field("col_stop", &self.col_stop)?;
+        // This is for testing purposes since the tests are run on a variety of OSes.
        if std::env::var("LEO_TESTFRAMEWORK")
            .unwrap_or_default()
            .trim()
--- a/grammar/abnf-grammar.txt
+++ b/grammar/abnf-grammar.txt
@ -395,6 +395,7 @@ keyword = %s"address"
        / %s"console"
        / %s"const"
        / %s"else"
+        / %s"false"
        / %s"field"
        / %s"for"
        / %s"function"
@ -415,6 +416,8 @@ keyword = %s"address"
        / %s"self"
        / %s"static"
        / %s"string"
+        / %s"true"
+        / %s"type"
        / %s"u8"
        / %s"u16"
        / %s"u32"
@ -1052,6 +1055,12 @@ package-path = "*"
             / package-name "." package-path
             / "(" package-path *( "," package-path ) [","] ")"

+; A type declaration consists of the `type` keyword
+; followed by an identifier and a type that the alias
+; would refer to.
+
+type-alias-declaration = %s"type" identifier "=" type ";"
+
 ; Finally, we define a file as a sequence of zero or more declarations.
 ; We allow constant declarations at the top level, for global constants.
 ; Currently variable declarations are disallowed at the top level.
@ -1060,6 +1069,7 @@ declaration = import-declaration
            / function-declaration
            / circuit-declaration
            / constant-declaration
+            / type-alias-declaration

 file = *declaration

--- a/parser/src/parser/file.rs
+++ b/parser/src/parser/file.rs
@ -16,7 +16,7 @@

 use tendril::format_tendril;

-use leo_errors::{ParserError, Result};
+use leo_errors::{ParserError, Result, Span};

 use crate::KEYWORD_TOKENS;

@ -28,6 +28,7 @@ impl ParserContext {
    ///
    pub fn parse_program(&mut self) -> Result<Program> {
        let mut import_statements = Vec::new();
+        let mut aliases = IndexMap::new();
        let mut circuits = IndexMap::new();
        let mut functions = IndexMap::new();
        let mut global_consts = IndexMap::new();
@ -60,6 +61,10 @@ impl ParserContext {
                    let (name, global_const) = self.parse_global_const_declaration()?;
                    global_consts.insert(name, global_const);
                }
+                Token::Type => {
+                    let (name, type_) = self.parse_type_alias()?;
+                    aliases.insert(name, type_);
+                }
                _ => {
                    return Err(ParserError::unexpected(
                        &token.token,
@ -85,6 +90,7 @@ impl ParserContext {
            expected_input: Vec::new(),
            import_statements,
            imports: IndexMap::new(),
+            aliases,
            circuits,
            functions,
            global_consts,
@ -518,4 +524,18 @@ impl ParserContext {

        Ok((variable_names, statement))
    }
+
+    ///
+    /// Returns an [`(String, (Type, Span))`] AST node if the next tokens represent a global
+    /// const definition statement and assignment.
+    ///
+    pub fn parse_type_alias(&mut self) -> Result<(String, (Type, Span))> {
+        self.expect(Token::Type)?;
+        let name = self.expect_ident()?;
+        self.expect(Token::Assign)?;
+        let type_ = self.parse_type()?;
+        self.expect(Token::Semicolon)?;
+
+        Ok((name.name.to_string(), type_))
+    }
 }
--- a/parser/src/parser/type_.rs
+++ b/parser/src/parser/type_.rs
@ -89,7 +89,7 @@ impl ParserContext {
            (Type::SelfType, token.span)
        } else if let Some(ident) = self.eat_identifier() {
            let span = ident.span.clone();
-            (Type::Circuit(ident), span)
+            (Type::CircuitOrAlias(ident), span)
        } else if let Some(token) = self.eat(Token::LeftParen) {
            let mut types = Vec::new();
            let end_span;
--- a/parser/src/tokenizer/lexer.rs
+++ b/parser/src/tokenizer/lexer.rs
@ -518,6 +518,7 @@ impl Token {
                    "static" => Token::Static,
                    "string" => Token::String,
                    "true" => Token::True,
+                    "type" => Token::Type,
                    "u8" => Token::U8,
                    "u16" => Token::U16,
                    "u32" => Token::U32,
--- a/parser/src/tokenizer/token.rs
+++ b/parser/src/tokenizer/token.rs
@ -138,6 +138,7 @@ pub enum Token {
    Return,
    Static,
    String,
+    Type,
    // Not yet in ABNF
    // BitAnd,
    // BitAndEq,
@ -193,6 +194,7 @@ pub const KEYWORD_TOKENS: &[Token] = &[
    Token::Static,
    Token::String,
    Token::True,
+    Token::Type,
    Token::U8,
    Token::U16,
    Token::U32,
@ -304,6 +306,7 @@ impl fmt::Display for Token {
            Return => write!(f, "return"),
            Static => write!(f, "static"),
            String => write!(f, "string"),
+            Type => write!(f, "type"),
            Eof => write!(f, ""),
            // BitAnd => write!(f, "&"),
            // BitAndEq => write!(f, "&="),
--- a/parser/tests/serialization/expected_leo_ast.json
+++ b/parser/tests/serialization/expected_leo_ast.json
@ -3,6 +3,7 @@
  "expected_input": [],
  "import_statements": [],
  "imports": {},
+  "aliases": {},
  "circuits": {},
  "global_consts": {},
  "functions": {
--- a/parser/tests/serialization/main.leo
+++ b/parser/tests/serialization/main.leo
@ -1,3 +1,3 @@
-function main() {
+function main() -> u8 {
    return 1u8 + 1u8;
 }
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@ -16,7 +16,7 @@ outputs:
            a:
              type: bool
              value: "true"
-    initial_ast: dd6696f7af59ea9d65791b1af75b6dc58c5ba99f1c719f5f34906d6a73c5cba5
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: dd6696f7af59ea9d65791b1af75b6dc58c5ba99f1c719f5f34906d6a73c5cba5
-    type_inferenced_ast: 5ee9a99acd4238728efff9b0f60ab81bba5b313ba3cf6698932e4c5a1927865e
+    initial_ast: d492cd0d2a37e95acfa5841c09d8c3238f6468087766de30d78081e63a31e109
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: d492cd0d2a37e95acfa5841c09d8c3238f6468087766de30d78081e63a31e109
+    type_inferenced_ast: b85a48e081e36b6e52c20147c403be350dcf3cff3505c021ff3465877e87fdff
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@ -22,7 +22,7 @@ outputs:
            a:
              type: bool
              value: "false"
-    initial_ast: 425bbc28260e7ebb4143822cc4828cdaaa07493634faa3c2f1052346632a190d
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 425bbc28260e7ebb4143822cc4828cdaaa07493634faa3c2f1052346632a190d
-    type_inferenced_ast: 5d42a0c55b1611d6edf2989e2d10b58a1e6f46c0e09f53b8d345794636b539e5
+    initial_ast: 7d74962f3929982b6671a5111305c4928834fc5643778e885919775de43710c4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 7d74962f3929982b6671a5111305c4928834fc5643778e885919775de43710c4
+    type_inferenced_ast: a22a737b4c99d462273185aef1ec0df45bba973cd3336d303a804bd9bdfd993e
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@ -16,7 +16,7 @@ outputs:
            a:
              type: bool
              value: "true"
-    initial_ast: ca4d18696964e09c6964460490272877a1664e20c049e18169e5060af041156b
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: ca4d18696964e09c6964460490272877a1664e20c049e18169e5060af041156b
-    type_inferenced_ast: b1642d44d9fa241c7383aa54dedfd2bfd5361b5b4691657218b180e078bb2fe3
+    initial_ast: 2fb135abb6706ca3bbad3bf778f3a563b039aaaacf02f08a10a4b33876c258c3
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 2fb135abb6706ca3bbad3bf778f3a563b039aaaacf02f08a10a4b33876c258c3
+    type_inferenced_ast: 1f35b3671bbe648800bc2019091b2f39bab1c5fa381e33955589bd2721e7ac8a
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@ -22,7 +22,7 @@ outputs:
            a:
              type: bool
              value: "false"
-    initial_ast: 084c6d9fdf020a1453e2f0b15d284516169179a5324cffe423d225e7159aad0e
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 084c6d9fdf020a1453e2f0b15d284516169179a5324cffe423d225e7159aad0e
-    type_inferenced_ast: 032f5fc386538716648152e534ed351cd5c2546c73886d98ace298e073a7876d
+    initial_ast: 1b960dbe8ab26f12c2bee3a31a2539e1a51ed4c32ba6ad91a37fcb40c90d774a
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 1b960dbe8ab26f12c2bee3a31a2539e1a51ed4c32ba6ad91a37fcb40c90d774a
+    type_inferenced_ast: 1c0197b5a44656925345eae03e3989cef88ba31bb3f466d250b44d66c6a1163f
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@ -16,7 +16,7 @@ outputs:
            out:
              type: bool
              value: "true"
-    initial_ast: bbdfca22b5ee00cd0a715e7ddd0e342dd8c4ec34446f78d486b251964caef71b
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 4fb51e3d1b31053d9b11a161e56effe5d3e3f90892e32d7fae5e7d7e6c3b474a
-    type_inferenced_ast: 3bc336b07606b1c9582151cc4a8ddd93ff8c6ac39014eb892abba67692341894
+    initial_ast: 989d9de839e0e74a27333a90066c5d7b1e1bd404a41e7f9e49a691360fb4d8dc
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 0c65e90065d4363e1a51b3b7f3ec1e94281958fdbd76aa47b42ae678a2bf5042
+    type_inferenced_ast: 3138d69d125bfe3f0eaaa85d52ffa5934a750274a4e8f031b4945f9d0d98c807
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@ -22,7 +22,7 @@ outputs:
            x:
              type: bool
              value: "false"
-    initial_ast: 53ceb9637c6339891bf3b58f9b9f06a5bd83b1f7c4312e21b8437c44f7acb6a2
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 137647e5acfe5fef8e3c1995e58527802db3667399f0cc96bcece3564475e695
-    type_inferenced_ast: 4b58dfe4387b31dd55b70bc6b69768eb05bf321465948e5748ad10dc327d00a1
+    initial_ast: 6b674857eb55b26f41b867723574b0784057ba6dd8f95c7438c51ea93e73dec4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 69bf827f4094c87a47d4cb172a0e25e7392a18e32da033a690b149210cd77a15
+    type_inferenced_ast: 00a6373a605c5a0566f4f88a59a8bcc636e6632abf60dfa9b889e735c3b41b61
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@ -22,7 +22,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: e4367228e0cd49bc53aefbff05f472ca6d0561cbc67b1f20bfeb3bd8ea35a690
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 52d523284690f479c02ad15c3b0ebc978fa0d7d1988180ebabe7d695888cee47
-    type_inferenced_ast: cc5a783252ab74df46a176bdcbf56cd4a20688a1de24d4851d7c66b1a9b460a6
+    initial_ast: 680250e13fa265cc2131fb2b54bcccba0714728058d429caa88a29ac350b61d0
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 7c5b12eeb132c65757f301fc83107af5b0436ef3579c0d5fd4a3c594292f617b
+    type_inferenced_ast: be6d04f8cd8d286a2b8723eceb397292b89faee3c912278bede0e2c630ceb1ee
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: b21bd2c74d5e897df1ca9454ac04360ee2712aefad1baaccd664f02fc421cd77
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c72df790ad239fd934edf6842ea6cabc9b24a469a6b5e0c1a3efc85e2dd83602
-    type_inferenced_ast: caac141461cd4238b20ec214f269870f8d0a09156208b4aa67ed2cbca476519f
+    initial_ast: af8a0babe4fb6049ba8da55fb87056009c554565f211262164045229e4cfe4c4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 3efc51fc953d0c6d3480250eebc4002ac77aab22bed6715950fb5a86b2acfbdf
+    type_inferenced_ast: cbbdf19b20f72a87c3e35fc86771404366d45750d8774362813eea54dca36d88
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 53ceb9637c6339891bf3b58f9b9f06a5bd83b1f7c4312e21b8437c44f7acb6a2
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 137647e5acfe5fef8e3c1995e58527802db3667399f0cc96bcece3564475e695
-    type_inferenced_ast: 4b58dfe4387b31dd55b70bc6b69768eb05bf321465948e5748ad10dc327d00a1
+    initial_ast: 6b674857eb55b26f41b867723574b0784057ba6dd8f95c7438c51ea93e73dec4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 69bf827f4094c87a47d4cb172a0e25e7392a18e32da033a690b149210cd77a15
+    type_inferenced_ast: 00a6373a605c5a0566f4f88a59a8bcc636e6632abf60dfa9b889e735c3b41b61
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 236c915aff81b43c7dd36a98970e2336d4c2221f6844619b631f14ec7d62e003
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 6093d8333e534dd60b7cd275acb53080fc903db82fb224325518f4def869d19b
-    type_inferenced_ast: b82cc536ebce65be69c200b1155d0def9eaccb6ce9c60208c33ca17db9027156
+    initial_ast: 1fcce69ea40899b3aee6364831293911bab0c05f1ab7d2cb32f76c75bd8e137d
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 55ba114499167abcef669fae7c8f7a3ecf5079314fd8991f07ac6c9b33587e14
+    type_inferenced_ast: 8b0018337505d01dc46a1c2a4374ae56b0eb04bf9ba7f49bec20c7ec1dd3b5b2
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 5fe3eb54995ebcbac1bb6b20c860ad880859f79faf4be905e5a651fe98d933c4
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c9861e3c0ff9f9a05d329266861c2183e712a8f344f5161bdd640d755e602a01
-    type_inferenced_ast: 97ff0b786403ad5d12678954dda1fdf785b357015234c26cd24fc86dca2dbdd4
+    initial_ast: 4e0ced7473bd388bd7ae1af07db63dc65622420c845ea69980480ec23c83b908
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: d09993599a5173bcfc36ed35840f84b89dcd9a48132d3233a7848fc993679af8
+    type_inferenced_ast: be6990d86c00f0f5158e4bb8b9b20355a714612a6a9ac6dc0e9bca7b981ca87e
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 77dc240574ed87310aa2fc9203f6b1af92b18be84d3a22e87c4af68de5068791
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 6ebe763d7ff3781789f07f1038dbc5ba1ffbace7a3f75accd4d0213846e6a395
-    type_inferenced_ast: debe6716144af92597aee9719b8fed92c447707093a285bb274e0f02ddce55b8
+    initial_ast: 0193a42a8f03491f67d65da8c5be336997c400571692d0dd55c601ccb8cc57c4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 6816489a1129eb78fe392a67438f3c0d9a7a2a6f83075dae4c9cd437d5e3e89a
+    type_inferenced_ast: e18fde7d689c25cef43935985939ba4bf4210ce44df19fc93fbdf9ac855ee175
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@ -22,7 +22,7 @@ outputs:
            r:
              type: "[u8; 3]"
              value: "\"123\""
-    initial_ast: 7e1c0e290904318bcba5e521a1584f42f4f38747d30dec1352d36d6c6ac510b1
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 7e1c0e290904318bcba5e521a1584f42f4f38747d30dec1352d36d6c6ac510b1
-    type_inferenced_ast: 2c8ce9348a39719bfa2e322692bf5be787cd78cff2e21abc7220ed4cecb16140
+    initial_ast: 5b224262cdf11d2a6e114637866c5768c6013ceea2a7602884bddf470652fd84
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 5b224262cdf11d2a6e114637866c5768c6013ceea2a7602884bddf470652fd84
+    type_inferenced_ast: 900f2882fecb7096f0862b05fa64bd9c0a8d51ae4fb255994062234e9451acf2
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 271d2b086f2ab3f0ddc2fccaf64c3160a4f3838c1c4d38e58bbeb92440293c6d
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 271d2b086f2ab3f0ddc2fccaf64c3160a4f3838c1c4d38e58bbeb92440293c6d
-    type_inferenced_ast: fadba5ca59c54dfe92247b9ba5e6e793e0973330a7a1b8f7a87a2b713d1303ed
+    initial_ast: 084f8628f6a17bf7a6c1b0e4398120f17064a0b997b1f5d6cc27e938acc5fe58
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 084f8628f6a17bf7a6c1b0e4398120f17064a0b997b1f5d6cc27e938acc5fe58
+    type_inferenced_ast: c028d0f4e399802beec7a0ea559aa46e052ac2a32455d1b81001592b874c72a6
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 9505a38403c73bab966dd15ed656df07aae9140fc5d933ae921faf4f1b824098
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 9505a38403c73bab966dd15ed656df07aae9140fc5d933ae921faf4f1b824098
-    type_inferenced_ast: 29c75c31d3fd1c1a14dea7919d14fca30c82dd894a50657ef5eb854d658b9de6
+    initial_ast: 70b1ba2b0a46b1ea06adca06dd2210b366511bb940e9eadf17a1642bcf973b6d
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 70b1ba2b0a46b1ea06adca06dd2210b366511bb940e9eadf17a1642bcf973b6d
+    type_inferenced_ast: a8780032bd5da61c1437923b6d589805e4ba9ea7888b70ea157b534a1a577e9d
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 0fd92649a80a7ed0e72af11c3afcff5cd1353dd46e13bab22c5a62e795adefc6
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 0fd92649a80a7ed0e72af11c3afcff5cd1353dd46e13bab22c5a62e795adefc6
-    type_inferenced_ast: 11f1b4b59439cd6b4e218be2e7df05e92c7b722a955c3645d0aebee9d7208b4f
+    initial_ast: ab85c06a01efa81e861a5ade874b58d30ff6490a929d730f35f1b27545dbd23d
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: ab85c06a01efa81e861a5ade874b58d30ff6490a929d730f35f1b27545dbd23d
+    type_inferenced_ast: 3f896ba9110807abc3361db1dca3fcc4b8855430cdd6d7661a7cb2c34d2a7a56
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 75cc551dcdd1ede61566d00dce39cc0c5d2a508988eabe5c19dfaa10536632c2
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 75cc551dcdd1ede61566d00dce39cc0c5d2a508988eabe5c19dfaa10536632c2
-    type_inferenced_ast: 3f707743b3739fe2972a73750feb516f0586187bf1041fd341151a165cc5864c
+    initial_ast: bd023884e72257d4eb740a5c946c2a3e8bacef53b53b6b6feb7b1ecb6b711d4e
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: bd023884e72257d4eb740a5c946c2a3e8bacef53b53b6b6feb7b1ecb6b711d4e
+    type_inferenced_ast: f828025dfee39cb802b7ce7b33725595da817a232d89c272b1ec45dbd2d7ba34
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 62499d4b773ecd59ede931032d7191d09c734c21d9ccc3220c3efbe579c03bf3
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: a2186b50b3dfd23d27fa146cd408f386fbf9249e7c99ead0fa7cabe4e3dac821
-    type_inferenced_ast: d942e3ed86de630af9a829dfb6d4a2a58d4e9746fb941d7d2b917b3a97fe12bf
+    initial_ast: 72dc367392ae59242e3ccec58687c10b821d65a75c7a458fd9443a336d25ddfb
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 1cba21237437f3d4fb3f87c803bae422c1a1bdf68439b03623c9fc5fc0402551
+    type_inferenced_ast: fbe6a5577a77aea2faacdd582a6835b43ee850e9be3bc306aa263bf40a7cc9c9
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: d581c28d08fdc2d027adcb450582cadbda63165532a121879157b6b2df3b1c21
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: d581c28d08fdc2d027adcb450582cadbda63165532a121879157b6b2df3b1c21
-    type_inferenced_ast: 650e762a41481d7445c3fa23036a6255945011130749fd52e799b96d8ae7d325
+    initial_ast: 84eccc4c4a18448bdc05e06bbf6e2cccd0eb6e13fcad496c70a6f243b43171e4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 84eccc4c4a18448bdc05e06bbf6e2cccd0eb6e13fcad496c70a6f243b43171e4
+    type_inferenced_ast: 5a3062bedba71604ebbdc70bc72178548a1093884e2da7df3a99f8e006e7a26b
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 0977a86415107f195a0803c7f346a1943ab10eda3acf131efd814910fa0ecd8f
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 0977a86415107f195a0803c7f346a1943ab10eda3acf131efd814910fa0ecd8f
-    type_inferenced_ast: 221437bc369d7193c1214e1e18da47c505939b0b299cfb570e8e65e51ae82fa9
+    initial_ast: bbe30eb03afa974721e3cf40bef574b74ec582f20b7b14db074fd670127a8c87
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: bbe30eb03afa974721e3cf40bef574b74ec582f20b7b14db074fd670127a8c87
+    type_inferenced_ast: db83c5bbcb901c43d8be3f02cc846a74613e168743bc5f9e897e09cbee6502a7
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 896acd1ab0085e5d391e6178ca6d9b2cb6674d3e566fccdd375389a82618f905
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 896acd1ab0085e5d391e6178ca6d9b2cb6674d3e566fccdd375389a82618f905
-    type_inferenced_ast: ff80a68852e75e1c0401ce1cf7993b426c4891129f78832f8e10bc4f26f04fcd
+    initial_ast: 06f8897739a085abf7d3f2c1b0dfbbf698f6d53fdfb8e6f02083160217808da6
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 06f8897739a085abf7d3f2c1b0dfbbf698f6d53fdfb8e6f02083160217808da6
+    type_inferenced_ast: 1ffd5a3afdc6c8178f3f1aac2209967aa99c78550bb804cff7191e0d0716cc73
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 16fb098d2ea51e874835aca24e0ea1ef24d51cdf6e3374bf70c781fea8878a4a
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 16fb098d2ea51e874835aca24e0ea1ef24d51cdf6e3374bf70c781fea8878a4a
-    type_inferenced_ast: 3757d2a1f8d3bc6512ab921f06c5ebad4fb93dc9b35ca613f35d49c437d2fbf4
+    initial_ast: a3c8beaeccc1be4a6c50b651612695e6c31452763f20ad493de49c84fd86e8ff
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: a3c8beaeccc1be4a6c50b651612695e6c31452763f20ad493de49c84fd86e8ff
+    type_inferenced_ast: 9934056872c421fe07878fc155a153414b80d96c2d5a227acca86e0cd5b80e96
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 82f41814ab4e247a5fdd1a99a3ca83188492d56291f9bec3d8c1587245697f84
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: fc7f6031101346053f458f31cea55eefcd4770f7892aa74cd4e0cdfbb9743b08
-    type_inferenced_ast: d212fdad9f74f8fb08b417a3774ce358d67d4dcbf925b395aca3b8058e1ca21e
+    initial_ast: 1bdcbe987930954d6f0f3bdc5c7c2b35846fdf7b996265bf3a2e62a2ecaae4e4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: e7648a9d0d98031d1dc0f19529be3cf02420401a6f137f68b1baf55d8c0c55b6
+    type_inferenced_ast: 993f6d78fb3365e2da39f6d03e07fa5b4c372873f08028f23d69c323043e32f9
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: b68151dbf7da38ee2f00223ea194854af0c624b889e66fe38bb46207a0eae75d
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: e9946a39a43de42d611a1a198e21e8f53d53c66e11b3ef6e25407040432512e5
-    type_inferenced_ast: c9fd7d05d46b56ebdca21092bfd107488bab758956c365380609b01b9f51e8f1
+    initial_ast: ee637fa4a96ec17f71ef4e6a366a4cba6b831f8fe991ca1eb55781bd3d98c09e
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 9d269327b06ac400153b6875c0ddf3a99fb11d9e57714aa3e794f6f2a5cf738a
+    type_inferenced_ast: 995a49ab97b5ad070ee47bc29852df15b1253b79aacb664d92795daf0cc39d92
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 160aa96a5321941a1c2800d2d0a4aa87b07fd591ff2eed85f08a7bc806b6fc02
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 01065b3edc067c415ea87b136d196034490b3f31f48893d2844e206cf16b0555
-    type_inferenced_ast: a9417b4b4222b332379d1d34f4268209a2bf394bc47a1dc65f8d65e031877d38
+    initial_ast: 19b184f74b0349d571253403e32572a211860bd807ab756141e43d9eda3fbe09
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 365d7f42b5715b050c445fcaaca98573f3c545fc47d9f2973142e131571e56f2
+    type_inferenced_ast: 87b314c4de2463998ed3837ce087cbe1e623303ab8123f6a723fbecaf209370a
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 283a620a73600c82c3f99b6b8c6621936c52961d0576aa9748f3229e91f2b2a9
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: aa8026f8d075b1c86d7eef1858c30d29df4748d5458858d0237377ab33da993e
-    type_inferenced_ast: 75d5a8d06533c1b795a98d8bba17c45e563c33066c38fd65b4536076917969fd
+    initial_ast: d38643e491aed9c0d08573c4254676a75e1cf0cb24477ed8193f0d529bc70185
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 240aabd0b9a1fd9394e3e779832d352ee7fc6740e4ad93549ccf44eaf0059ac6
+    type_inferenced_ast: e305aa4a4b91099770e4d72c00b6cc313b359877831fd0ea72ccbfa723a8a225
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: c6e118fda48db36aca75ff9a2cf4faa4f5a61854a4cfd87dccb5fd699fd597cd
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 3e6423353de34af384d30cd5a3c95aca37a770389cc504cbfe0cae56aa79d99a
-    type_inferenced_ast: 672d4a535b16eaa9ebbf08c7b462ad6628b5282eff2397dc13b50776d1fb9d80
+    initial_ast: b629f99223795b499451e3cf6db866e47e591a551627cf8ddfb00d51db4ed4e2
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 1a0501460bde120818e2ef303c18e3fb821e65adf234594e746a5af65feccf0a
+    type_inferenced_ast: b5ffc8d9878c4e9ffac33e1965404c2a0250d18d3776fd5a40d2723ae4a70b97
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: c39ad5bd83f6cb83a6cfe24bfde06cc92a2ad12fe2c2833665659062eb012524
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: b8310f6b057520010f314f5c6f18d5fe56816d2d182f57640452d6d6051dc087
-    type_inferenced_ast: fa7ab6534b36f4aeddf37d451df3e4281c46c6440cae492299420caa3e159a0e
+    initial_ast: 4693bcd676e482d4379e849f4e34c9c9d6e5c7c00984e5c648180a9e76419c05
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 32e3f6d6eb01d8b5c7c6151d49f9317ffa5f0ac3d351d2f5d84f067d478b0e93
+    type_inferenced_ast: 85d1a53d54722335db82efc0e8d1c04d487cfdec2b6b6c2131f65de6758d231d
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@ -34,7 +34,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: c3f09fbd295c5d30bb5e148d7b5a41faf4508de5dec1b0951303fb0268bc579e
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c3f09fbd295c5d30bb5e148d7b5a41faf4508de5dec1b0951303fb0268bc579e
-    type_inferenced_ast: fa3b05137616480b9718358f077881e8670827f968f9e2893d5c8afe57364afd
+    initial_ast: e9685b77cd864e4d501b3833d59cbd179cc7caa71f13adf51a69c04b73751871
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: e9685b77cd864e4d501b3833d59cbd179cc7caa71f13adf51a69c04b73751871
+    type_inferenced_ast: 49c6fd3ae2a94863d0bd458434836f9a06977a452f53a92a09675d540f3cd506
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@ -34,7 +34,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: c566f6f42437cb9ef99fc6873d20dfeb81401ae2e2e22debeaead74dac4b714f
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c566f6f42437cb9ef99fc6873d20dfeb81401ae2e2e22debeaead74dac4b714f
-    type_inferenced_ast: 8fde704fb16941f04f062500f8f47952f269b59ea9284ccec5de2ed10fb939e3
+    initial_ast: 6b1d6535965e03187f0831767fdc168af95613e70175a05fcc226ae70f4667df
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 6b1d6535965e03187f0831767fdc168af95613e70175a05fcc226ae70f4667df
+    type_inferenced_ast: 9da0ef947f21d23ec506a8cdc4bf63d5c2a533f60f14a7597ae2865a98b48ab8
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@ -34,7 +34,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 079ebcb4152e0e2f584c183517b8b29777a1006f303e934c7c125ad0e09290ef
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 079ebcb4152e0e2f584c183517b8b29777a1006f303e934c7c125ad0e09290ef
-    type_inferenced_ast: ddad67aee58fa02297db8e5584491b38f374640e93b4ab16135af2e0b17ca7cc
+    initial_ast: 0ccc0ba25764d2533805bfc569d796cba88c82ad7135a874e5ff60ecf29fc576
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 0ccc0ba25764d2533805bfc569d796cba88c82ad7135a874e5ff60ecf29fc576
+    type_inferenced_ast: c85eeb8262aad7558bb8a61b78a33b3c7c644dd8e93456cb8cc8bfdfc13c12ba
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@ -34,7 +34,7 @@ outputs:
            x:
              type: bool
              value: "false"
-    initial_ast: c36e26d05f20023e8bea0108cdb813abfa697c34c9491950597e276f7a613273
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c36e26d05f20023e8bea0108cdb813abfa697c34c9491950597e276f7a613273
-    type_inferenced_ast: 13d8efc1e7d0d9e7b67d084eef73389461253929560271033b873e4c225057e4
+    initial_ast: e620d8de925a0634dd802aa39c8f847e9de245411d15ee847ec33dd89e73eccc
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: e620d8de925a0634dd802aa39c8f847e9de245411d15ee847ec33dd89e73eccc
+    type_inferenced_ast: b969e139ce4f0a1a1a14ae994823bc62d99621733779cc4d79784c17503822d4
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@ -34,7 +34,7 @@ outputs:
            x:
              type: bool
              value: "true"
-    initial_ast: 26d46b034c3a020d2ad41339ecaf7530491b3d76f08811da28ccf87c858a8026
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 26d46b034c3a020d2ad41339ecaf7530491b3d76f08811da28ccf87c858a8026
-    type_inferenced_ast: 92a0b9b921dc191d3887d7ff4ef733bea01cda136d7fcb13ae5bd665254903d3
+    initial_ast: adaec4556aea17844bf2b676cbc7c161abdc2976d4a753838520555f7056caa6
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: adaec4556aea17844bf2b676cbc7c161abdc2976d4a753838520555f7056caa6
+    type_inferenced_ast: c3f80efa21f5527ce703b5b58d17742db53ad1a56c05f8d9a19343d29ee711f4
--- a/tests/expectations/compiler/compiler/char/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/char/circuit.leo.out
@ -100,7 +100,7 @@ outputs:
            r:
              type: char
              value: "'\\u{1f62d}'"
-    initial_ast: c75622dff123827534b2fc2b4bc756dbc83ecb57d1d20137279199be99266beb
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c75622dff123827534b2fc2b4bc756dbc83ecb57d1d20137279199be99266beb
-    type_inferenced_ast: ceda0b0bcffdec7f0c355625a85da761ab0dad078efa2884c000a53a37cfb5d4
+    initial_ast: 9b476ab0cc1f82ffbe5735bdc9839290da1f19b860193bc6ca76dac7086797a9
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 9b476ab0cc1f82ffbe5735bdc9839290da1f19b860193bc6ca76dac7086797a9
+    type_inferenced_ast: c1b6a8e1c31fe2eb3c523e9d142093f4bd0ea426c0bb1b179ee4b3624e202102
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@ -100,7 +100,7 @@ outputs:
            r:
              type: char
              value: "'a'"
-    initial_ast: 3d44a5b9944a79972fe363d0a55a895ba4c54a7ebb5468c8b86f0cf7c2c08abc
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 3d44a5b9944a79972fe363d0a55a895ba4c54a7ebb5468c8b86f0cf7c2c08abc
-    type_inferenced_ast: 6a3015aa319b9b49284ec484e5df9643a583f2d24cdbcb3b9f55861dcf179fd2
+    initial_ast: d007e92eb9ec687265b31a56b8d1914d54ee7cb6fd0b09e1e3a63ed61326309c
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: d007e92eb9ec687265b31a56b8d1914d54ee7cb6fd0b09e1e3a63ed61326309c
+    type_inferenced_ast: b1ee742a5f862fe913041a82e0fdfe4bc62cdc6e585ab939d475fc31f8940369
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@ -19,7 +19,7 @@ outputs:
            r1:
              type: bool
              value: "true"
-    initial_ast: f903a8d76375a44484394a570a45c7f3a0608701ca5c9886d9fb2e4e284b3180
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: f903a8d76375a44484394a570a45c7f3a0608701ca5c9886d9fb2e4e284b3180
-    type_inferenced_ast: d21bd01666367760fac988e5c047451f53ace8c22566819413af89bb405aae1d
+    initial_ast: 354b1544d8b93fdc5dd30711f65e183ff5e2495c3618169b148f74d4cf6b775b
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 354b1544d8b93fdc5dd30711f65e183ff5e2495c3618169b148f74d4cf6b775b
+    type_inferenced_ast: 6b9deb939b3fdaecdad3910a4b2021a6a39cf3612ea310edc4f7f072a896578e
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@ -100,7 +100,7 @@ outputs:
            r:
              type: char
              value: "'\\u{1f62d}'"
-    initial_ast: 76e143570c29b060dd5e669373abe7ec59ebf4eae533982eacfc94856fcb8eb5
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 76e143570c29b060dd5e669373abe7ec59ebf4eae533982eacfc94856fcb8eb5
-    type_inferenced_ast: 64a99631a5d65611d303e853567523dc01dc8a4c06916b62e6e07ef63cf95869
+    initial_ast: d298676c7a5febbc06b5946859f33b30e04f9b6c05c129a99fc555277e28e740
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: d298676c7a5febbc06b5946859f33b30e04f9b6c05c129a99fc555277e28e740
+    type_inferenced_ast: fbb7c4bc0487bc9fe9371a171a219c697ea699fc696f7aa5ccd410e7f3e9bdd9
--- a/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: a7e859d88242d946cd7524fb17bce4fe70f5cd01f16b9620c85afb8916d7df96
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: e89b84cf6ad866872f77906158a881a7dc770c8887e6b9d919d4cf3c265bfdef
-    type_inferenced_ast: b5f8089d0789be83f656b956f5e57f6bf3bcd2ae86baff2848502596f1939436
+    initial_ast: f07f94732bac78a34babc46bf89d52fd54e94d26a542c4ac9c8be18b4e134147
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: da80138eeba68ac6fd321c5e70a6b2c8c684164df2e7b8a567c96e5f5fae49b3
+    type_inferenced_ast: 535b85a7fdf15d30b0fb862432abc822129ca90e4ab95861e76692aa2b8d1865
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 0bc79340698c93a5eabc2a1851f36e8b00b60b5fe7cfc02f95325000aff36f31
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 0bc79340698c93a5eabc2a1851f36e8b00b60b5fe7cfc02f95325000aff36f31
-    type_inferenced_ast: 1451a70c95397c7e507e2df37a1db6cb10fa8c621f163ae8a374a4360a9f89af
+    initial_ast: 43c77feea5d5dd8c43bf9683bcaaef76a2ad8f0c60107b8bb083ef209c8d4f25
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 43c77feea5d5dd8c43bf9683bcaaef76a2ad8f0c60107b8bb083ef209c8d4f25
+    type_inferenced_ast: 3152b144908381ea564e157067b103f10cfa0cdaad30d683ca3ad0063f32c6d4
--- a/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: cc5e9d009c7dd3b282ccf4b38267f8b74029698c6c74d29291425d20377d8127
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: cc5e9d009c7dd3b282ccf4b38267f8b74029698c6c74d29291425d20377d8127
-    type_inferenced_ast: 1dde2150a23d9bc40905b75a2bf283493134f9387a28e8e770b9efa89dc612d4
+    initial_ast: 67297ef0189a61ca4642ab67d2a065cce9b1c3f991c60b38609254f3e2baaa69
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 67297ef0189a61ca4642ab67d2a065cce9b1c3f991c60b38609254f3e2baaa69
+    type_inferenced_ast: 5ac0f8474890799611ef0a16a6f89e6fc673107bcad36e76909b16a932932c1e
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 887429d8e06c0c8a748a660f63e5bfe9f0e1f6225417cc1ed3bf771f6978c664
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 887429d8e06c0c8a748a660f63e5bfe9f0e1f6225417cc1ed3bf771f6978c664
-    type_inferenced_ast: 0e5699dcb95c9b00f89a2351583ea875431cee438f5a3687f793743215ebe702
+    initial_ast: 56fb53b9bcf802ecf0d9b42dc5cb20bb647993862b93ef36ef4726253d2e4953
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 56fb53b9bcf802ecf0d9b42dc5cb20bb647993862b93ef36ef4726253d2e4953
+    type_inferenced_ast: 465b240450a196f9f1ea50ad078eb5b969991e7727089923a99829a8b1a4d090
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: u32
              value: "100"
-    initial_ast: 37f8abc34c8f2973b504043f34e354cf91fe2a389e5ffdd4b188423a294e7e51
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 37f8abc34c8f2973b504043f34e354cf91fe2a389e5ffdd4b188423a294e7e51
-    type_inferenced_ast: 3412903f054af44584971d9e1656350595214e73225171d082cc70aad298edaf
+    initial_ast: e40f94044b364e85706d791db55cafa482f8d70aa85861f823be0357821381ff
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: e40f94044b364e85706d791db55cafa482f8d70aa85861f823be0357821381ff
+    type_inferenced_ast: 5823efea8a487179c8a12b9a2b7987952c5ee62abf0b73fcada58ec28d06531d
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: b3e95c78293ceda8be21c713e80651df03a1d0438c04cd113f1a610e68c63796
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 7dfb7128fe79408041ce0fecc2db53875095f8fa0f874a9c6f971ebc45b3b3f1
-    type_inferenced_ast: 8799f5d5e9ae9a86dfba65c15e88cc461978d773fd075dcd4647ccf603fa253e
+    initial_ast: 73ed50cda12e4cb9f06b4118324f9eba10383ffd79883ff9d10d04f328d18819
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 314434fd2549c45af345d678e5b202c9f72a5e4219f6122d733188fd64d12c30
+    type_inferenced_ast: 01f97cdd9186508c334e1546c9e700bcbd4ea103926fc8d2112ed439105dc0cf
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: fa23cffb95b72b387ebc0a625dda090d95d04504418d20a2773b0fc6781bd303
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: fa23cffb95b72b387ebc0a625dda090d95d04504418d20a2773b0fc6781bd303
-    type_inferenced_ast: 28bbdb5579c9ab9126739e93b3d8657dad65b30d1f876edc3de09d9128191097
+    initial_ast: dc9e548133ab1e7b8fdb11cabc90a5761e17cd5126c75697bd3261ee41875013
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: dc9e548133ab1e7b8fdb11cabc90a5761e17cd5126c75697bd3261ee41875013
+    type_inferenced_ast: 41e3e10f22639e3a59bbfd5347bc55d9f8d08a7457697dadcf58fe168d1e52a9
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: c17d0b7ffc6c6a9d292d0834e319fcbf42fb27cc943ab95bbf29b3b037fb8187
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c17d0b7ffc6c6a9d292d0834e319fcbf42fb27cc943ab95bbf29b3b037fb8187
-    type_inferenced_ast: c3747599a2b2df3e3e9cdaa8d700705331637137f1631702408f937226d55721
+    initial_ast: 7f98f34694dff74fb29f362ffcf6a1c4e6ee13d3b2dbc20f04c375135491bab2
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 7f98f34694dff74fb29f362ffcf6a1c4e6ee13d3b2dbc20f04c375135491bab2
+    type_inferenced_ast: 9e9df4ff40f29b9261e46ad45fd159d3c135c0037a8f72a2b927321dae0005ad
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: e5d18e88bcf7f4cc2369390ac79e866bcad834f7772a44ad9f3f87b36a923a0a
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: e5d18e88bcf7f4cc2369390ac79e866bcad834f7772a44ad9f3f87b36a923a0a
-    type_inferenced_ast: f4c4a44797daac02d724050d7c344a8c0d5ae4428f4f9a476e31f38ecf8e6367
+    initial_ast: 03e8152d42ce6b826a96a7bd22a94667f2afc573d91b1caf2d2aa208cd1d06d0
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 03e8152d42ce6b826a96a7bd22a94667f2afc573d91b1caf2d2aa208cd1d06d0
+    type_inferenced_ast: d73a2a3ded712d961b298bf08909c71e49ef010d806e27ab0eefd4fd53a3a863
--- a/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 4cd540b3d02c96d865ef2ef24ae065207e44361f6b6c0d6afef6aca6044b9167
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 18f4935c0b935a0f2f19bb9372dbe3cb18303cf06dff761a0d6402eb07c0020a
-    type_inferenced_ast: 9f159263ad1cc9bdb28741207db7bf729b4b1ae33462c799f25dbeb4ea1e2d25
+    initial_ast: 3100a81f902dd1b37f89f9e4024dc80d326dd7194540a6660b961c4bac300808
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 1a4d0222119b6868c51a966a23e7f9830c51d2d7e7cf4c8d203a08511f4c6e27
+    type_inferenced_ast: 3b80d193f84ccf19f91d3373fa08800ac6402b91563b317d025311204400aa70
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 434732a3a575abc64d02547a671486a574ec2476fcb1156e65743f9df8b3df85
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 434732a3a575abc64d02547a671486a574ec2476fcb1156e65743f9df8b3df85
-    type_inferenced_ast: 9f3207a56ff9893955a6cc0ed213d75fa0cbaf3354779fe55684f19ea2cc690c
+    initial_ast: 0ac9bb4bd1f8a0415729a64e2139a66e747f4115d10d17a319d78aef7532f062
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 0ac9bb4bd1f8a0415729a64e2139a66e747f4115d10d17a319d78aef7532f062
+    type_inferenced_ast: 1afd585064d117e92b84c7aee2c7a20403b9acb126c256fc627d27810715f0f1
--- a/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: b258b2be80630573ec76e04b6cce4e0ea0d8f460fcfaeef2da231f11ebf9a1e2
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: b258b2be80630573ec76e04b6cce4e0ea0d8f460fcfaeef2da231f11ebf9a1e2
-    type_inferenced_ast: 1c33e9c84bcd214ec73548277951a7e921d3f63ac8bd2eef53ea2403e17079e2
+    initial_ast: e5f0db833c0c7b531575f2d8ffc5174ab383de5e3a0b37e53c700d5b7ce4a4f3
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: e5f0db833c0c7b531575f2d8ffc5174ab383de5e3a0b37e53c700d5b7ce4a4f3
+    type_inferenced_ast: 4c771c6cd61a2b7acdf63f7ecd0d8c129f843a67895b28cf5462c771bcade692
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: ff68e0fa97a6e4c87d354220c6df2065c38940356d85908ae424b2ac07ddd985
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: d1dc7a742e95cf89abe87bedf3db865816d63008309a5bf5887d333af4b34b0c
-    type_inferenced_ast: 9acf3aeb0b6314ce22b425762167ae1103793988d79412b0f9b7f54a0df9addf
+    initial_ast: 8e55e7c3d98c1b19192ef8f03c57f9344dd2b5b234c7d7c70387a6940046f910
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 01682b1b73af0485dbbfc339b09da0dc94bf0b949b5b6f40e221557b7ecf4ab0
+    type_inferenced_ast: 0252502dbb4787f01bb1a0023449cf019fe0358dd6ff9c6f0286fc136f55bac6
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: ab56e024bb46d681ed4e4d9766f3aa1daa1e4ea28ee3a5dc1dbdc4974c8541fe
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 4256d1a31e567acf65d143fe4a3d581ae6348ee9751e2c76af7267059def6e3c
-    type_inferenced_ast: 56120e214c6534e19cffa65090fb9fba9136bd8f17dfeb106ace1dc0ed542273
+    initial_ast: 6c1834fac73685b7f11e5f2b7b59b91e365f46f16d790a26353ae681ee9d899e
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 68abcbaa309fd92cb96081ce7c2178bbabb8f11febbeabfcd81097f273b91f6f
+    type_inferenced_ast: ff0e83493a593fbf0c2dcb83a91cf689bce6e86728056a0019325c0eed1a6f18
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 9ef6f6f7032e7084d261418ea5ef1dabdd8fc32debfa998a1a4fe7abebd1d688
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 4d286f5ba9c5bd207cee6492e73683dbe6f8512c4be231759099ee05b328785b
-    type_inferenced_ast: 33bd48e0ded5b726baebc1f0976b05ebf974f8860141bcfc147753ae98cc4619
+    initial_ast: f501c921a78999fc6e7a947480a76a9240ee419a1111b7c24dfde99bf38bc0a5
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 654509d561a595bcca1737be56db8dbd215a072b10d650e8f5804e7ec45b5ac2
+    type_inferenced_ast: 2c412c4544cd51d5fac6b3358a8e2d52493bb41ed721ae5b1ca3355ec0a81041
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: d0e39f622dc6c07b9b7c455028c8456747805059217c0153b3c67e73e1103dee
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: d0e39f622dc6c07b9b7c455028c8456747805059217c0153b3c67e73e1103dee
-    type_inferenced_ast: 03e7715008a91a649cc99d2f82cd11230c87410d99ff73c55b28dd735310dd97
+    initial_ast: eecddf66e9512c6561975460de06fd2bd9471855123469a3dcd4d9abcc1f77a8
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: eecddf66e9512c6561975460de06fd2bd9471855123469a3dcd4d9abcc1f77a8
+    type_inferenced_ast: a9731a7040e442e0c002cf33c0573327ad6e9e70bc6c0f6c3fc8ff6e0ac33e4b
--- a/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: badfa9d975c37f7172b31c15e3c76e61797b1d84fde268bbcd89a12a68f423b3
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 29fffa777e57290c8615165ace58d39e08d0a073f4290951ee4fffc51acc941d
-    type_inferenced_ast: 24d19c8ccd812112002e0f4b82149f6215041ae86734750b4ba4c2dd787c9d19
+    initial_ast: 051832f5f111f33d959c336e83b7b1f1b3a8e6e9653164c7dbb3b8978aa65dc6
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: c24cc402da9bae0609c8fab4d4c89b8329e63aa8c997ba043c1e19c60b0b8fe8
+    type_inferenced_ast: 3164bb87de97e4e5917c91708198a4ac57c7c2c7ef652efea55321e0364def3d
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: d6b60edc93e42ea3f227d8913d6bc078c91b0f2350839de6334638a6d92ec367
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: db69b1760fc941ef61afc6446a775c82bb03205ab1e37b53c2309dfa3999b05e
-    type_inferenced_ast: 41f8afc6cfcc45acf5263d4e5e00a5238649035306475bee56d2b0b8fd83dd1a
+    initial_ast: 082c29964fcf1fdfcaf361e1c2b1416a995798e8811b820e0c488e3b96f4ed4c
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: ce0c0b72b2ffe01a08b7400d99cd7abcd178a8ebb79bbf2a5ccb10d101a57fde
+    type_inferenced_ast: 2c66fa00dc29469f9ad1b0762df83e3ac1912adf49b444afa2405b1740734d0c
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: d0a2ceebda399c0d467c8cd828110a0f0859d7ead350a9e90d23ddee9cb15c49
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: a4858ebba1a827ebdfcb04f201e5df2898e3ff55603e951ad51f32dd1409a5da
-    type_inferenced_ast: 04d79a59c312145ef91ac3685160ee63dde32b031f01cb7b4c8fb3438e9a1e7d
+    initial_ast: a10a2b58ca4e3576ab01502d785a52cf9421df0ffe4e2092b0f092e9dab5d265
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: b20302d65c6e115b725617af289c19dd917b269acb9f0d276da0719db13d98f0
+    type_inferenced_ast: 64437856adc43ea965953ade59b32d389ac6fcd839b6ab4e8567a40f3954c300
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: b25143b9354fbc3ce53f85fd758180d9c3f2bc0988cc4263f61c7c2097676f66
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: be0c54e181d4600539061e91a4a590b29d1445b91b1a08a0190c3488e441568e
-    type_inferenced_ast: 06de84759b591a6e2cdb733c79a39d32db53253d86981ff87a6a5c1f28f415ce
+    initial_ast: c55dbd833f4f0de907c85e5e26e8066e4b36bc2c612d783092802727a083ef04
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 5c3ac24cd73e3d21a4cb8b3d53d9d7e191e4ead8e775f1f7c1a96e98f4692c30
+    type_inferenced_ast: d32502e7685db553cae4b40836e4a33693f204d2ffe7d84001f3d4f4a75795c5
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 8ce0a1e21d17deaac4faa7c00c8532477b4d2d7e81b5c80738bf369fd9e016c0
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 8ce0a1e21d17deaac4faa7c00c8532477b4d2d7e81b5c80738bf369fd9e016c0
-    type_inferenced_ast: 8d5cc65e24c8e089a243b916fddd1e76ab451197fd28f168319e909cd4baf4a2
+    initial_ast: ce740d6b7b1ed8bdff8d802f5d46d0454e4f349b3245dbed04c05123432e584c
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: ce740d6b7b1ed8bdff8d802f5d46d0454e4f349b3245dbed04c05123432e584c
+    type_inferenced_ast: 24fbc61fd3ad00398d9bd220f669b2e67457f4a1822668ad6dfc5ccf65fe7cbd
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: c7967b8e658031da96b4da3e9eab63fbd584c545e484e530582b1afb2868192a
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c7967b8e658031da96b4da3e9eab63fbd584c545e484e530582b1afb2868192a
-    type_inferenced_ast: 73bb07a68e4eb1d3dedddfdcf370e31611e6c80a654f0ab7905ef7bf9ada5d5c
+    initial_ast: 2b3c13ccc02871000a2231b0cb3b374902b520277e70041d6dd7412601961b09
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 2b3c13ccc02871000a2231b0cb3b374902b520277e70041d6dd7412601961b09
+    type_inferenced_ast: f8f9e609ddd13fce12c8303326b349c967ac8ecf0f92ccd24a3d6d34c21c31f3
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@ -16,7 +16,7 @@ outputs:
      - input_file: cond_2.in
        output:
          registers: {}
-    initial_ast: 1673c95eac4ec9956d8b9bb011c39e99473b62903737d2740f8c18c396818301
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 33be75a0bc917cd290effef66e94a7fe911a19dc4d688c5f035b09dd14c75008
-    type_inferenced_ast: cc71950867b6100f5ed4d6a702069724e2e30f44a03baa2024e4d5e00a2c2286
+    initial_ast: 544481b3aabddc1093f49837b55ab9533bd853f09c5ecd984a59a92122abec9b
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 45828d976d2b144346507c4c9b273b2894262825c9e2f2ba4b3fc0a854c3c385
+    type_inferenced_ast: 856868e6900a9e9a8a709e109b753fb49035796f9731eac561d4cb57828808ea
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: d0a9c53562fc044b3d97b8d641b82049f8d4466d345acc7c04ef76983b67f886
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: d0a9c53562fc044b3d97b8d641b82049f8d4466d345acc7c04ef76983b67f886
-    type_inferenced_ast: fb28fa29759c9a22616eab758626fc1b8d8f0f0c3922073dc9ae010d7724e289
+    initial_ast: c9486be3367d02a677aa020a294f09590eb448ec474d4dd847a8d64911b5187a
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: c9486be3367d02a677aa020a294f09590eb448ec474d4dd847a8d64911b5187a
+    type_inferenced_ast: e1b453d16ef86dba39b0c0409c66bb2b3ae8b04c14a0ff8f4f406b0f83f440bb
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 5339c033157c89b69ace6c3b049340af9754ffe3a58d08eabd5f4ca45d641f5d
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 5339c033157c89b69ace6c3b049340af9754ffe3a58d08eabd5f4ca45d641f5d
-    type_inferenced_ast: 2425e1c2948cc5ce6e296d207b3b40ff8ec1cfc1db5575d060b41e5d6361d240
+    initial_ast: 8242263a37c409d6a2974d90abef7dc703907237fdde8a5b34ebd9433b6bd03f
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 8242263a37c409d6a2974d90abef7dc703907237fdde8a5b34ebd9433b6bd03f
+    type_inferenced_ast: 9e6dbab11a08266ebedc54ad3121610a011c22d6dff02f31cd2e9f19d3faf2df
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@ -22,7 +22,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 9d40b3b5d268927af6563dfcd5e1516a0bab11fe0c20daec298f4a33c7cb33c7
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 9d40b3b5d268927af6563dfcd5e1516a0bab11fe0c20daec298f4a33c7cb33c7
-    type_inferenced_ast: 537e39727d2b134797ff3dd444b4103bc7e2a79bc509275f5beacb73373489cc
+    initial_ast: 07c37d618b1860f93908a4cb14fc05ee273edfed371b8bffa37721729454a8a2
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 07c37d618b1860f93908a4cb14fc05ee273edfed371b8bffa37721729454a8a2
+    type_inferenced_ast: e33c7488db46d1f5e2a7de4726314e49e58a96bf8d93b0b88b713f5daab982c0
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 55a3b28190da2ab9e00b4970aac65e2e5724ad6dc7021a0e59845621ddffe480
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 55a3b28190da2ab9e00b4970aac65e2e5724ad6dc7021a0e59845621ddffe480
-    type_inferenced_ast: ff4e8d1a84fc25ac636095cc6e2f47b42864fd5a7013534fc6b7fb25dc7a726b
+    initial_ast: cbf1926576adc67692e01fcbb7021b438a52345982407af33d17b05351712f11
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: cbf1926576adc67692e01fcbb7021b438a52345982407af33d17b05351712f11
+    type_inferenced_ast: df4c8f4e63a822c9fe8d532cd61f116a83a41687bb27e7840969eaf24025eda0
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: cc9c84ca187bac2bf6372b29fe6ad9cb70fec8f6c488653e482e1630e14685ee
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: cc9c84ca187bac2bf6372b29fe6ad9cb70fec8f6c488653e482e1630e14685ee
-    type_inferenced_ast: 68a685698617fa00a57862db72181578bad036fdec6a9b701759442b6df2da34
+    initial_ast: 94c16a1144f6e907802f34af9da4ccef5743780aa45175c83dda45d09e113c8a
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 94c16a1144f6e907802f34af9da4ccef5743780aa45175c83dda45d09e113c8a
+    type_inferenced_ast: 65b2ecd7dc15f4769ae8b9c78bf6d06785c5bac7cc7e852d053492ed4e0c342e
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 9a6846c38e1ed2f7b28c741d2adf59116ed5d3d83c629b03a888032a2e23ac8a
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 9a6846c38e1ed2f7b28c741d2adf59116ed5d3d83c629b03a888032a2e23ac8a
-    type_inferenced_ast: 46e90c3973c2f094a61fd92af4699f224007d0e746c05f2f0c8160973142ce1f
+    initial_ast: 15d174af8c4607e48f0a0e9c2873eddd67f3cd01bee24db4a2a28008edf16c8a
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 15d174af8c4607e48f0a0e9c2873eddd67f3cd01bee24db4a2a28008edf16c8a
+    type_inferenced_ast: 035790159f649d63aff80e98ac95145583ba333a9c0ef904ca6a0331f263245d
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 14e34b8a6713899b1f59a1863afd87a00138bff2c1c9bf030576d3d7133bc095
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: a72a67faed96480cccd6041cd071e7620d73c82418fd7ba976dffe34aa097ef3
-    type_inferenced_ast: f29cc02e494ffa8955dba6424e2f950f9ba59284dd42ec10064c22c868dedeea
+    initial_ast: 0354d75d4a8bb1e976890bec0b21906b84c0ad5edae03f5c2c0b02bd0c67ae76
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 393cdce5240053870378ec97b87b55a92024798cf032655c27d7ef8181996faa
+    type_inferenced_ast: 9a79ae872699d9897698ac5b9089807dd9aed7c59f41183723f4e376f1c8c055
--- a/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 5c07af4f6b45a4e1913eaf0323b81b436d106af4b21c0518d07b2863f0f8b19b
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: a3b4394abb5a283d2ef6c2f1997862182df1482ef441ecce4e6b9d28a496f416
-    type_inferenced_ast: 8fbc459b55384f0654dd185ea332a1e17c913e64a3d59411dc7775954b4acbf3
+    initial_ast: cc2bd5dc7440c4080d4926e7f9c619596d010113ecf085657924ced29e9e09a0
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: c64f63a0f3888bd1af29a3374926c059f86bb032a172fb75bdffc43f838b0bb7
+    type_inferenced_ast: 06a2bc86097c01d6fe078a880ab2b1d7be64c242dbb1ee9882d3034c8712a17d
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "true"
-    initial_ast: 97ebf99a48d7f38fbdfab1596aecf5d752bd119f497a1d7e8d7e2ffce85c3241
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 97ebf99a48d7f38fbdfab1596aecf5d752bd119f497a1d7e8d7e2ffce85c3241
-    type_inferenced_ast: 8c4c2d3ffafa7d8f72209138833c06a66c6739a4f67a5a1d4dbf6766137c84d5
+    initial_ast: 8ca4b069e16e6b2228baf8fe3416d6ea1fe564a1769298f8b9b1480abbde5aa4
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 8ca4b069e16e6b2228baf8fe3416d6ea1fe564a1769298f8b9b1480abbde5aa4
+    type_inferenced_ast: e976a27a67f6e2b313e1d65c7f9401d85b45300964d7be1ab627cb17d6e6952f
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "true"
-    initial_ast: f5842d1cd70c66660bb97e2353132cf27a806f385b2fffa571b4c4b7bddb7b12
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: f5842d1cd70c66660bb97e2353132cf27a806f385b2fffa571b4c4b7bddb7b12
-    type_inferenced_ast: a8129d85afa4f5bd367ea5036c235c563067934939ecb8a10b886b8421695951
+    initial_ast: 679c11f00f4611042dc6bb93781eb3dd7b91003ab8103abc9857c360914b4978
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 679c11f00f4611042dc6bb93781eb3dd7b91003ab8103abc9857c360914b4978
+    type_inferenced_ast: 435a694c8d398b287bbed9238e3511b939bdf9a18f8d4c7aeec4fbd27eae9245
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "true"
-    initial_ast: 8109677b7f75a2fc324c107550039dd9a73dc2865d00aca3764bf3b891e1a676
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 8109677b7f75a2fc324c107550039dd9a73dc2865d00aca3764bf3b891e1a676
-    type_inferenced_ast: c1bb84684efab9feb72602f4e261fd1bf2d0985773c0466658a2ed3e4c75eb70
+    initial_ast: 9f29f1e0c493c6e042964186aeb9c67f0011fa25a95985c0d07eb35caab1a447
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 9f29f1e0c493c6e042964186aeb9c67f0011fa25a95985c0d07eb35caab1a447
+    type_inferenced_ast: b3800f890581f9b8f7ab482243e4ae96a4458ef70b745d4fa4b71a389673d224
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "true"
-    initial_ast: 86c1491f9131f9533433a1b72bea3d42018f8d55cb3d7f96502527c46e5ca64a
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 86c1491f9131f9533433a1b72bea3d42018f8d55cb3d7f96502527c46e5ca64a
-    type_inferenced_ast: 2905ce7e5f17309aa9bc32b913ae17dfd8f10890330aced95fa318267422370e
+    initial_ast: 0eb29bd2a676430215636069fd059b671caadcfeb9c13d1a886fad16c661d277
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 0eb29bd2a676430215636069fd059b671caadcfeb9c13d1a886fad16c661d277
+    type_inferenced_ast: 746a756249f8d20b078c1f871478e692468499e4b4f1bbdc1386ffd88b7c003a
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "false"
-    initial_ast: fe6657f20f7c0410d3561fce8e1e3d262b5423da19481f74233522d746611b77
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: fe6657f20f7c0410d3561fce8e1e3d262b5423da19481f74233522d746611b77
-    type_inferenced_ast: 5fe591199009e310aa348b3fb0ecd8e1b2091eb1ee3cc67a97be143fa87b75f7
+    initial_ast: 8cbfb3069c321d9f22f060d1066a5f46e19f4de2387102a36a57a2329722c369
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 8cbfb3069c321d9f22f060d1066a5f46e19f4de2387102a36a57a2329722c369
+    type_inferenced_ast: d7d7a7ecb3c66e47c97670b466592c1bc95cfcdf6e18f3e45d52c336aa9f1c1d
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@ -16,7 +16,7 @@ outputs:
            r:
              type: bool
              value: "true"
-    initial_ast: 5b1afa73b7d03083ea86f20ad5f963f6da744a4c0c9b58dc948e269bbce18b77
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 5b1afa73b7d03083ea86f20ad5f963f6da744a4c0c9b58dc948e269bbce18b77
-    type_inferenced_ast: 880a7d6f8cc37037ea354d65c55c8b81ae939415b36f627ecca181c5d778e313
+    initial_ast: 5aeb576541d75d9ab92342d7a1d0fcc1b0e22ea7dcf4cee85d31fcea3efed285
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 5aeb576541d75d9ab92342d7a1d0fcc1b0e22ea7dcf4cee85d31fcea3efed285
+    type_inferenced_ast: b9a513541859c84f83bed1a79349413ff8d3a91c8586ff52e646982ca76e5ca8
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: bb5b018e917bdc5efca3c751175346aa00e36eb0eb288d55e650d87cc3c46d40
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: c7c8ebf3dc6f7cd6101d3f255fb0d82f44d68b132e029b0772d342b4eb0bdff2
-    type_inferenced_ast: d37e2d1fdb4ea3576dcefee9c51290bacdb450913ffa6f39657e4a4466ae151e
+    initial_ast: b869c77b7a39afc4b31d04425ce22df38fb8a8de2bbae28edab600a9361a203b
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 38f307bfebac074f661032d628de3710836c17d035e073143384e5f9c373dc97
+    type_inferenced_ast: c5f8d7c0fc375b836deb1db91d66bd9e4a120a988844b2c6b1fd55ce2dbe4622
--- a/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: e1f0b5652e21030f82c41d02eacd1838ce75114d35f57c7e693c847ccf4fbee4
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 826e7414e8ee8255288d64ac5225ad596df187d4469a9c130bdfc0a45a94ffc3
-    type_inferenced_ast: 758ce040390e741a6197ae7f5ae7cb23e8b914ab081e99ebb7ee6db0eb7ab137
+    initial_ast: a7e0dc0a16f888a218e9b897256f45c759b89f01c963dfc894bdb6a9321127d7
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: c5d804fb471f3f9a3bb518c56f6fc5b2f353456e71b7a7a086dc6a0e09aaf395
+    type_inferenced_ast: 931c06609c31d52f0e329063e433da7d1191b3cba2808366b470302e6e232b87
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@ -16,7 +16,7 @@ outputs:
            a:
              type: u32
              value: "4"
-    initial_ast: 79cd77c641e2c392920f7860e32a02f971539ac2970ce44e01161f564c3b2828
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 79cd77c641e2c392920f7860e32a02f971539ac2970ce44e01161f564c3b2828
-    type_inferenced_ast: d0ace4e1fa58517b559ec428377839994f66b389b2aebf6cb3e7726ccdaa7c55
+    initial_ast: 3e52ab2583487d0012e84801022710a905672d46be747f416050dd374050e2d5
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 3e52ab2583487d0012e84801022710a905672d46be747f416050dd374050e2d5
+    type_inferenced_ast: 816149e521ba18284b7f4cda82962f4535158bfe34994d55450242feccbea6a2
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: b574c894b500da6248adb7ffbc9b141dba29c708290d29b8462d8c0e8c5ab6df
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 0e5477a3269df284d4ca9cefe4226ee2dec1fa1ab45bf8c8e40329b4872e5791
-    type_inferenced_ast: 94effa0c82bac743173923b307cf3ab9b18799eeb6df048783c07a12e3093e4f
+    initial_ast: e4082c4aa45b7f803a319bbea76ad4bc6b1e0c880d106bed84aaa545ca397a34
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: da9ce8a363ad24cb585eb8c39de908d78f9bd43de0e38db4c27f85a19a083ee5
+    type_inferenced_ast: a1e926bbbd30577aefa4ae1b4aeaa5bc3487ed336934c5021dc7ae16b74f48db
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: a8f6d5d148eec13d6cf552d8acb966ca74d935de8c8e96cff2502246cb793c41
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 0c9a336b56ac7658c33e6ef388dd83f9fe8dab5d601e4f849814a8ead305b23b
-    type_inferenced_ast: c01e31f00d308f9a0a0564ce9fce000ecb210dcd07e73933043f0cebb77243bb
+    initial_ast: 349d7a16d6bc62e5cb9c464afe829a6f162cd20e0e985d49ac7f3a62e2c80809
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 98012c84544da0bfbc01aa2a6e6018d2a96fc61e185ab05d7c52de01df2de1d3
+    type_inferenced_ast: 40a2fa362da9f1e3771aa355532e67fc746acae9aee8d7a9392d04a349425430
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@ -16,7 +16,7 @@ outputs:
            r0:
              type: bool
              value: "true"
-    initial_ast: 9dbbff69072fe6e0a845225b9c3f5ee234ac9c00d87b400d0307b3ad214ffaf2
-    imports_resolved_ast: 68d56e1fe5be8f6859aaeb97692139083eddd0f7f91041f8d583cf05ebf4c922
-    canonicalized_ast: 2ebb3ee9de7fb708cf64abcd870107bdc188be584875bfef6c03e8af81090107
-    type_inferenced_ast: 867c47bf28231d9e848f132dafd29706032402efc01273f052582fd45140bd15
+    initial_ast: eef4a4a33472d69410339c593514cb0eb8a6e69a27bb94cac7893c017f556b94
+    imports_resolved_ast: 4ca172d902f797a1d225223900fbf3f01a68c44ad5a0cf402e719f9e5961988b
+    canonicalized_ast: 78e3922fee4c9eb48dad2ef0362ab46fb75ad679d7346566c5e917512e2c9f23
+    type_inferenced_ast: 897a9887e14d5333088da5dbf2d589f774192c84e5ba162a3f95d66a1075479b
--- a/Show More
+++ b/Show More