Make trywhy3 compatible with recent versions of js_of_ocaml.

Makefile.in

@@ -1576,7 +1576,7 @@ endif
 
 ALTERGODIR=src/trywhy3/alt-ergo
 
-JSOCAMLC=ocamlfind ocamlc -package js_of_ocaml -g -package js_of_ocaml.syntax \
+JSOCAMLC=ocamlfind ocamlc -package js_of_ocaml -g -package js_of_ocaml.ppx \
         -package ocplib-simplex -I src/trywhy3 \
 	-I $(ALTERGODIR)/lib/util \
 	-I $(ALTERGODIR)/lib/structures \
@@ -1700,8 +1700,6 @@ src/trywhy3/%.cmi: src/trywhy3/%.mli
 
 src/trywhy3/%.cmo: BFLAGS += -w -48
 
-src/trywhy3/worker_proto.cmo src/trywhy3/trywhy3.cmo: BFLAGS += -syntax camlp4o
-
 clean::
 	rm -f src/trywhy3/trywhy3.js src/trywhy3/trywhy3.byte src/trywhy3/trywhy3.cm* \
 	 src/trywhy3/why3_worker.js src/trywhy3/why3_worker.byte src/trywhy3/why3_worker.cm* \

src/trywhy3/.merlin

-PKG js_of_ocaml js_of_ocaml.syntax ocplib-simplex
+PKG js_of_ocaml js_of_ocaml.ppx ocplib-simplex
 REC

src/trywhy3/alt_ergo_worker.ml

@@ -12,6 +12,7 @@
 open Format
 open Worker_proto
 
+module Worker = Js_of_ocaml.Worker
 module SAT = (val (Sat_solver.get_current ()) : Sat_solver_sig.S)
 module FE = Frontend.Make (SAT)
 

src/trywhy3/why3_worker.ml

@@ -18,7 +18,8 @@ open Why3
 open Format
 open Worker_proto
 
-
+module Sys_js = Js_of_ocaml.Sys_js
+module Worker = Js_of_ocaml.Worker
 
 let () = log_time ("Initialising why3 worker: start ")
 

src/trywhy3/worker_proto.ml

@@ -45,6 +45,6 @@ let status_of_result = function
 
 let log s = ignore (Firebug.console ## log (Js.string s))
 let log_time s =
-  let date = jsnew Js.date_now () in
-  let date_str = string_of_float ((date ## getTime ()) /. 1000.) in
+  let date = new%js Js.date_now in
+  let date_str = string_of_float (date ## getTime /. 1000.) in
   log (date_str ^ " : " ^ s)