refactor: add Library, Program with advice map constructors,

`AdviceMap` from iterator constructor.
0xPolygonMiden · Dec 18, 2024 · fedea27 · fedea27
1 parent ba40fe5
commit fedea27
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/assembly/src/library/mod.rs b/assembly/src/library/mod.rs
@@ -10,7 +10,7 @@ use vm_core::{
     debuginfo::Span,
     mast::{MastForest, MastNodeId},
     utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
-    Kernel,
+    AdviceMap, Kernel,
 };
 
 use crate::ast::{Ident, ProcedureName, QualifiedProcedureName};
@@ -92,6 +92,15 @@ impl Library {
 
         Ok(Self { digest, exports, mast_forest })
     }
+
+    pub fn with_advice_map(self, advice_map: AdviceMap) -> Self {
+        let mut mast_forest = (*self.mast_forest).clone();
+        mast_forest.advice_map_mut().extend(advice_map);
+        Self {
+            mast_forest: Arc::new(mast_forest),
+            ..self
+        }
+    }
 }
 
 // ------------------------------------------------------------------------------------------------

diff --git a/core/src/program.rs b/core/src/program.rs
@@ -8,6 +8,7 @@ use super::Kernel;
 use crate::{
     mast::{MastForest, MastNode, MastNodeId},
     utils::ToElements,
+    AdviceMap,
 };
 
 // PROGRAM
@@ -53,6 +54,15 @@ impl Program {
 
         Self { mast_forest, entrypoint, kernel }
     }
+
+    pub fn with_advice_map(self, advice_map: AdviceMap) -> Self {
+        let mut mast_forest = (*self.mast_forest).clone();
+        mast_forest.advice_map_mut().extend(advice_map);
+        Self {
+            mast_forest: Arc::new(mast_forest),
+            ..self
+        }
+    }
 }
 
 // ------------------------------------------------------------------------------------------------