porting to recent ocaml

diff --git a/matita/matita/.depend.opt b/matita/matita/.depend.opt
index 447ce30aaed82deb2ede210c8bc1211e4a6fdce7..f1994ce595bd41e306aae2c28d10bfb7a7b36b93 100644 (file)
--- a/matita/matita/.depend.opt
+++ b/matita/matita/.depend.opt
@@ -1,47 +1,117 @@
-applyTransformation.cmx : applyTransformation.cmi
+applyTransformation.cmx : \
+    applyTransformation.cmi
 applyTransformation.cmi :
 buildTimeConf.cmx :
-cicMathView.cmx : matitaMisc.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
-    buildTimeConf.cmx applyTransformation.cmx cicMathView.cmi
-cicMathView.cmi : matitaGuiTypes.cmi applyTransformation.cmi
-lablGraphviz.cmx : lablGraphviz.cmi
+cicMathView.cmx : \
+    matitaMisc.cmx \
+    matitaGuiTypes.cmi \
+    matitaGtkMisc.cmx \
+    buildTimeConf.cmx \
+    applyTransformation.cmx \
+    cicMathView.cmi
+cicMathView.cmi : \
+    matitaGuiTypes.cmi \
+    applyTransformation.cmi
+lablGraphviz.cmx : \
+    lablGraphviz.cmi
 lablGraphviz.cmi :
-matita.cmx : predefined_virtuals.cmx matitaScript.cmx matitaMisc.cmx \
-    matitaInit.cmx matitaGui.cmx buildTimeConf.cmx applyTransformation.cmx
-matitaEngine.cmx : applyTransformation.cmx matitaEngine.cmi
-matitaEngine.cmi : applyTransformation.cmi
-matitaExcPp.cmx : matitaEngine.cmx matitaExcPp.cmi
+matita.cmx : \
+    predefined_virtuals.cmx \
+    matitaScript.cmx \
+    matitaMisc.cmx \
+    matitaInit.cmx \
+    matitaGui.cmx \
+    buildTimeConf.cmx \
+    applyTransformation.cmx
+matitaEngine.cmx : \
+    applyTransformation.cmx \
+    matitaEngine.cmi
+matitaEngine.cmi : \
+    applyTransformation.cmi
+matitaExcPp.cmx : \
+    matitaEngine.cmx \
+    matitaExcPp.cmi
 matitaExcPp.cmi :
 matitaGeneratedGui.cmx :
-matitaGtkMisc.cmx : matitaGeneratedGui.cmx buildTimeConf.cmx \
+matitaGtkMisc.cmx : \
+    matitaGeneratedGui.cmx \
+    buildTimeConf.cmx \
     matitaGtkMisc.cmi
-matitaGtkMisc.cmi : matitaGeneratedGui.cmx
-matitaGui.cmx : matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
-    matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi
-matitaGui.cmi : matitaGuiTypes.cmi
+matitaGtkMisc.cmi : \
+    matitaGeneratedGui.cmx
+matitaGui.cmx : \
+    matitaTypes.cmx \
+    matitaScript.cmx \
+    matitaMisc.cmx \
+    matitaMathView.cmx \
+    matitaGuiTypes.cmi \
+    matitaGtkMisc.cmx \
+    matitaGeneratedGui.cmx \
+    matitaExcPp.cmx \
+    buildTimeConf.cmx \
+    matitaGui.cmi
+matitaGui.cmi : \
+    matitaGuiTypes.cmi
 matitaGuiInit.cmx :
-matitaGuiTypes.cmi : matitaGeneratedGui.cmx applyTransformation.cmi
-matitaInit.cmx : matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi
+matitaGuiTypes.cmi : \
+    matitaGeneratedGui.cmx \
+    applyTransformation.cmi
+matitaInit.cmx : \
+    matitaExcPp.cmx \
+    buildTimeConf.cmx \
+    matitaInit.cmi
 matitaInit.cmi :
