Modify compiler struct

compiler/compiler/Cargo.toml

@@ -41,6 +41,10 @@ version = "=1.9.4"
 [dependencies.sha2]
 version = "0.10"
 
+[dependencies.indexmap]
+version = "1.9"
+features = []
+
 [dev-dependencies.leo-test-framework]
 path = "../../tests/test-framework"
 
@@ -73,4 +77,4 @@ version = "3.7"
 
 [features]
 default = [ ]
-ci_skip = [ "leo-ast/ci_skip" ]
+ci_skip = [ "leo-ast/ci_skip" ]

compiler/compiler/src/compiler.rs

@@ -18,16 +18,17 @@
 //!
 //! The [`Compiler`] type compiles Leo programs into R1CS circuits.
 pub use leo_ast::{Ast, InputAst};
-use leo_ast::{NodeBuilder, Program};
+use leo_ast::{NodeBuilder, Program, Stub};
 use leo_errors::{emitter::Handler, CompilerError, Result};
 pub use leo_passes::SymbolTable;
 use leo_passes::*;
-use leo_span::{source_map::FileName, symbol::with_session_globals};
+use leo_span::{source_map::FileName, symbol::with_session_globals, Symbol};
 
 use sha2::{Digest, Sha256};
 use std::{fs, path::PathBuf};
 
 use crate::CompilerOptions;
+use indexmap::IndexMap;
 
 /// The primary entry point of the Leo compiler.
 #[derive(Clone)]
@@ -52,6 +53,8 @@ pub struct Compiler<'a> {
     node_builder: NodeBuilder,
     /// The `Assigner` is used to construct (unique) assignment statements.
     assigner: Assigner,
+    /// The stubs for imported programs. Produced by `Retriever` module.
+    import_stubs: IndexMap<Symbol, Stub>,
 }
 
 impl<'a> Compiler<'a> {
@@ -63,6 +66,7 @@ impl<'a> Compiler<'a> {
         main_file_path: PathBuf,
         output_directory: PathBuf,
         compiler_options: Option<CompilerOptions>,
+        import_stubs: IndexMap<Symbol, Stub>,
     ) -> Self {
         let node_builder = NodeBuilder::default();
         let assigner = Assigner::default();
@@ -77,6 +81,7 @@ impl<'a> Compiler<'a> {
             compiler_options: compiler_options.unwrap_or_default(),
             node_builder,
             assigner,
+            import_stubs,
         }
     }
 
@@ -285,6 +290,8 @@ impl<'a> Compiler<'a> {
     pub fn compile(&mut self) -> Result<(SymbolTable, String)> {
         // Parse the program.
         self.parse_program()?;
+        // Merge stubs
+        self.add_import_stubs();
         // Run the intermediate compiler stages.
         let (symbol_table, struct_graph, call_graph) = self.compiler_stages()?;
         // Run code generation.

compiler/compiler/tests/utilities/mod.rs

@@ -30,6 +30,7 @@ use leo_test_framework::{test::TestConfig, Test};
 
 use snarkvm::prelude::*;
 
+use indexmap::IndexMap;
 use leo_ast::ProgramVisitor;
 use snarkvm::{file::Manifest, package::Package};
 use std::{
@@ -142,7 +143,15 @@ pub fn new_compiler(
     let output_dir = PathBuf::from("/tmp/output/");
     fs::create_dir_all(output_dir.clone()).unwrap();
 
-    Compiler::new(String::from("test"), String::from("aleo"), handler, main_file_path, output_dir, compiler_options)
+    Compiler::new(
+        String::from("test"),
+        String::from("aleo"),
+        handler,
+        main_file_path,
+        output_dir,
+        compiler_options,
+        IndexMap::new(),
+    )
 }
 
 pub fn parse_program<'a>(