From 854ca287626643facb66a9f260f126a8801572c4 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Tue, 29 Jan 2002 14:55:44 +0000 Subject: [PATCH] Ported to ocaml-3.04 --- helm/fix_params/Makefile | 2 +- helm/metadata/create2/mk_forward/Makefile | 2 +- helm/ocaml/cic_proof_checking/cicEnvironment.ml | 2 +- helm/proofChecker/proofChecker.ml | 3 +++ helm/proofChecker/proofChecker.pl | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/helm/fix_params/Makefile b/helm/fix_params/Makefile index 29a6a9682..92ac930bc 100644 --- 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 f24c47a66..3eccfbf95 100644 --- 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 5d4261c90..9d93c443e 100644 --- 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 d7cf69284..3ef0db2e8 100644 --- 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 9d6346afe..fde4b43ea 100755 --- a/helm/proofChecker/proofChecker.pl +++ b/helm/proofChecker/proofChecker.pl @@ -48,7 +48,7 @@ while(true) { EOT while(chomp($_ = )) { last if ($_ eq "END"); - print $c $_; + print $c $_."\n"; } print $c <Done. -- 2.39.2