Fixed "$" in parser

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 726d076357f77539add48e69cdb04b9efb975367..f5b7d7d1173097feffd36cf74bb14dbb921cff08 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -260,6 +260,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 0374b4787472f9ac910f778c90bea30d28b43f62..bd3e880092291adc104a140a3604e0a5917d0e6a 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 (fst x)) 0 1 in
- prerr_endline(Lambda4.label_of_problem (fst 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 () =