3 files changed, 6 insertions, 37 deletions
diff --git a/plugins/firstorder/ground.ml b/plugins/firstorder/ground.ml
index 2f26226f4e..4e7482d4af 100644
--- a/plugins/firstorder/ground.ml
+++ b/plugins/firstorder/ground.ml
@@ -18,11 +18,11 @@ open Tacticals.New
 
 let update_flags ()=
   let open TransparentState in
-  let f accu coe = match coe.Classops.coe_value with
+  let f accu coe = match coe.Coercionops.coe_value with
     | Names.GlobRef.ConstRef kn -> { accu with tr_cst = Names.Cpred.remove kn accu.tr_cst }
     | _ -> accu
   in
-  let flags = List.fold_left f TransparentState.full (Classops.coercions ()) in
+  let flags = List.fold_left f TransparentState.full (Coercionops.coercions ()) in
     red_flags:=
     CClosure.RedFlags.red_add_transparent
       CClosure.betaiotazeta
diff --git a/plugins/omega/g_omega.mlg b/plugins/omega/g_omega.mlg
index 84964a7bd2..7c653b223e 100644
--- a/plugins/omega/g_omega.mlg
+++ b/plugins/omega/g_omega.mlg
@@ -21,40 +21,9 @@ DECLARE PLUGIN "omega_plugin"
 {
 
 open Ltac_plugin
-open Names
-open Coq_omega
-open Stdarg
-
-let eval_tactic name =
-  let dp = DirPath.make (List.map Id.of_string ["PreOmega"; "omega"; "Coq"]) in
-  let kn = KerName.make (ModPath.MPfile dp) (Label.make name) in
-  let tac = Tacenv.interp_ltac kn in
-  Tacinterp.eval_tactic tac
-
-let omega_tactic l =
-  let tacs = List.map
-    (function
-       | "nat" -> eval_tactic "zify_nat"
-       | "positive" -> eval_tactic "zify_positive"
-       | "N" -> eval_tactic "zify_N"
-       | "Z" -> eval_tactic "zify_op"
-       | s -> CErrors.user_err Pp.(str ("No Omega knowledge base for type "^s)))
-    (Util.List.sort_uniquize String.compare l)
-  in
-  Tacticals.New.tclTHEN
-    (Tacticals.New.tclREPEAT (Tacticals.New.tclTHENLIST tacs))
-    (omega_solver)
 
 }
 
 TACTIC EXTEND omega
-|  [ "omega" ] -> { omega_tactic [] }
+|  [ "omega" ] -> { Coq_omega.omega_solver }
 END
-
-TACTIC EXTEND omega'
-| [ "omega" "with" ne_ident_list(l) ] ->
-    { omega_tactic (List.map Names.Id.to_string l) }
-| [ "omega" "with" "*" ] ->
-  { Tacticals.New.tclTHEN (eval_tactic "zify") (omega_tactic []) }
-END
-
diff --git a/plugins/ssr/ssrvernac.mlg b/plugins/ssr/ssrvernac.mlg
index 9f6fe0e651..d8dbf2f3dc 100644
--- a/plugins/ssr/ssrvernac.mlg
+++ b/plugins/ssr/ssrvernac.mlg
@@ -370,14 +370,14 @@ let coerce_search_pattern_to_sort hpat =
   let filter_head, coe_path =
     try
       let _, cp =
-        Classops.lookup_path_to_sort_from (push_rels_assum dc env) sigma ht in
+        Coercionops.lookup_path_to_sort_from (push_rels_assum dc env) sigma ht in
       warn ();
       true, cp
     with _ -> false, [] in
   let coerce hp coe_index =
-    let coe_ref = coe_index.Classops.coe_value in
+    let coe_ref = coe_index.Coercionops.coe_value in
     try
-      let n_imps = Option.get (Classops.hide_coercion coe_ref) in
+      let n_imps = Option.get (Coercionops.hide_coercion coe_ref) in
       mkPApp (Pattern.PRef coe_ref) n_imps [|hp|]
     with Not_found | Option.IsNone ->
     errorstrm (str "need explicit coercion " ++ pr_global coe_ref ++ spc ()