Merge pull request #74 from mattjbray/many-till-lazy

many_till: Don't be greedy.

lib/angstrom.ml

@@ -675,7 +675,7 @@ let many1 p =
 
 let many_till p t =
   fix (fun m ->
-    (lift2 cons p m) <|> (t *> return []))
+    (t *> return []) <|> (lift2 cons p m))
 
 let sep_by1 s p =
   fix (fun m ->

lib_test/test_angstrom.ml

@@ -271,6 +271,9 @@ let combinators =
         check_lc ~msg:"single char"   (many (char 'a')) ["a"] ['a'];
         check_lc ~msg:"two chars"     (many (char 'a')) ["aa"] ['a'; 'a'];
       end
+  ; "many_till", `Quick, begin fun () ->
+      check_lc ~msg:"not greedy" (many_till any_char (char '-')) ["ab-ab-"] ['a'; 'b'];
+    end
   ; "sep_by1", `Quick, begin fun () ->
       let parser = sep_by1 (char ',') (char 'a') in
       check_lc ~msg:"single char"     parser ["a"]    ['a'];