Ported to ocaml-3.04

diff --git a/helm/fix_params/Makefile b/helm/fix_params/Makefile
index 29a6a968285410f36ec0cabb4d38455ef8542dff..92ac930bc9827e6ba8edb21531bd563fb28c5e86 100644 (file)
--- a/helm/fix_params/Makefile
+++ b/helm/fix_params/Makefile
@@ -1,6 +1,6 @@
 REQUIRES = helm-getter helm-cic_cache helm-xml
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLDEP = ocamldep
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)

diff --git a/helm/metadata/create2/mk_forward/Makefile b/helm/metadata/create2/mk_forward/Makefile
index f24c47a669f0ef8fb50be8d8247053b40ccb2ee0..3eccfbf95e97a20ba686b2cf301e46a7905aa6d5 100644 (file)
--- a/helm/metadata/create2/mk_forward/Makefile
+++ b/helm/metadata/create2/mk_forward/Makefile
@@ -1,6 +1,6 @@
 REQUIRES = helm-xml helm-cic_proof_checking
 PREDICATES = miniReduction
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLDEP = ocamldep
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)

diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml
index 5d4261c90a68a957697652ba6a7daf21fdc24844..9d93c443e44479248c793cac425ed9427801c332 100644 (file)
--- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml
+++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml
@@ -153,7 +153,7 @@ module Cache :
     with
      Not_found -> raise (CouldNotUnfreeze (UriManager.string_of_uri uri))
    ;;
-   let find_cooked (uri,cookingsno)= CacheOfCookedObjects.find uri cookingsno;;
+   let find_cooked ~key:(uri,cookingsno)= CacheOfCookedObjects.find uri cookingsno;;
   end
 ;;
 

diff --git a/helm/proofChecker/proofChecker.ml b/helm/proofChecker/proofChecker.ml
index d7cf692849933d6a51fb0ac07b1b73ee882f0129..3ef0db2e8e2e6e9215a753540ff4cfeabf255959 100644 (file)
--- a/helm/proofChecker/proofChecker.ml
+++ b/helm/proofChecker/proofChecker.ml
@@ -58,4 +58,7 @@ List of options:"
 ;;
 
 CicCooking.init() ;
+Logger.log_callback :=
+ (Logger.log_to_html
+   ~print_and_flush:(function s -> print_string s ; flush stdout)) ;
 main ();;

diff --git a/helm/proofChecker/proofChecker.pl b/helm/proofChecker/proofChecker.pl
index 9d6346afefb1fd855623d7d12c2b01f3f258e7da..fde4b43eaf3fa924a626d98f3ecff4a2b7102ce2 100755 (executable)
--- a/helm/proofChecker/proofChecker.pl
+++ b/helm/proofChecker/proofChecker.pl
@@ -48,7 +48,7 @@ while(true) {
 EOT
        while(chomp($_ = <PC_OUT>)) {
          last if ($_ eq "END");
-         print $c $_;
+         print $c $_."\n";
        }
        print $c <<EOT;
 <h1>Done.</h1>