Splicing unquote (raviqqe#54)

- Parse splicing unquote
- Fix

Author: raviqqe

src/parse/parser.rs

@@ -116,7 +116,14 @@ fn expression<A: Allocator + Clone>(input: Input<A>) -> IResult<Expression<A>, A
 }
 
 fn quote<A: Allocator + Clone>(input: Input<A>) -> IResult<Input<A>, A> {
-    alt((tag("'"), tag("`"), tag(","), hash_semicolon, tag("#")))(input)
+    alt((
+        tag("'"),
+        tag("`"),
+        tag(",@"),
+        tag(","),
+        hash_semicolon,
+        tag("#"),
+    ))(input)
 }
 
 fn hash_semicolon<A: Allocator + Clone>(input: Input<A>) -> IResult<Input<A>, A> {
@@ -425,84 +432,118 @@ mod tests {
         );
     }
 
-    #[test]
-    fn parse_quote() {
-        assert_eq!(
-            expression(Input::new_extra("'foo", Global)).unwrap().1,
-            Expression::Quote(
-                "'",
-                Expression::Symbol("foo", Position::new(1, 4)).into(),
-                Position::new(0, 4)
-            )
-        );
-    }
+    mod quote {
+        use super::*;
+        use pretty_assertions::assert_eq;
 
-    #[test]
-    fn parse_quote_with_correct_position() {
-        assert_eq!(
-            expression(Input::new_extra(" 'foo", Global)).unwrap().1,
-            Expression::Quote(
-                "'",
-                Expression::Symbol("foo", Position::new(2, 5)).into(),
-                Position::new(1, 5)
-            )
-        );
-    }
+        #[test]
+        fn parse_quote() {
+            assert_eq!(
+                expression(Input::new_extra("'foo", Global)).unwrap().1,
+                Expression::Quote(
+                    "'",
+                    Expression::Symbol("foo", Position::new(1, 4)).into(),
+                    Position::new(0, 4)
+                )
+            );
+        }
 
-    #[test]
-    fn parse_unquote() {
-        assert_eq!(
-            expression(Input::new_extra(",foo", Global)).unwrap().1,
-            Expression::Quote(
-                ",",
-                Expression::Symbol("foo", Position::new(1, 4)).into(),
-                Position::new(0, 4)
-            )
-        );
-    }
+        #[test]
+        fn parse_quote_with_correct_position() {
+            assert_eq!(
+                expression(Input::new_extra(" 'foo", Global)).unwrap().1,
+                Expression::Quote(
+                    "'",
+                    Expression::Symbol("foo", Position::new(2, 5)).into(),
+                    Position::new(1, 5)
+                )
+            );
+        }
 
-    #[test]
-    fn parse_hash_quote() {
-        assert_eq!(
-            expression(Input::new_extra("#()", Global)).unwrap().1,
-            Expression::Quote(
-                "#",
-                Expression::List("(", ")", vec![], Position::new(1, 3)).into(),
-                Position::new(0, 3)
-            )
-        );
-    }
+        #[test]
+        fn parse_unquote() {
+            assert_eq!(
+                expression(Input::new_extra(",foo", Global)).unwrap().1,
+                Expression::Quote(
+                    ",",
+                    Expression::Symbol("foo", Position::new(1, 4)).into(),
+                    Position::new(0, 4)
+                )
+            );
+        }
 
-    #[test]
-    fn parse_hash_semicolon_quote() {
-        assert_eq!(
-            expression(Input::new_extra("#;()", Global)).unwrap().1,
-            Expression::Quote(
-                "#;",
-                Expression::List("(", ")", vec![], Position::new(2, 4)).into(),
-                Position::new(0, 4)
-            )
-        );
-    }
+        #[test]
+        fn parse_hash_quote() {
+            assert_eq!(
+                expression(Input::new_extra("#()", Global)).unwrap().1,
+                Expression::Quote(
+                    "#",
+                    Expression::List("(", ")", vec![], Position::new(1, 3)).into(),
+                    Position::new(0, 3)
+                )
+            );
+        }
 
-    #[test]
-    fn parse_shebang() {
-        assert_eq!(
-            hash_directive(Input::new_extra("#!/bin/sh\n", Global))
-                .unwrap()
-                .1,
-            HashDirective::new("!/bin/sh", Position::new(0, 9))
-        );
+        #[test]
+        fn parse_hash_semicolon_quote() {
+            assert_eq!(
+                expression(Input::new_extra("#;()", Global)).unwrap().1,
+                Expression::Quote(
+                    "#;",
+                    Expression::List("(", ")", vec![], Position::new(2, 4)).into(),
+                    Position::new(0, 4)
+                )
+            );
+        }
+
+        #[test]
+        fn parse_quasi_quote() {
+            assert_eq!(
+                expression(Input::new_extra("`foo", Global)).unwrap().1,
+                Expression::Quote(
+                    "`",
+                    Expression::Symbol("foo", Position::new(1, 4)).into(),
+                    Position::new(0, 4)
+                )
+            );
+        }
+
+        #[test]
+        fn parse_splicing_unquote() {
+            assert_eq!(
+                expression(Input::new_extra(",@foo", Global)).unwrap().1,
+                Expression::Quote(
+                    ",@",
+                    Expression::Symbol("foo", Position::new(2, 5)).into(),
+                    Position::new(0, 5)
+                )
+            );
+        }
     }
 
-    #[test]
-    fn parse_lang_directive() {
-        assert_eq!(
-            hash_directive(Input::new_extra("#lang r7rs\n", Global))
-                .unwrap()
-                .1,
-            HashDirective::new("lang r7rs", Position::new(0, 10))
-        );
+    mod hash_directive {
+        use super::*;
+        use pretty_assertions::assert_eq;
+
+        #[test]
+        fn parse_shebang() {
+            assert_eq!(
+                hash_directive(Input::new_extra("#!/bin/sh\n", Global))
+                    .unwrap()
+                    .1,
+                HashDirective::new("!/bin/sh", Position::new(0, 9))
+            );
+        }
+
+        #[test]
+        fn parse_lang_directive() {
+            assert_eq!(
+                hash_directive(Input::new_extra("#lang r7rs\n", Global))
+                    .unwrap()
+                    .1,
+                HashDirective::new("lang r7rs", Position::new(0, 10))
+            );
+        }
     }
 
     mod string {