Introduce lambda expressions.

6 files changed, 11 insertions, 159 deletions

diff --git a/chomp-macro/src/lib.rs b/chomp-macro/src/lib.rs
index 67964ec..a8e4782 100644
--- a/chomp-macro/src/lib.rs
+++ b/chomp-macro/src/lib.rs
@@ -1,6 +1,6 @@
 use chomp::{
     chomp::{
-        ast::substitute::InlineCalls,
+        ast::substitute::Reduce,
         typed::{
             context::Context,
             lower::{Backend, GenerateCode},
@@ -9,20 +9,21 @@ use chomp::{
         visit::Visitable,
     },
     lower::RustBackend,
-    nibble::File,
+    nibble::{convert::{self, Convert}, Statement},
 };
-use proc_macro::TokenStream;
+use proc_macro::{Span, TokenStream};
 use syn::Error;
 
 #[proc_macro]
 pub fn nibble(item: TokenStream) -> TokenStream {
     syn::parse(item)
-        .and_then(|nibble: File| nibble.convert().map_err(Error::from))
-        .and_then(|(funs, goal)| {
-            funs.into_iter()
-                .try_rfold(goal, |goal, function| {
-                    goal.fold(&mut InlineCalls { function })
-                })
+        .and_then(|nibble: Statement| {
+            nibble
+                .convert(&mut convert::Context::default())
+                .map_err(Error::from)
+        })
+        .and_then(|expr| {
+            expr.fold(&mut Reduce)
                 .map_err(Error::from)
         })
         .and_then(|expr| {
@@ -35,7 +36,7 @@ pub fn nibble(item: TokenStream) -> TokenStream {
         .map(|typed| {
             let mut backend = RustBackend::default();
             let id = typed.gen(&mut backend);
-            backend.emit_code(None, None, id)
+            backend.emit_code(None, Span::call_site().into(), id)
         })
         .unwrap_or_else(Error::into_compile_error)
         .into()
diff --git a/chomp-macro/tests/nibble_exp.rs b/chomp-macro/tests/nibble_exp.rs
deleted file mode 100644
index 7e31e6a..0000000
--- a/chomp-macro/tests/nibble_exp.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-chomp_macro::nibble! {
-    let opt(x) = _ | x;
-    let plus(x) = [plus](x . opt(plus));
-    let star(x) = [star](opt(x . star));
-
-    let Pattern_Whitespace = "\n"|" ";
-
-    let XID_Start =
-        "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" |
-        "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" |
-        "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" |
-        "y" | "z" |
-        "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" |
-        "I" | "J" | "K" | "L" | "M" | "N" | "O" | "P" |
-        "Q" | "R" | "S" | "T" | "U" | "V" | "W" | "X" |
-        "Y" | "Z" ;
-    let XID_Continue =
-        XID_Start | "_" | "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
-
-    let literal_char = XID_Continue;
-
-    let ws = star(Pattern_Whitespace);
-    let must_ws = plus(Pattern_Whitespace);
-
-    let punctuated(x, p) = [rec](x . opt(p . ws . rec));
-    let list(x) = "(" . ws . [rec](x . opt("," . ws . opt(rec))) . ")";
-
-    let epsilon = "_";
-    let ident = XID_Start . star(XID_Continue);
-    let literal = "\"" . plus(literal_char) . "\"";
-    let parens(expr) = "(" . ws . expr . ")";
-    let fix(expr) = "[" . ws . ident . ws . "]" . ws . parens(expr);
-
-    let term(expr) =
-          epsilon . ws
-        | literal . ws
-        | parens(expr) . ws
-        | fix(expr) . ws
-        | ident . ws . opt(list(expr) . ws)
-        ;
-
-    let cat(expr) = punctuated(term(expr), ".");
-    let alt(expr) = punctuated(cat(expr), "|");
-    let expr = [expr](alt(expr));
-    match expr;
-}
-
-#[test]
-fn exp_epsilon() {
-    Ast::parse_str("_").unwrap();
-}
-
-#[test]
-fn exp_literal() {
-    Ast::parse_str(r#""foo""#).unwrap();
-}
-
-#[test]
-fn exp_cat() {
-    Ast::parse_str(r#""a" . "b""#).unwrap();
-}
-
-#[test]
-fn exp_alt() {
-    Ast::parse_str(r#""a" | "b""#).unwrap();
-}
-
-#[test]
-fn exp_ident() {
-    Ast::parse_str("foo").unwrap();
-}
-
-#[test]
-fn exp_call() {
-    Ast::parse_str(r#"opt("foo")"#).unwrap();
-}
-
-#[test]
-fn exp_fix() {
-    Ast::parse_str(r#"[rec](_ | "a" . rec)"#).unwrap();
-}
diff --git a/chomp-macro/tests/ratata.rs b/chomp-macro/tests/ratata.rs
deleted file mode 100644
index 869ad61..0000000
--- a/chomp-macro/tests/ratata.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-chomp_macro::nibble! {
-    let opt(x) = _ | x;
-    let plus(x) = [rec](x . opt(rec));
-    match plus(("r" | "t") . "a");
-}
-
-#[test]
-fn ratata_ratata() {
-    Ast::parse_str("ratata").unwrap();
-}
-
-#[test]
-fn ratata_ratarataratatata() {
-    Ast::parse_str("ratarataratatata").unwrap();
-}
diff --git a/chomp-macro/tests/regex.rs b/chomp-macro/tests/regex.rs
deleted file mode 100644
index 1e831b4..0000000
--- a/chomp-macro/tests/regex.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-chomp_macro::nibble! {
-    let opt(x) = _ | x;
-    let plus(x) = [plus](x . opt(plus));
-    let star(x) = [star](opt(x . star));
-
-    match plus("a") . star("b");
-}
-
-#[test]
-fn regex_a() {
-    Ast::parse_str("a").unwrap();
-}
-
-#[test]
-fn regex_ab() {
-    Ast::parse_str("ab").unwrap();
-}
-
-#[test]
-fn regex_aa() {
-    Ast::parse_str("aa").unwrap();
-}
-
-#[test]
-fn regex_aaaabbb() {
-    Ast::parse_str("aaaabbb").unwrap();
-}
diff --git a/chomp-macro/tests/regex_fix.rs b/chomp-macro/tests/regex_fix.rs
deleted file mode 100644
index 9842484..0000000
--- a/chomp-macro/tests/regex_fix.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-chomp_macro::nibble! {
-    let opt(x) = _ | x;
-    let ws = [star](opt(" " . star));
-
-    match [rec]("a" . opt("." . ws . rec));
-}
-
-#[test]
-fn regex_fix_cat() {
-    Ast::parse_str(r#"a. a"#).unwrap();
-}
diff --git a/chomp-macro/tests/sheep.rs b/chomp-macro/tests/sheep.rs
deleted file mode 100644
index 862e810..0000000
--- a/chomp-macro/tests/sheep.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-chomp_macro::nibble! {
-    let opt(x) = _ | x;
-    let plus(x) = [rec](x . opt(rec));
-    match "ba" . plus("a");
-}
-
-#[test]
-fn baa() {
-    Ast::parse_str("baa").unwrap();
-}
-
-#[test]
-fn baaaaaaaaaaaaaaa() {
-    Ast::parse_str("baaaaaaaaaaaaaaa").unwrap();
-}