Fix strings with comments inside

rustwasm · Nov 16, 2018 · 03c1c48 · 03c1c48
1 parent 48a6440
commit 03c1c48
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/whitespace.rs b/src/whitespace.rs
@@ -27,18 +27,12 @@ pub fn sp(input: CompleteStr) -> IResult<CompleteStr, CompleteStr> {
 macro_rules! ws (
     ($i:expr, $($args:tt)*) => ({
         use $crate::whitespace::sp;
-        use $crate::nom::Convert;
-        use $crate::nom::Err;
-        use $crate::nom::lib::std::result::Result::*;
 
-        match sep!($i, sp, $($args)*) {
-            Err(e) => Err(e),
-            Ok((i1, o)) => {
-                match (sp)(i1) {
-                    Err(e) => Err(Err::convert(e)),
-                    Ok((i2, _)) => Ok((i2, o))
-                }
-            }
-        }
+        do_parse!($i,
+            sp >>
+            s: $($args)* >>
+            sp >>
+            (s)
+        )
     });
 );