Fix cyclic dependencies core <-> frontend

jscomp/core/dune

@@ -6,10 +6,8 @@
    (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
  (flags
   (:standard -w +a-4-9-27-30-40-41-42-48-70))
- (libraries depends gentype js_parser outcome_printer))
+ (libraries depends frontend gentype js_parser outcome_printer))
 
 ; There exist cyclic dependencies between core and frontend, therefore include frontend files here:
 
-(copy_files# ../frontend/*.{ml,mli})
-
 (copy_files# ../cmij/cmij_cache.{ml,mli})

jscomp/core/j.ml

@@ -76,7 +76,7 @@ and for_ident = ident
 and for_direction = Js_op.direction_flag
 and property_map = (property_name * expression) list
 and length_object = Js_op.length_object
-and delim = | DNone | DStarJ | DJson
+and delim = External_arg_spec.delim = | DNone | DStarJ | DJson
 
 and expression_desc =
   | Length of expression * length_object

jscomp/frontend/ast_attributes.ml

@@ -278,7 +278,7 @@ let iter_process_bs_int_as (attrs : t) =
       | _ -> ());
   !st
 
-type as_const_payload = Int of int | Str of string * J.delim
+type as_const_payload = Int of int | Str of string * External_arg_spec.delim
 
 let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   let st = ref None in

jscomp/frontend/ast_attributes.mli

@@ -58,7 +58,7 @@ val has_bs_optional : t -> bool
 
 val iter_process_bs_int_as : t -> int option
 
-type as_const_payload = Int of int | Str of string * J.delim
+type as_const_payload = Int of int | Str of string * External_arg_spec.delim
 val iter_process_bs_string_or_int_as : t -> as_const_payload option
 
 val process_derive_type : t -> derive_attr * t

jscomp/frontend/ast_utf8_string_interp.ml

@@ -325,7 +325,7 @@ let to_string_ident : Longident.t = Ldot (Ldot (Lident "Js", "String2"), "make")
 
 module Delim = struct
   let parse_processed = function
-    | None -> Some J.DNone
+    | None -> Some External_arg_spec.DNone
     | Some "json" -> Some DJson
     | Some "*j" -> Some DStarJ
     | _ -> None

jscomp/frontend/ast_utf8_string_interp.mli

@@ -58,4 +58,4 @@ val transform_test : string -> segment list
 val transform : Parsetree.expression -> string -> string -> Parsetree.expression
 val is_unicode_string : string -> bool
 val is_unescaped : string -> bool
-val parse_processed_delim : string option -> J.delim option
+val parse_processed_delim : string option -> External_arg_spec.delim option

jscomp/frontend/dune

@@ -0,0 +1,9 @@
+(library
+ (name frontend)
+ (wrapped false)
+ (preprocess
+  (action
+   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
+ (flags
+  (:standard -w +a-4-9-40-42-70))
+(libraries common js_parser ml))

jscomp/frontend/external_arg_spec.ml

@@ -24,9 +24,11 @@
 
 (** type definitions for arguments to a function declared external *)
 
+type delim = | DNone | DStarJ | DJson
+
 type cst =
   | Arg_int_lit of int
-  | Arg_string_lit of string * J.delim
+  | Arg_string_lit of string * delim
 
 type label_noname = Arg_label | Arg_empty | Arg_optional
 

jscomp/frontend/external_arg_spec.mli

@@ -22,9 +22,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+type delim = | DNone | DStarJ | DJson
+
 type cst = private
   | Arg_int_lit of int
-  | Arg_string_lit of string * J.delim
+  | Arg_string_lit of string * delim
 
 type attr =
   | Poly_var_string of { descr : (string * string) list }
@@ -56,7 +58,7 @@ type params = param list
 
 val cst_int : int -> cst
 
-val cst_string : string -> J.delim -> cst
+val cst_string : string -> delim -> cst
 
 val empty_label : label
 

jscomp/core/lam_constant.ml → jscomp/frontend/lam_constant.ml

@@ -47,7 +47,7 @@ type t =
   | Const_float of string
   | Const_int64 of int64
   | Const_pointer of string
-  | Const_block of int * Lam_tag_info.t * t list
+  | Const_block of int * Lambda.tag_info * t list
   | Const_float_array of string list
   | Const_some of t
   | Const_module_alias

jscomp/core/lam_constant.mli → jscomp/frontend/lam_constant.mli

@@ -43,7 +43,7 @@ type t =
   | Const_float of string
   | Const_int64 of int64
   | Const_pointer of string
-  | Const_block of int * Lam_tag_info.t * t list
+  | Const_block of int * Lambda.tag_info * t list
   | Const_float_array of string list
   | Const_some of t
   (* eventually we can remove it, since we know