Removing another use of Str

src/core/ident.ml

@@ -44,13 +44,8 @@ let lab_compare l1 l2 = Pervasives.compare l1.lab_tag l2.lab_tag
 
 (* functions for working with counterexample model labels *)
 
-let model_trace_regexp = Str.regexp "model_trace:"
-
 let is_model_trace_label label =
-  try
-    ignore(Str.search_forward model_trace_regexp label.lab_string 0);
-    true
-  with Not_found -> false
+  Lexlib.has_prefix "model_trace:" label.lab_string
 
 let get_model_trace_label ~labels =
   Slab.choose (Slab.filter is_model_trace_label labels)

src/session/termcode.ml

@@ -16,19 +16,10 @@ open Term
 (*******************************)
 
 
-(*
-let expl_regexp = Str.regexp "expl:\\(.*\\)"
-*)
-
 let collect_expls lab =
   Ident.Slab.fold
     (fun lab acc ->
        let lab = lab.Ident.lab_string in
-(*
-       if Str.string_match expl_regexp lab 0
-       then Str.matched_group 1 lab :: acc
-       else acc
-*)
        try
          let s = Lexlib.remove_prefix "expl:" lab in s :: acc
        with Not_found -> acc)