Change all uses of interning besides the uplc parser to use the new CodeGenInterner

crates/aiken-lang/src/gen_uplc.rs

@@ -46,8 +46,7 @@ use uplc::{
     builder::{CONSTR_FIELDS_EXPOSER, CONSTR_INDEX_EXPOSER, EXPECT_ON_LIST},
     builtins::DefaultFunction,
     machine::cost_model::ExBudget,
-    optimize::{aiken_optimize_and_intern, shrinker::NO_INLINE},
-    parser::interner::Interner,
+    optimize::{aiken_optimize_and_intern, interner::CodeGenInterner, shrinker::NO_INLINE},
 };
 
 #[derive(Clone)]
@@ -3929,7 +3928,7 @@ impl<'a> CodeGenerator<'a> {
                                 term,
                             };
 
-                            let mut interner = Interner::new();
+                            let mut interner = CodeGenInterner::new();
 
                             interner.program(&mut program);
 
@@ -4184,7 +4183,7 @@ impl<'a> CodeGenerator<'a> {
                                 term: self.special_functions.apply_used_functions(term),
                             };
 
-                            let mut interner = Interner::new();
+                            let mut interner = CodeGenInterner::new();
 
                             interner.program(&mut program);
 
@@ -4533,7 +4532,7 @@ impl<'a> CodeGenerator<'a> {
                         term,
                     };
 
-                    let mut interner = Interner::new();
+                    let mut interner = CodeGenInterner::new();
 
                     interner.program(&mut program);
 
@@ -4558,7 +4557,7 @@ impl<'a> CodeGenerator<'a> {
                         term,
                     };
 
-                    let mut interner = Interner::new();
+                    let mut interner = CodeGenInterner::new();
 
                     interner.program(&mut program);
 
@@ -4964,7 +4963,7 @@ impl<'a> CodeGenerator<'a> {
                         term,
                     };
 
-                    let mut interner = Interner::new();
+                    let mut interner = CodeGenInterner::new();
 
                     interner.program(&mut program);
 

crates/uplc/src/ast.rs

@@ -7,7 +7,7 @@ use crate::{
         eval_result::EvalResult,
         Machine,
     },
-    parser::interner::Interner,
+    optimize::interner::CodeGenInterner,
 };
 use num_bigint::BigInt;
 use num_traits::ToPrimitive;
@@ -88,7 +88,7 @@ impl Program<Name> {
             term: applied_term,
         };
 
-        Interner::new().program(&mut program);
+        CodeGenInterner::new().program(&mut program);
 
         program
     }

crates/uplc/src/optimize.rs

@@ -1,6 +1,6 @@
 use crate::ast::{Name, Program};
 
-mod interner;
+pub mod interner;
 pub mod shrinker;
 
 pub fn aiken_optimize_and_intern(program: Program<Name>) -> Program<Name> {

crates/uplc/src/optimize/shrinker.rs

@@ -1649,7 +1649,7 @@ mod tests {
     use crate::{
         ast::{Constant, Data, Name, NamedDeBruijn, Program, Term},
         builtins::DefaultFunction,
-        parser::interner::Interner,
+        optimize::interner::CodeGenInterner,
     };
 
     #[test]
@@ -1667,7 +1667,7 @@ mod tests {
                 ),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1680,7 +1680,7 @@ mod tests {
             ),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1701,7 +1701,7 @@ mod tests {
                 .apply(Term::integer(6.into())),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1710,7 +1710,7 @@ mod tests {
             term: Term::integer(6.into()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1729,7 +1729,7 @@ mod tests {
             term: Term::var("foo").lambda("foo").apply(Term::add_integer()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1738,7 +1738,7 @@ mod tests {
             term: Term::add_integer(),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1769,7 +1769,7 @@ mod tests {
                 .apply(Term::bool(false).lambda("x")),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1789,7 +1789,7 @@ mod tests {
                 .apply(Term::bool(false).lambda("x")),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1814,7 +1814,7 @@ mod tests {
                 .lambda("x"),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1828,7 +1828,7 @@ mod tests {
                 .lambda("x"),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1853,7 +1853,7 @@ mod tests {
                 .lambda("x"),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -1865,7 +1865,7 @@ mod tests {
                 .lambda("x"),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1907,7 +1907,7 @@ mod tests {
                 .apply(Term::tail_list()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1915,7 +1915,7 @@ mod tests {
 
         let mut actual = program.builtin_force_reducer();
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut actual);
 
@@ -1966,7 +1966,7 @@ mod tests {
                 .apply(Term::Builtin(DefaultFunction::IfThenElse).force()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -1974,7 +1974,7 @@ mod tests {
 
         let mut actual = program.builtin_force_reducer();
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut actual);
 
@@ -1993,7 +1993,7 @@ mod tests {
                 .apply(Term::byte_string(vec![]).delay()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -2002,7 +2002,7 @@ mod tests {
             term: Term::sha2_256().apply(Term::byte_string(vec![]).delay()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -2027,7 +2027,7 @@ mod tests {
                 .apply(Term::var("y").lambda("y")),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -2036,7 +2036,7 @@ mod tests {
             term: Term::sha2_256().apply(Term::byte_string(vec![]).delay()),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -2072,7 +2072,7 @@ mod tests {
                 ),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -2088,7 +2088,7 @@ mod tests {
             ),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 
@@ -2118,7 +2118,7 @@ mod tests {
                 .apply(Term::integer(5.into())),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut program);
 
@@ -2134,7 +2134,7 @@ mod tests {
                 .apply(Term::integer(5.into())),
         };
 
-        let mut interner = Interner::new();
+        let mut interner = CodeGenInterner::new();
 
         interner.program(&mut expected);
 

examples/acceptance_tests/036/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/047/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/071/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/077/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/079/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/086/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/089/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/090/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [

examples/acceptance_tests/script_context/plutus.json

@@ -5,7 +5,7 @@
     "plutusVersion": "v2",
     "compiler": {
       "name": "Aiken",
-      "version": "v1.0.24-alpha+86c5bb8"
+      "version": "v1.0.24-alpha+e14f091"
     }
   },
   "validators": [