Fixed "$" in parser

(cherry picked from commit db562ac015ffc6c1a08c226b4eef7790b21661cd)

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 15e2a6a4e170dd8db1623110d41d9aead5971294..e410d751fc5ed0d2e007fcb4e54b2e3d5255644e 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -237,6 +237,6 @@ let from_file path =
  with End_of_file ->\r
   close_in chan in\r
  let txt = String.concat "\n" (List.rev !lines) in\r
- let problems = Str.split (Str.regexp "\\$") txt in\r
+ let problems = Str.split (Str.regexp "\n\\$") txt in\r
  List.map problem_of_string (List.tl (List.map ((^) "$") problems))\r
 ;;\r

diff --git a/ocaml/problems.ml b/ocaml/problems.ml
index aed29d67a7dfc625f47dae59fce24e071ddb99ac..cd57451a70230816031c6264b75c7c16ab9f3dfe 100644 (file)
--- a/ocaml/problems.ml
+++ b/ocaml/problems.ml
@@ -17,9 +17,9 @@ let assert_unseparable x =
 
 let assert_depends x =
  let c = String.sub (Lambda4.label_of_problem x) 0 1 in
- prerr_endline(Lambda4.label_of_problem x); assert (c = "!" || c="?");
- let q = c = "!" in
- (if q then assert_separable else assert_unseparable) x
+ if c = "!" then assert_separable x
+  else if c = "?" then assert_unseparable x
+   else (solve x; ())
 ;;
 
 let main () =