incorporate feedback

src/lib.rs

@@ -3,8 +3,8 @@ use std::sync::Arc;
 use sugar::{For, WithRuleset};
 
 mod rational;
-mod sugar;
 pub use rational::*;
+mod sugar;
 
 pub fn new_experimental_egraph() -> EGraph {
     let mut egraph = EGraph::default();

src/sugar/for.rs

@@ -0,0 +1,57 @@
+use egglog::{ast::*, util::FreshGen};
+
+pub struct For;
+
+impl Macro<Vec<Command>> for For {
+    fn get_head(&self) -> String {
+        "for".to_string()
+    }
+
+    fn parse(
+        &self,
+        args: &[Sexp],
+        span: Span,
+        parser: &mut Parser,
+    ) -> Result<Vec<Command>, ParseError> {
+        if args.len() != 2 {
+            return Err(ParseError::new(span, "expected (for <query> <action>)"));
+        }
+
+        let ruleset = parser.symbol_gen.fresh(&"for_ruleset".into());
+        let rulename = parser.symbol_gen.fresh(&"for_rule".into());
+        let query = args[0]
+            .expect_list("query")?
+            .iter()
+            .map(|s| parser.parse_fact(s))
+            .collect::<Result<Vec<_>, _>>()?;
+        let action = args[1]
+            .expect_list("action")?
+            .iter()
+            .map(|s| parser.parse_action(s))
+            .collect::<Result<Vec<_>, _>>()?
+            .into_iter()
+            .flatten()
+            .collect::<Vec<_>>();
+        let rule = Rule {
+            span: span.clone(),
+            head: Actions::new(action),
+            body: query,
+        };
+
+        Ok(vec![
+            Command::AddRuleset(ruleset),
+            Command::Rule {
+                name: rulename,
+                ruleset,
+                rule,
+            },
+            Command::RunSchedule(Schedule::Run(
+                span,
+                RunConfig {
+                    ruleset,
+                    until: None,
+                },
+            )),
+        ])
+    }
+}

src/sugar/mod.rs

@@ -0,0 +1,4 @@
+mod r#for;
+pub use r#for::*;
+mod with_ruleset;
+pub use with_ruleset::*;

src/sugar.rs → src/sugar/with_ruleset.rs

@@ -1,4 +1,4 @@
-use egglog::{ast::*, util::FreshGen};
+use egglog::ast::*;
 
 pub struct WithRuleset;
 
@@ -82,57 +82,3 @@ impl Macro<Vec<Command>> for WithRuleset {
         }
     }
 }
-
-pub struct For;
-
-impl Macro<Vec<Command>> for For {
-    fn get_head(&self) -> String {
-        "for".to_string()
-    }
-
-    fn parse(
-        &self,
-        args: &[Sexp],
-        span: Span,
-        parser: &mut Parser,
-    ) -> Result<Vec<Command>, ParseError> {
-        if args.len() != 2 {
-            return Err(ParseError::new(span, "expected (for <query> <action>)"));
-        }
-        let ruleset = parser.symbol_gen.fresh(&"for_ruleset".into());
-        let rulename = parser.symbol_gen.fresh(&"for_rule".into());
-        let query = args[0]
-            .expect_list("query")?
-            .iter()
-            .map(|s| parser.parse_fact(s))
-            .collect::<Result<Vec<_>, _>>()?;
-        let action = args[1]
-            .expect_list("action")?
-            .iter()
-            .map(|s| parser.parse_action(s))
-            .collect::<Result<Vec<_>, _>>()?
-            .into_iter()
-            .flatten()
-            .collect::<Vec<_>>();
-        let rule = Rule {
-            span: span.clone(),
-            head: Actions::new(action),
-            body: query,
-        };
-        Ok(vec![
-            Command::AddRuleset(ruleset),
-            Command::Rule {
-                name: rulename,
-                ruleset,
-                rule,
-            },
-            Command::RunSchedule(Schedule::Run(
-                span,
-                RunConfig {
-                    ruleset,
-                    until: None,
-                },
-            )),
-        ])
-    }
-}