Merge pull request #146 from inhabitedtype/fix-choice-commit

fix-choice-commit: check parser_committed_bytes

lib/parser.ml

@@ -140,7 +140,7 @@ module Choice = struct
          * of the committed input, then calling the failure continuation will
          * have the effect of unwinding all choices and collecting marks along
          * the way. *)
-        if pos < Input.client_committed_bytes input' then
+        if pos < Input.parser_committed_bytes input' then
           fail input' pos' more marks msg
         else
           q.run input' pos more' fail succ in

lib_test/test_angstrom.ml

@@ -347,6 +347,19 @@ let count_while_regression =
       (take_while1 (fun _ -> true) <* end_of_input) ["asdf"; ""] "asdf";
   end ]
 
+let choice_commit = 
+  [ "", `Quick, begin fun () ->
+    let p = 
+      choice  [ string "@@" *> commit *> char '*'
+              ; string "@"  *> commit *> char '!' ]
+    in
+    Alcotest.(check (result reject string))
+      "commit to branch"
+      (Error ": char '*'")
+      (parse_string p "@@^");
+  end ]
+
+
 let () =
   Alcotest.run "test suite"
     [ "basic constructors"    , basic_constructors
@@ -358,4 +371,5 @@ let () =
     ; "combinators"           , combinators
     ; "incremental input"     , incremental 
     ; "count_while regression", count_while_regression
+    ; "choice and commit"     , choice_commit
   ]