seam

commit 3af2f6a13442873e1351aea20f4d66ae57baaad2
parent 8f18ae664e32dd9d22304be4753169998ae62f11
Author: Demonstrandum <samuel@knutsen.co>
Date:   Thu,  5 Dec 2024 00:03:16 +0000

fix: %apply, %map and %filter now work with built-in macros as well.

Diffstat:
M
Cargo.lock
 | 
2
+-
M
crates/seam/Cargo.toml
 | 
2
+-
M
crates/seam/src/parse/expander.rs
 | 
36
++++++++++--------------------------

3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -215,7 +215,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "seam"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "chrono",
  "colored",
diff --git a/crates/seam/Cargo.toml b/crates/seam/Cargo.toml
@@ -5,7 +5,7 @@ keywords = ["markup", "lisp", "macro", "symbolic-expression", "sexp"]
 license-file = "../../LICENSE"
 readme = "../../README.md"
 homepage = "https://git.knutsen.co/seam"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Demonstrandum <samuel@knutsen.co>"]
 edition = "2021"
 
diff --git a/crates/seam/src/parse/expander.rs b/crates/seam/src/parse/expander.rs
@@ -369,16 +369,20 @@ impl<'a> Expander<'a> {
             for (keyword, _) in rhs {
                 excess_keywords.push(keyword.as_ref());
             }
+            let excess_keywords: Vec<String> = excess_keywords
+                .iter()
+                .map(|kw| format!("`:{}`", kw))
+                .collect();
             let known_keywords: Vec<String> = lhs_named
                 .iter()
-                .map(|(kw, _)| format!(":{}", kw))
+                .map(|(kw, _)| format!("`:{}`", kw))
                 .collect();
             let known_keywords = known_keywords.join(", ");
             let excess_keywords = excess_keywords.join(", ");
             return Err(ExpansionError(
                 format!(concat!(
-                        "Unknown excess keywords provided, namely: {}.",
-                        "\n", "Expected one of: {}."
+                        "Unknown excess keywords provided: {};",
+                        " expected keyword arguments are: {}."
                     ),
                     excess_keywords,
                     known_keywords,
@@ -815,8 +819,6 @@ impl<'a> Expander<'a> {
         ]))
     }
 
-
-
     fn expand_map_macro(&self, node: &ParseNode<'a>, params: ParseTree<'a>)
     -> Result<ParseTree<'a>, ExpansionError<'a>> {
         let params = self.expand_nodes(params)?; // Eager.
@@ -825,14 +827,9 @@ impl<'a> Expander<'a> {
             rest: any,
         }?;
 
-        let Some(found) = self.get_variable(&args.number.1.value) else {
-            return Err(ExpansionError::new("Unknown macro.", &args.number.1.site));
-        };
-
-        let callee = ParseNode::Symbol(args.number.1);
         let mut expanded = vec![];
         for arg in args.rest {
-            expanded.extend(self.apply_macro(found.clone(), &callee, Box::new([arg]))?);
+            expanded.extend(self.expand_invocation(args.number.1.value.as_ref(), node, Box::new([arg]))?);
         }
         Ok(expanded.into_boxed_slice())
     }
@@ -846,14 +843,9 @@ impl<'a> Expander<'a> {
             rest: any,
         }?;
 
-        let Some(found) = self.get_variable(&args.number.1.value) else {
-            return Err(ExpansionError::new("Unknown macro.", &args.number.1.site));
-        };
-
-        let callee = ParseNode::Symbol(args.number.1);
         let mut expanded = vec![];
         for arg in args.rest {
-            let nodes = self.apply_macro(found.clone(), &callee, Box::new([arg]))?;
+            let nodes = self.expand_invocation(args.number.1.value.as_ref(), node, Box::new([arg]))?;
             match &*nodes {
                 [node,] if node.null() => {},
                 _ => expanded.extend(nodes),
@@ -913,15 +905,7 @@ impl<'a> Expander<'a> {
             rest: any,
         }?;
 
-        let Some(found) = self.get_variable(args.number.1.value.as_ref()) else {
-            return Err(ExpansionError(
-                format!("No such macro found under the name `{}`.", args.number.1.value),
-                args.number.1.site.clone(),
-            ))
-        };
-
-        let callee = &ParseNode::Symbol(args.number.1);
-        self.apply_macro(found, callee, args.rest.into_boxed_slice())
+        self.expand_invocation(args.number.1.value.as_ref(), node, args.rest.into_boxed_slice())
     }
 
     fn expand_lambda_macro(&self, node: &ParseNode<'a>, params: ParseTree<'a>)