Implement Kevin's second review

calyxir · Nov 21, 2024 · cedaf99 · cedaf99
1 parent 6ce0fb6
commit cedaf99
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tools/calyx-ffi-macro/Cargo.toml b/tools/calyx-ffi-macro/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 proc-macro2 = "1.0.86"
 quote = "1.0.36"
 syn = { version = "2.0.69", features = ["full", "visit"] }
+interp = { path = "../../interp" }
 calyx-utils.workspace = true
 calyx-frontend.workspace = true
 calyx-ir.workspace = true
-# bigint = "4.4.3"
diff --git a/tools/calyx-ffi-macro/src/calyx.rs b/tools/calyx-ffi-macro/src/calyx.rs
@@ -19,7 +19,7 @@ pub fn parse_calyx_file(
     args: &CalyxFFIMacroArgs,
     file: PathBuf,
 ) -> Result<CalyxComponent, TokenStream> {
-    // there has to be a better way to find lib
+    // TODO(ethan): there has to be a better way to find lib
     let home_dir = env::var("HOME").expect("user home not set");
     let mut lib_path = PathBuf::from(home_dir);
     lib_path.push(".calyx");

diff --git a/tools/calyx-ffi-macro/src/lib.rs b/tools/calyx-ffi-macro/src/lib.rs
@@ -11,9 +11,6 @@ mod calyx;
 mod parse;
 mod util;
 
-// this is super bad, might go out of sync with interp::WidthInt
-type WidthInt = u32;
-
 /// Connects this `struct` to a calyx component in the given file.
 #[proc_macro_attribute]
 pub fn calyx_ffi(attrs: TokenStream, item: TokenStream) -> TokenStream {
@@ -66,7 +63,7 @@ pub fn calyx_ffi(attrs: TokenStream, item: TokenStream) -> TokenStream {
 
         port_names.push(port_name.clone());
 
-        let port_width = port.borrow().width as WidthInt;
+        let port_width = port.borrow().width as interp::WidthInt;
         let width_getter = format_ident!("{}_width", port_name);
         width_getters.push(quote! {
             pub const fn #width_getter() -> calyx_ffi::value::WidthInt {