Add test, bug fix, refactoring

Sdoba16 · Sdoba16 · commit a2e29d56b642 · 2026-03-10T09:53:12.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/functional-tests/error-test-cases/cross-wire/lib/b.simf b/functional-tests/error-test-cases/cross-wire/lib/b.simf
@@ -0,0 +1,2 @@
+use lib::x::TypeX;
+use lib::y::TypeY;
diff --git a/functional-tests/error-test-cases/cross-wire/lib/c.simf b/functional-tests/error-test-cases/cross-wire/lib/c.simf
@@ -0,0 +1,2 @@
+use lib::y::TypeY;
+use lib::x::TypeX;
diff --git a/functional-tests/error-test-cases/cross-wire/lib/x.simf b/functional-tests/error-test-cases/cross-wire/lib/x.simf
@@ -0,0 +1 @@
+pub type TypeX = u32;
diff --git a/functional-tests/error-test-cases/cross-wire/lib/y.simf b/functional-tests/error-test-cases/cross-wire/lib/y.simf
@@ -0,0 +1 @@
+pub type TypeY = u64;
diff --git a/functional-tests/error-test-cases/cross-wire/main.simf b/functional-tests/error-test-cases/cross-wire/main.simf
@@ -0,0 +1,4 @@
+use lib::b::TypeX;
+use lib::c::TypeY;
+
+fn main() {}
diff --git a/functional-tests/error-test-cases/cyclic-dependency/lib/module_a.simf b/functional-tests/error-test-cases/cyclic-dependency/lib/module_a.simf
@@ -0,0 +1,2 @@
+pub use lib::module_b::TypeB;
+pub type TypeA = u32;
diff --git a/functional-tests/error-test-cases/cyclic-dependency/lib/module_b.simf b/functional-tests/error-test-cases/cyclic-dependency/lib/module_b.simf
@@ -0,0 +1,2 @@
+pub use lib::module_a::TypeA;
+pub type TypeB = u32;
diff --git a/functional-tests/error-test-cases/cyclic-dependency/main.simf b/functional-tests/error-test-cases/cyclic-dependency/main.simf
@@ -0,0 +1,3 @@
+use lib::module_a::TypeA; 
+
+fn main() {}
diff --git a/functional-tests/error-test-cases/file-not-found/main.simf b/functional-tests/error-test-cases/file-not-found/main.simf
@@ -0,0 +1,5 @@
+use lib::module::AssetId;
+
+fn main() {
+    let my_asset: AssetId = 5; 
+}
diff --git a/functional-tests/error-test-cases/global/lib/module.simf b/functional-tests/error-test-cases/global/lib/module.simf
@@ -0,0 +1,2 @@
+pub type AssetId = u32;
+pub fn get_id() -> AssetId { 1 }
diff --git a/functional-tests/error-test-cases/global/main.simf b/functional-tests/error-test-cases/global/main.simf
@@ -0,0 +1,5 @@
+use lib::module::*;
+
+fn main() {
+    let my_asset: AssetId = 5; 
+}
diff --git a/functional-tests/error-test-cases/lib-not-found/main.simf b/functional-tests/error-test-cases/lib-not-found/main.simf
@@ -0,0 +1,5 @@
+use lib::module::AssetId;
+
+fn main() {
+    let my_asset: AssetId = 5; 
+}
diff --git a/functional-tests/error-test-cases/private-visibility/lib/hidden.simf b/functional-tests/error-test-cases/private-visibility/lib/hidden.simf
@@ -0,0 +1 @@
+type SecretType = u32; pub fn ok() {}
diff --git a/functional-tests/error-test-cases/private-visibility/main.simf b/functional-tests/error-test-cases/private-visibility/main.simf
@@ -0,0 +1,3 @@
+use lib::hidden::SecretType;
+
+fn main() {}
diff --git a/functional-tests/valid-test-cases/deep-reexport-chain/lib/level1.simf b/functional-tests/valid-test-cases/deep-reexport-chain/lib/level1.simf
@@ -0,0 +1,2 @@
+pub use lib::level2::CoreSmth;
+pub use lib::level2::core_val;
diff --git a/functional-tests/valid-test-cases/deep-reexport-chain/lib/level2.simf b/functional-tests/valid-test-cases/deep-reexport-chain/lib/level2.simf
@@ -0,0 +1,2 @@
+pub use lib::level3::CoreSmth;
+pub use lib::level3::core_val;
diff --git a/functional-tests/valid-test-cases/deep-reexport-chain/lib/level3.simf b/functional-tests/valid-test-cases/deep-reexport-chain/lib/level3.simf
@@ -0,0 +1,2 @@
+pub type CoreSmth = u32;
+pub fn core_val() -> CoreSmth { 42 }
diff --git a/functional-tests/valid-test-cases/deep-reexport-chain/main.simf b/functional-tests/valid-test-cases/deep-reexport-chain/main.simf
@@ -0,0 +1,7 @@
+use lib::level1::CoreSmth;
+use lib::level1::core_val;
+
+fn main() {
+    let val: CoreSmth = core_val();
+    assert!(jet::eq_32(val, 42));
+}
diff --git a/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/base.simf b/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/base.simf
@@ -0,0 +1 @@
+pub type BaseType = u32;
diff --git a/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/left.simf b/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/left.simf
@@ -0,0 +1,2 @@
+pub use lib::base::BaseType;
+pub fn get_left() -> BaseType { 1 }
diff --git a/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/right.simf b/functional-tests/valid-test-cases/diamond-dependency-resolution/lib/right.simf
@@ -0,0 +1,2 @@
+pub use lib::base::BaseType;
+pub fn get_right() -> BaseType { 2 }
diff --git a/functional-tests/valid-test-cases/diamond-dependency-resolution/main.simf b/functional-tests/valid-test-cases/diamond-dependency-resolution/main.simf
@@ -0,0 +1,9 @@
+use lib::left::get_left;
+use lib::right::get_right;
+
+fn main() {
+    let a: BaseType = get_left();
+    let b: BaseType = get_right();
+    let (_, c): (bool, BaseType) = jet::add_32(a, b);
+    assert!(jet::eq_32(c, 3));
+}
diff --git a/functional-tests/valid-test-cases/interleaved-waterfall/auth/verify.simf b/functional-tests/valid-test-cases/interleaved-waterfall/auth/verify.simf
@@ -0,0 +1,6 @@
+use types::def::UserId;
+use db::store::get_record;
+
+pub fn is_valid(id: UserId) -> UserId { 
+    get_record(id)
+}
diff --git a/functional-tests/valid-test-cases/interleaved-waterfall/db/store.simf b/functional-tests/valid-test-cases/interleaved-waterfall/db/store.simf
@@ -0,0 +1,2 @@
+use types::def::UserId;
+pub fn get_record(id: UserId) -> UserId { id }
diff --git a/functional-tests/valid-test-cases/interleaved-waterfall/main.simf b/functional-tests/valid-test-cases/interleaved-waterfall/main.simf
@@ -0,0 +1,5 @@
+use orch::handler::run_system;
+
+fn main() {
+    assert!(jet::eq_32(run_system(5), 5));
+}
diff --git a/functional-tests/valid-test-cases/interleaved-waterfall/orch/handler.simf b/functional-tests/valid-test-cases/interleaved-waterfall/orch/handler.simf
@@ -0,0 +1,8 @@
+use auth::verify::is_valid;
+use db::store::get_record;
+use types::def::UserId;
+
+pub fn run_system(id: UserId) -> UserId {
+    let checked: UserId = is_valid(id);
+    get_record(checked)
+}
diff --git a/functional-tests/valid-test-cases/interleaved-waterfall/types/def.simf b/functional-tests/valid-test-cases/interleaved-waterfall/types/def.simf
@@ -0,0 +1 @@
+pub type UserId = u32;
diff --git a/functional-tests/valid-test-cases/leaky-signature/lib/internal.simf b/functional-tests/valid-test-cases/leaky-signature/lib/internal.simf
@@ -0,0 +1,5 @@
+type SecretKey = u64;
+
+pub fn unlock(key: SecretKey) -> u64 {
+    jet::max_64(key, 0)
+}
diff --git a/functional-tests/valid-test-cases/leaky-signature/main.simf b/functional-tests/valid-test-cases/leaky-signature/main.simf
@@ -0,0 +1,4 @@
+use lib::internal::unlock;
+
+fn main() {
+}
diff --git a/functional-tests/valid-test-cases/module-simple/lib/module.simf b/functional-tests/valid-test-cases/module-simple/lib/module.simf
@@ -0,0 +1 @@
+pub fn add() {}
diff --git a/functional-tests/valid-test-cases/module-simple/main.simf b/functional-tests/valid-test-cases/module-simple/main.simf
@@ -0,0 +1,2 @@
+use lib::module::add;
+fn main() {}
diff --git a/functional-tests/valid-test-cases/multi-lib-facade/api/api.simf b/functional-tests/valid-test-cases/multi-lib-facade/api/api.simf
@@ -0,0 +1,3 @@
+pub use crypto::crypto::mock_hash;
+pub use math::math::MathInt;
+pub use math::math::add_two;
diff --git a/functional-tests/valid-test-cases/multi-lib-facade/crypto/crypto.simf b/functional-tests/valid-test-cases/multi-lib-facade/crypto/crypto.simf
@@ -0,0 +1,5 @@
+use math::math::MathInt;
+
+pub fn mock_hash(x: MathInt) -> (bool, MathInt) {
+    jet::add_32(x, 5)
+}
diff --git a/functional-tests/valid-test-cases/multi-lib-facade/main.simf b/functional-tests/valid-test-cases/multi-lib-facade/main.simf
@@ -0,0 +1,8 @@
+use api::api::{add_two, mock_hash, MathInt};
+
+fn main() {
+    let val: MathInt = 10;
+    let (_, step1): (bool, MathInt) = add_two(val);
+    let (_, step2): (bool, MathInt) = mock_hash(step1);
+    assert!(jet::eq_32(step2, 17));
+}
diff --git a/functional-tests/valid-test-cases/multi-lib-facade/math/math.simf b/functional-tests/valid-test-cases/multi-lib-facade/math/math.simf
@@ -0,0 +1,4 @@
+pub type MathInt = u32;
+pub fn add_two(x: MathInt) -> (bool, MathInt) { 
+    jet::add_32(x, 2) 
+}
diff --git a/functional-tests/valid-test-cases/reexport-diamond/lib/core.simf b/functional-tests/valid-test-cases/reexport-diamond/lib/core.simf
@@ -0,0 +1,2 @@
+pub type Coin = u64;
+pub fn mint(val: u64) -> Coin { val }
diff --git a/functional-tests/valid-test-cases/reexport-diamond/lib/route_a.simf b/functional-tests/valid-test-cases/reexport-diamond/lib/route_a.simf
@@ -0,0 +1,2 @@
+pub use lib::core::Coin;
+pub use lib::core::mint;
diff --git a/functional-tests/valid-test-cases/reexport-diamond/lib/route_b.simf b/functional-tests/valid-test-cases/reexport-diamond/lib/route_b.simf
@@ -0,0 +1,5 @@
+pub use lib::core::Coin;
+
+pub fn burn(c: Coin) -> (bool, Coin) {
+    jet::subtract_64(c, 1)
+}
diff --git a/functional-tests/valid-test-cases/reexport-diamond/main.simf b/functional-tests/valid-test-cases/reexport-diamond/main.simf
@@ -0,0 +1,9 @@
+use lib::route_a::Coin;
+use lib::route_a::mint;
+use lib::route_b::burn;
+
+fn main() {
+    let my_coin: Coin = mint(10);
+    let (_, remaining): (bool, Coin) = burn(my_coin);
+    assert!(jet::eq_64(remaining, 9));
+}
diff --git a/src/ast.rs b/src/ast.rs
@@ -1540,14 +1540,18 @@ impl AbstractSyntaxTree for Match {
     }
 }
 
