refactor

Author: zth

compiler/frontend/ast_comb.ml

@@ -57,9 +57,9 @@ let tuple_type_pair ?loc kind arity =
         result )
     | [] -> assert false
 
-let re_id = Ast_literal.Lid.js_re_id
+let regexp_id = Ast_literal.Lid.regexp_id
 
-let to_js_re_type loc = Typ.constr ~loc {txt = re_id; loc} []
+let to_regexp_type loc = Typ.constr ~loc {txt = regexp_id; loc} []
 
 let to_undefined_type loc x =
   Typ.constr ~loc {txt = Ast_literal.Lid.js_undefined; loc} [x]

compiler/frontend/ast_comb.mli

@@ -39,7 +39,7 @@ val tuple_type_pair :
 
 val to_undefined_type : Location.t -> Parsetree.core_type -> Parsetree.core_type
 
-val to_js_re_type : Location.t -> Parsetree.core_type
+val to_regexp_type : Location.t -> Parsetree.core_type
 
 val single_non_rec_value :
   ?attrs:Parsetree.attributes ->

compiler/frontend/ast_exp_extension.ml

@@ -60,7 +60,7 @@ let handle_extension e (self : Bs_ast_mapper.mapper)
   | "re" ->
     Exp.constraint_ ~loc
       (Ast_exp_handle_external.handle_raw ~kind:Raw_re loc payload)
-      (Ast_comb.to_js_re_type loc)
+      (Ast_comb.to_regexp_type loc)
   | "external" -> (
     Location.deprecated loc
       "%external is deprecated, use %raw or regular FFI syntax instead.";

compiler/frontend/ast_literal.ml

@@ -70,8 +70,7 @@ module Lid = struct
   (* FIXME: Use primitive module *)
   let js_null_undefined : t = Ldot (Lident "Js", "null_undefined")
 
-  (* FIXME: Use primitive module *)
-  let js_re_id : t = Ldot (Lident "Stdlib_RegExp", "t")
+  let regexp_id : t = Ldot (Lident "Stdlib_RegExp", "t")
 end
 
 module No_loc = struct

compiler/frontend/ast_literal.mli

@@ -57,7 +57,7 @@ module Lid : sig
 
   val js_null_undefined : t
 
-  val js_re_id : t
+  val regexp_id : t
 end
 
 type expression_lit = Parsetree.expression lit