-matitaMathView.cmx : virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
-    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
-    applyTransformation.cmx matitaMathView.cmi
-matitaMathView.cmi : matitaTypes.cmi matitaGuiTypes.cmi
-matitaMisc.cmx : matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi
-matitaMisc.cmi : matitaGuiTypes.cmi
-matitaScript.cmx : virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGtkMisc.cmx matitaEngine.cmx cicMathView.cmx \
-    buildTimeConf.cmx matitaScript.cmi
+matitaMathView.cmx : \
+    virtuals.cmx \
+    matitaTypes.cmx \
+    matitaMisc.cmx \
+    matitaGuiTypes.cmi \
+    matitaGtkMisc.cmx \
+    matitaGeneratedGui.cmx \
+    matitaExcPp.cmx \
+    lablGraphviz.cmx \
+    cicMathView.cmx \
+    buildTimeConf.cmx \
+    applyTransformation.cmx \
+    matitaMathView.cmi
+matitaMathView.cmi : \
+    matitaTypes.cmi \
+    matitaGuiTypes.cmi
+matitaMisc.cmx : \
+    matitaGuiTypes.cmi \
+    buildTimeConf.cmx \
+    matitaMisc.cmi
+matitaMisc.cmi : \
+    matitaGuiTypes.cmi
+matitaScript.cmx : \
+    virtuals.cmx \
+    matitaTypes.cmx \
+    matitaMisc.cmx \
+    matitaMathView.cmx \
+    matitaGtkMisc.cmx \
+    matitaEngine.cmx \
+    cicMathView.cmx \
+    buildTimeConf.cmx \
+    matitaScript.cmi
 matitaScript.cmi :
-matitaTypes.cmx : matitaTypes.cmi
+matitaTypes.cmx : \
+    matitaTypes.cmi
 matitaTypes.cmi :
-matitac.cmx : matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaExcPp.cmx \
+matitac.cmx : \
+    matitaclean.cmx \
+    matitaMisc.cmx \
+    matitaInit.cmx \
+    matitaExcPp.cmx \
     matitaEngine.cmx
-matitaclean.cmx : matitaMisc.cmx matitaInit.cmx matitaclean.cmi
+matitaclean.cmx : \
+    matitaMisc.cmx \
+    matitaInit.cmx \
+    matitaclean.cmi
 matitaclean.cmi :
-predefined_virtuals.cmx : virtuals.cmx predefined_virtuals.cmi
+predefined_virtuals.cmx : \
+    virtuals.cmx \
+    predefined_virtuals.cmi
 predefined_virtuals.cmi :
-virtuals.cmx : virtuals.cmi
+virtuals.cmx : \
+    virtuals.cmi
 virtuals.cmi :

diff --git a/matita/matita/matitaMathView.ml b/matita/matita/matitaMathView.ml
index b6c0d209d35715281662bf8d185f0f7e648bb954..271a7b19ab45c664f61aac4c805b435d81415044 100644 (file)
--- a/matita/matita/matitaMathView.ml
+++ b/matita/matita/matitaMathView.ml
@@ -122,8 +122,8 @@ class sequentsViewer ~(notebook:GPack.notebook) ~(cicMathView:cicMathView) () =
         let stack_goals = Stack.open_goals status#stack in
         let proof_goals = List.map fst metasenv in
         if
-          HExtlib.list_uniq (List.sort Pervasives.compare stack_goals)
-          <> List.sort Pervasives.compare proof_goals
+          HExtlib.list_uniq (List.sort compare stack_goals)
+          <> List.sort compare proof_goals
         then begin
           prerr_endline ("STACK GOALS = " ^ String.concat " " (List.map string_of_int stack_goals));
           prerr_endline ("PROOF GOALS = " ^ String.concat " " (List.map string_of_int proof_goals));
@@ -573,7 +573,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history)
       let content = Http_getter.ls ~local:false dir in
       let l =
         List.fast_sort
-          Pervasives.compare
+          compare
           (List.map
             (function 
               | Http_getter_types.Ls_section s -> "dir", s