Fix comment parser with hash vector (raviqqe#48)

Author: raviqqe

src/parse.rs

@@ -116,4 +116,16 @@ mod tests {
             )])
         );
     }
+
+    #[test]
+    fn parse_vector() {
+        assert_eq!(
+            parse("#()", Global),
+            Ok(vec![Expression::Quote(
+                "#",
+                Expression::List("(", ")", vec![], Position::new(1, 3)).into(),
+                Position::new(0, 3)
+            )])
+        );
+    }
 }

src/parse/parser.rs

@@ -36,7 +36,7 @@ pub fn comments<A: Allocator + Clone>(input: Input<A>) -> IResult<Vec<Comment, A
             map(none_of("\";#"), |_| None),
             map(raw_string, |_| None),
             map(raw_symbol, |_| None),
-            map(hash_semicolon, |_| None),
+            map(quote, |_| None),
             map(comment, Some),
         )),
         move || Vec::new_in(allocator.clone()),
@@ -104,16 +104,7 @@ fn expression<A: Allocator + Clone>(input: Input<A>) -> IResult<Expression<A>, A
         context(
             "quote",
             map(
-                token(positioned(tuple((
-                    recognize(alt((
-                        tag("'"),
-                        tag("`"),
-                        tag(","),
-                        hash_semicolon,
-                        tag("#"),
-                    ))),
-                    expression,
-                )))),
+                token(positioned(tuple((quote, expression)))),
                 move |((sign, expression), position)| {
                     Expression::Quote(&sign, Box::new_in(expression, allocator.clone()), position)
                 },
@@ -124,6 +115,10 @@ fn expression<A: Allocator + Clone>(input: Input<A>) -> IResult<Expression<A>, A
     ))(input)
 }
 
+fn quote<A: Allocator + Clone>(input: Input<A>) -> IResult<Input<A>, A> {
+    alt((tag("'"), tag("`"), tag(","), hash_semicolon, tag("#")))(input)
+}
+
 fn hash_semicolon<A: Allocator + Clone>(input: Input<A>) -> IResult<Input<A>, A> {
     tag("#;")(input)
 }
@@ -371,6 +366,28 @@ mod tests {
 
     #[test]
     fn parse_vector() {
+        assert_eq!(
+            expression(Input::new_extra("#(1 2 3)", Global)).unwrap().1,
+            Expression::Quote(
+                "#",
+                Expression::List(
+                    "(",
+                    ")",
+                    vec![
+                        Expression::Symbol("1", Position::new(2, 3)),
+                        Expression::Symbol("2", Position::new(4, 5)),
+                        Expression::Symbol("3", Position::new(6, 7))
+                    ],
+                    Position::new(1, 8)
+                )
+                .into(),
+                Position::new(0, 8)
+            )
+        );
+    }
+
+    #[test]
+    fn parse_bracket_vector() {
         assert_eq!(
             expression(Input::new_extra("[1 2 3]", Global)).unwrap().1,
             Expression::List(
@@ -602,5 +619,10 @@ mod tests {
                 vec![Comment::new("foo", Position::new(3, 7))]
             );
         }
+
+        #[test]
+        fn parse_comment_with_vector() {
+            assert_eq!(comments(Input::new_extra("#()", Global)).unwrap().1, vec![]);
+        }
     }
 }