ocaml 3.09 transition

[helm.git] / helm / ocaml / mathql_generator / mQGUtil.ml

diff --git a/helm/ocaml/mathql_generator/mQGUtil.ml b/helm/ocaml/mathql_generator/mQGUtil.ml
index a7a6bc6a49ea01e378f1cfcaa754c9163d15c530..e30742649ab5f50bfdc986855c0893054a5847e3 100644 (file)
--- a/helm/ocaml/mathql_generator/mQGUtil.ml
+++ b/helm/ocaml/mathql_generator/mQGUtil.ml
@@ -40,9 +40,10 @@ let string_of_position p =
       | T.InBody         -> ns ^ "InBody"
       
 let string_of_sort = function
-   | T.Set  -> "Set"
-   | T.Prop -> "Prop"
-   | T.Type -> "Type"
+   | T.Set   -> "Set"
+   | T.Prop  -> "Prop"
+   | T.Type  -> "Type"
+   | T.CProp -> "CProp"
 
 let string_of_depth = string_of_int
 
@@ -54,9 +55,10 @@ let mathql_of_position = function
    | T.InBody         -> "$IB"
       
 let mathql_of_sort = function
-   | T.Set  -> "$SET"
-   | T.Prop -> "$PROP"
-   | T.Type -> "$TYPE"
+   | T.Set   -> "$SET"
+   | T.Prop  -> "$PROP"
+   | T.Type  -> "$TYPE"
+   | T.CProp -> "$CPROP"
 
 let mathql_of_depth = string_of_int
 
@@ -92,9 +94,10 @@ let position_of_mathql = function
    | _     -> raise Parsing.Parse_error 
 
 let sort_of_mathql = function
-   | "$SET"  -> T.Set 
-   | "$PROP" -> T.Prop
-   | "$TYPE" -> T.Type
+   | "$SET"   -> T.Set 
+   | "$PROP"  -> T.Prop
+   | "$TYPE"  -> T.Type
+   | "$CPROP" -> T.CProp
    | _       -> raise Parsing.Parse_error 
 
 let depth_of_mathql s =
@@ -120,9 +123,10 @@ let text_of_depth pos no_depth_text = match pos with
    | _                        -> no_depth_text
 
 let text_of_sort = function
-   | T.Set  -> "Set"
-   | T.Prop -> "Prop"
-   | T.Type -> "Type"
+   | T.Set   -> "Set"
+   | T.Prop  -> "Prop"
+   | T.Type  -> "Type"
+   | T.CProp -> "CProp"
 
 let is_main_position = function
    | `MainHypothesis _
@@ -142,8 +146,3 @@ let set_full_position pos depth = match pos with
 let set_main_position pos depth = match pos with
    | `MainHypothesis _ -> `MainHypothesis depth
    | `MainConclusion _ -> `MainConclusion depth
-
-let universe_for_search_pattern =
-   [T.MainHypothesis; T.InHypothesis; T.MainConclusion; T.InConclusion]
-   
-let universe_for_match_conclusion = [T.MainConclusion; T.InConclusion]