refactor interpreter compilation

cucapra · Dec 1, 2023 · 6b6e1db · 6b6e1db
1 parent 15b78a1
commit 6b6e1db
Show file tree

Hide file tree

Showing 3 changed files with 290 additions and 162 deletions.
diff --git a/src/ir/analysis.rs b/src/ir/analysis.rs
@@ -4,6 +4,7 @@
 
 use crate::ir::{Context, Expr, ExprRef, GetNode, SignalInfo, SignalKind, State, TransitionSystem};
 use std::collections::HashMap;
+use std::ops::Index;
 
 pub fn find_expr_with_multiple_uses(ctx: &Context, sys: &TransitionSystem) -> Vec<ExprRef> {
     let counts = count_expr_uses(ctx, sys);
@@ -81,7 +82,7 @@ pub fn is_usage_root_signal(info: &SignalInfo) -> bool {
 
 /// A dense hash map to store meta-data related to each expression
 #[derive(Debug, Default)]
-struct ExprMetaData<T: Default + Clone> {
+pub struct ExprMetaData<T: Default + Clone> {
     inner: Vec<T>,
     default: T,
 }
@@ -104,6 +105,22 @@ impl<T: Default + Clone> ExprMetaData<T> {
     }
 }
 
+impl<T: Default + Clone> Index<ExprRef> for ExprMetaData<T> {
+    type Output = T;
+
+    fn index(&self, index: ExprRef) -> &Self::Output {
+        self.get(index)
+    }
+}
+
+impl<T: Default + Clone> Index<&ExprRef> for ExprMetaData<T> {
+    type Output = T;
+
+    fn index(&self, index: &ExprRef) -> &Self::Output {
+        self.get(*index)
+    }
+}
+
 pub trait ForEachChild<T> {
     fn for_each_child(&self, visitor: impl FnMut(&T));
 }

diff --git a/src/ir/mod.rs b/src/ir/mod.rs
@@ -9,7 +9,7 @@ mod type_check;
 
 pub use analysis::{
     count_expr_uses, count_expr_uses_without_init, find_expr_with_multiple_uses,
-    is_usage_root_signal, ForEachChild,
+    is_usage_root_signal, ExprMetaData, ForEachChild,
 };
 pub use expr::{
     bv_value_fits_width, AddNode, ArrayType, BVLiteralInt, Context, Expr, ExprNodeConstruction,