Split Op enum into separate types (#8)

* Split Op enum * Make AstNode generic * Fix op.rs and node.rs * Resolve errors * Complete op-split refactor * cargo fmt --------- Co-authored-by: Kevin Phoenix <[email protected]>
twizmwazin · Oct 28, 2024 · a366e66 · a366e66
1 parent 48d34f5
commit a366e66
Show file tree

Hide file tree

Showing 23 changed files with 1,595 additions and 1,567 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,8 @@
 [workspace]
-members = ["crates/*"]
+members = [
+    "crates/clarirs_num",
+    "crates/clarirs_core",
+]
 resolver = "2"
 
 [workspace.package]

diff --git a/crates/clarirs_core/Cargo.toml b/crates/clarirs_core/Cargo.toml
@@ -14,6 +14,7 @@ ahash = "0.8.11"
 anyhow = "1.0.86"
 clarirs_num = { path = "../clarirs_num" }
 num-bigint = { version = "0.4.6", features = ["serde"] }
+paste = "1.0.15"
 petgraph = "0.6.5"
 rand = { version = "0.8.5", features = [ "small_rng"] }
 serde = { version = "1.0.209", features = ["derive", "rc"] }

diff --git a/crates/clarirs_core/src/algorithms/join.rs b/crates/clarirs_core/src/algorithms/join.rs
@@ -1,23 +1,23 @@
 use crate::prelude::*;
 
 pub trait Join<'c> {
-    fn and_join(self, ctx: &'c Context<'c>) -> Result<AstRef<'c>, ClarirsError>;
-    fn or_join(self, ctx: &'c Context<'c>) -> Result<AstRef<'c>, ClarirsError>;
+    fn and_join(self, ctx: &'c Context<'c>) -> Result<BoolAst<'c>, ClarirsError>;
+    fn or_join(self, ctx: &'c Context<'c>) -> Result<BoolAst<'c>, ClarirsError>;
 }
 
-impl<'c, T: IntoIterator<Item = AstRef<'c>>> Join<'c> for T {
-    fn and_join(self, ctx: &'c Context<'c>) -> Result<AstRef<'c>, ClarirsError> {
+impl<'c, T: IntoIterator<Item = BoolAst<'c>>> Join<'c> for T {
+    fn and_join(self, ctx: &'c Context<'c>) -> Result<BoolAst<'c>, ClarirsError> {
         and_join(ctx, self)
     }
 
-    fn or_join(self, ctx: &'c Context<'c>) -> Result<AstRef<'c>, ClarirsError> {
+    fn or_join(self, ctx: &'c Context<'c>) -> Result<BoolAst<'c>, ClarirsError> {
         or_join(ctx, self)
     }
 }
 
-pub fn and_join<'c, I>(ctx: &'c Context<'c>, asts: I) -> Result<AstRef<'c>, ClarirsError>
+pub fn and_join<'c, I>(ctx: &'c Context<'c>, asts: I) -> Result<BoolAst<'c>, ClarirsError>
 where
-    I: IntoIterator<Item = AstRef<'c>>,
+    I: IntoIterator<Item = BoolAst<'c>>,
 {
     let mut result = ctx.true_()?;
     for ast in asts.into_iter() {
@@ -29,9 +29,9 @@ where
     Ok(result)
 }
 
-pub fn or_join<'c, I>(ctx: &'c Context<'c>, asts: I) -> Result<AstRef<'c>, ClarirsError>
+pub fn or_join<'c, I>(ctx: &'c Context<'c>, asts: I) -> Result<BoolAst<'c>, ClarirsError>
 where
-    I: IntoIterator<Item = AstRef<'c>>,
+    I: IntoIterator<Item = BoolAst<'c>>,
 {
     let mut result = ctx.false_()?;
     for ast in asts.into_iter() {