ctest: add support for modules

ctest-test/build.rs

@@ -19,19 +19,19 @@ fn test_ctest() {
         .header("t1.h")
         .include("src")
         .skip_private(true)
-        .rename_fn(|f| f.link_name().unwrap_or(f.ident()).to_string().into())
-        .rename_static(|s| s.link_name().unwrap_or(s.ident()).to_string().into())
+        .rename_fn(|f| f.link_name().unwrap_or(f.path()).to_string().into())
+        .rename_static(|s| s.link_name().unwrap_or(s.path()).to_string().into())
         .rename_union_ty(|ty| (ty == "T1Union").then_some(ty.to_string()))
         .rename_struct_ty(|ty| (ty == "Transparent").then_some(ty.to_string()))
-        .volatile_struct_field(|s, f| s.ident() == "V" && f.ident() == "v")
-        .volatile_static(|s| s.ident() == "vol_ptr")
-        .volatile_static(|s| s.ident() == "T1_fn_ptr_vol")
-        .volatile_fn_arg(|f, p| f.ident() == "T1_vol0" && p.ident() == "arg0")
-        .volatile_fn_arg(|f, p| f.ident() == "T1_vol2" && p.ident() == "arg1")
-        .volatile_fn_return_type(|f| f.ident() == "T1_vol1")
-        .volatile_fn_return_type(|f| f.ident() == "T1_vol2")
+        .volatile_struct_field(|s, f| s.path() == "V" && f.ident() == "v")
+        .volatile_static(|s| s.path() == "vol_ptr")
+        .volatile_static(|s| s.path() == "T1_fn_ptr_vol")
+        .volatile_fn_arg(|f, p| f.path() == "T1_vol0" && p.ident() == "arg0")
+        .volatile_fn_arg(|f, p| f.path() == "T1_vol2" && p.ident() == "arg1")
+        .volatile_fn_return_type(|f| f.path() == "T1_vol1")
+        .volatile_fn_return_type(|f| f.path() == "T1_vol2")
         // The parameter `a` of the functions `T1r`, `T1s`, `T1t`, `T1v` is an array.
-        .array_arg(|f, p| matches!(f.ident(), "T1r" | "T1s" | "T1t" | "T1v") && p.ident() == "a")
+        .array_arg(|f, p| matches!(f.path(), "T1r" | "T1s" | "T1t" | "T1v") && p.ident() == "a")
         .skip_roundtrip(|n| n == "Arr");
     ctest::generate_test(&mut t1gen, "src/t1.rs", "t1gen.rs").unwrap();
 

ctest/src/ast/constant.rs

@@ -1,16 +1,64 @@
+use syn::{
+    Path,
+    Type,
+};
+
 use crate::BoxStr;
+use crate::ast::{
+    PathAggregateStore,
+    PathUtils,
+};
 
 /// Represents a constant variable defined in Rust.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Const {
     pub(crate) public: bool,
-    pub(crate) ident: BoxStr,
-    pub(crate) ty: syn::Type,
+    pub(crate) cached_path: BoxStr,
+    pub(crate) cached_ident: BoxStr,
+    pub(crate) path: Path,
+    pub(crate) path_aggregate: PathAggregateStore,
+    pub(crate) ty: Type,
 }
 
 impl Const {
-    /// Return the identifier of the constant as a string.
+    /// Return the full path to the constant variable as a string.
+    ///
+    /// If inside a nested module, this will return a top-level-relative path,
+    /// but not a crate-relative path. For some item `foo` in module
+    /// `crate::bar`, the returned string will be `bar::foo`, and not
+    /// `crate::bar::foo`.
+    pub fn path(&self) -> &str {
+        &self.cached_path
+    }
+
+    /// Returns the last segment of the constant's path; Namely, its identifier.
     pub fn ident(&self) -> &str {
-        &self.ident
+        &self.cached_ident
+    }
+}
+
+impl PathUtils for Const {
+    fn path_aggregate(&self) -> &PathAggregateStore {
+        &self.path_aggregate
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
+    }
+
+    fn mk(
+        self,
+        cached_path: BoxStr,
+        cached_ident: BoxStr,
+        path: Path,
+        path_aggregate: PathAggregateStore,
+    ) -> Self {
+        Self {
+            cached_path,
+            cached_ident,
+            path,
+            path_aggregate,
+            ..self
+        }
     }
 }

ctest/src/ast/field.rs

@@ -1,7 +1,7 @@
 use crate::BoxStr;
 
 /// Represents a field in a struct or union defined in Rust.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Field {
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,

ctest/src/ast/function.rs

@@ -1,3 +1,9 @@
+use syn::Path;
+
+use crate::ast::{
+    PathAggregateStore,
+    PathUtils,
+};
 use crate::{
     Abi,
     BoxStr,
@@ -7,27 +13,63 @@ use crate::{
 /// Represents a function signature defined in Rust.
 ///
 /// This structure is only used for parsing functions in extern blocks.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Fn {
     pub(crate) public: bool,
-    #[expect(unused)]
     pub(crate) abi: Abi,
-    pub(crate) ident: BoxStr,
+    pub(crate) cached_path: BoxStr,
+    pub(crate) cached_ident: BoxStr,
+    pub(crate) path: Path,
+    pub(crate) path_aggregate: PathAggregateStore,
     pub(crate) link_name: Option<BoxStr>,
-    #[expect(unused)]
     pub(crate) parameters: Vec<Parameter>,
-    #[expect(unused)]
     pub(crate) return_type: Option<syn::Type>,
 }
 
 impl Fn {
-    /// Return the identifier of the function as a string.
+    /// Return the full path to the function item as a string.
+    ///
+    /// If inside a nested module, this will return a top-level-relative path,
+    /// but not a crate-relative path. For some item `foo` in module
+    /// `crate::bar`, the returned string will be `bar::foo`, and not
+    /// `crate::bar::foo`.
+    pub fn path(&self) -> &str {
+        &self.cached_path
+    }
+
+    /// Returns the last segment of the function's path; Namely, its identifier.
     pub fn ident(&self) -> &str {
-        &self.ident
+        &self.cached_ident
     }
 
     /// Return the name of the function to be linked C side with.
     pub fn link_name(&self) -> Option<&str> {
         self.link_name.as_deref()
     }
 }
+
+impl PathUtils for Fn {
+    fn path_aggregate(&self) -> &PathAggregateStore {
+        &self.path_aggregate
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
+    }
+
+    fn mk(
+        self,
+        cached_path: BoxStr,
+        cached_ident: BoxStr,
+        path: Path,
+        addressable_paths: PathAggregateStore,
+    ) -> Self {
+        Self {
+            cached_path,
+            cached_ident,
+            path,
+            path_aggregate: addressable_paths,
+            ..self
+        }
+    }
+}