commit af2557ec0802797d42e404ea948e707b825b8fc1
author David Tolnay <dtolnay@gmail.com> Mon Oct 24 11:52:21 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Mon Oct 24 11:52:21 2016 -0700
tree 12a09e2ab3cdeb959b4b086a8bc63ddf7289f130
parent 8a19e6d8b9b4c63b223381fc68321305d8fee2d8

Work around parsing ambiguity involving struct literals

src/nom.rs

diff --git a/src/nom.rs b/src/nom.rs
index 8586ff3..e313be2 100644
--- a/src/nom.rs
+++ b/src/nom.rs
@@ -25,8 +25,8 @@
 }
 
 macro_rules! call {
-    ($i:expr, $fun:expr) => {
-        $fun($i)
+    ($i:expr, $fun:expr $(, $args:expr)*) => {
+        $fun($i $(, $args)*)
     };
 }
 
@@ -78,6 +78,20 @@
     };
 }
 
+macro_rules! cond_reduce {
+    ($i:expr, $cond:expr, $submac:ident!( $($args:tt)* )) => {
+        if $cond {
+            $submac!($i, $($args)*)
+        } else {
+            $crate::nom::IResult::Error
+        }
+    };
+
+    ($i:expr, $cond:expr, $f:expr) => {
+        cond_reduce!($i, $cond, call!($f));
+    };
+}
+
 macro_rules! preceded {
     ($i:expr, $submac:ident!( $($args:tt)* ), $submac2:ident!( $($args2:tt)* )) => {
         match tuple!($i, $submac!($($args)*), $submac2!($($args2)*)) {