+/// Analyze a parsed module program to extract assignments for a specific module.
+///
+/// This function searches the parsed program for a module matching the given `name`.
+/// If found, it evaluates the module's assignments and returns them as a map of
+/// witness names to their constant values. If the module is not present, an empty
+/// map is returned.
 fn analyze_named_module(
     name: ModuleName,
     from: &parse::ModuleProgram,
 ) -> Result<HashMap<WitnessName, Value>, RichError> {
     let unit = ResolvedType::unit();
 
-    // IMPORTANT! If modules allow imports, then we need to consider
-    // passing the resolution conetxt by calling `Scope::new(resolutions)`
     let mut scope = Scope::default();
     let items = from
         .items()
diff --git a/src/driver.rs b/src/driver.rs
@@ -313,7 +313,17 @@ impl_eq_hash!(TypeAlias; name, ty);
 #[derive(Debug)]
 pub enum C3Error {
     CycleDetected(Vec<String>),
-    InconsistentLinearization { module: String },
+    /// Error for inconsistent MRO.
+    /// This can happen if the dependency graph has a shape that makes the
+    /// order of parent classes ambiguous.
+    /// Example: A depends on B and C, and B also depends on C.
+    /// The linearization of A is A + merge(linearization(B), linearization(C), [B, C]).
+    /// If B appears before C in one parent's linearization but C appears before B
+    /// in another's, the merge will fail.
+    InconsistentLinearization {
+        module: String,
+        conflicts: Vec<Vec<String>>,
+    },
 }
 
 impl fmt::Display for C3Error {
@@ -322,8 +332,22 @@ impl fmt::Display for C3Error {
             C3Error::CycleDetected(cycle) => {
                 write!(f, "Circular dependency detected: {:?}", cycle.join(" -> "))
             }
-            C3Error::InconsistentLinearization { module } => {
-                write!(f, "Inconsistent resolution order for module '{:?}'", module)
+            C3Error::InconsistentLinearization { module, conflicts } => {
+                writeln!(f, "Inconsistent resolution order for module '{}'", module)?;
+                writeln!(
+                    f,
+                    "The compiler could not resolve the following conflicting import constraints:"
+                )?;
+
+                // Loop through the matrix and print each conflicting sequence
+                for conflict in conflicts {
+                    writeln!(f, "  [{}]", conflict.join(", "))?;
+                }
+
+                write!(
+                    f,
+                    "Try reordering your `use` statements to avoid cross-wiring."
+                )
             }
         }
     }
@@ -489,12 +513,26 @@ impl ProjectGraph {
             seqs.push(line);
         }
 
-        seqs.push(parents.clone());
-
         let mut result = vec![module];
-        let merged = merge(seqs).ok_or(C3Error::InconsistentLinearization {
-            module: self.modules[module].source.name().to_string(),
-        })?;
+        let merged = match merge(seqs) {
+            Ok(m) => m,
+            Err(conflicts) => {
+                // Map the failing usize sequences into readable module names
+                let conflict_names: Vec<Vec<String>> = conflicts
+                    .into_iter()
+                    .map(|seq| {
+                        seq.into_iter()
+                            .map(|id| self.modules[id].source.name().to_string())
+                            .collect()
+                    })
+                    .collect();
+
+                return Err(C3Error::InconsistentLinearization {
+                    module: self.modules[module].source.name().to_string(),
+                    conflicts: conflict_names,
+                });
+            }
+        };
 
         result.extend(merged);
 
@@ -720,13 +758,18 @@ impl ProjectGraph {
     }
 }
 
-fn merge(mut seqs: Vec<Vec<usize>>) -> Option<Vec<usize>> {
+/// C3 Merge Algorithm
+///
+/// Merges a list of sequences (parent linearizations) into a single sequence.
+/// The algorithm ensures that the local precedence order of each sequence is preserved.
+// Change the return type to Result
+fn merge(mut seqs: Vec<Vec<usize>>) -> Result<Vec<usize>, Vec<Vec<usize>>> {
     let mut result = Vec::new();
 
     loop {
         seqs.retain(|s| !s.is_empty());
         if seqs.is_empty() {
-            return Some(result);
+            return Ok(result);
         }
 
         let mut candidate = None;
@@ -740,7 +783,9 @@ fn merge(mut seqs: Vec<Vec<usize>>) -> Option<Vec<usize>> {
             }
         }
 
-        let head = candidate?;
+        let Some(head) = candidate else {
+            return Err(seqs);
+        };
 
         result.push(head);
 
@@ -881,7 +926,6 @@ pub(crate) mod tests {
     use std::path::Path;
     use tempfile::TempDir;
 
-    // ProjectGraph::new tests
     // Creates a file with specific content in the temp directory
     pub(crate) fn create_simf_file(dir: &Path, rel_path: &str, content: &str) -> PathBuf {
         let full_path = dir.join(rel_path);
@@ -898,7 +942,6 @@ pub(crate) mod tests {
     }
 
     // Helper to mock the initial root program parsing
-    // (Assuming your parser works via a helper function)
     fn parse_root(path: &Path) -> (parse::Program, SourceFile) {
         // 1. Read file
         let content = std::fs::read_to_string(path).expect("Failed to read root file for parsing");
diff --git a/src/error.rs b/src/error.rs
diff --git a/src/lib.rs b/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+use lib::x::TypeX;`
	`2`	`+use lib::y::TypeY;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pub use lib::module_b::TypeB;`
	`2`	`+pub type TypeA = u32;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pub use lib::module_a::TypeA;`
	`2`	`+pub type TypeB = u32;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+use lib::module_a::TypeA;`
	`2`	`+`
	`3`	`+fn main() {}`