Break amount expression parsing into multiple parts

1 files changed, 19 insertions, 1 deletions

diff --git a/src/parser.rs b/src/parser.rs
index 0a2ecb8..9ca8f16 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -138,10 +138,17 @@ pub enum Iterspec {
 
 use nom::whitespace::sp;
 
+named!(amount_expr_next<(Operator, Box<AmountExpr>)>, do_parse!(
+    op:operator_parser
+    >> opt!(sp)
+    >> amexp:amount_expr
+    >> ((op, Box::new(amexp)))
+));
+
 named!(amount_expr<AmountExpr>, do_parse!(
     amount:amount_parser >>
     opt!(sp) >>
-    o: opt!(do_parse!(op:operator_parser >> opt!(sp) >> amexp:amount_expr >> ((op, Box::new(amexp))))) >>
+    o: opt!(amount_expr_next) >>
     (AmountExpr { amount: amount, next: o, })
 ));
 
@@ -285,6 +292,17 @@ mod tests {
     }
 
     #[test]
+    fn test_amountexpr_next() {
+        assert_eq!(amount_expr_next(&b"+ 12minutes"[..]),
+            IResult::Done(&b""[..],
+                (
+                    Operator::Plus,
+                    Box::new(AmountExpr { amount: Amount(12, Unit::Minute), next: None })
+                )
+        ));
+    }
+
+    #[test]
     fn test_amountexpr() {
         assert_eq!(amount_expr(&b"5minutes"[..]),
             IResult::Done(&b""[..],