Add location on new expression

Author: vouillon

compiler/lib/generate.ml

@@ -1232,7 +1232,7 @@ let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
                 l
                 ~init:([], mutator_p, queue)
             in
-            ( J.ENew (cc, if List.is_empty args then None else Some args)
+            ( J.ENew (cc, (if List.is_empty args then None else Some args), loc)
             , or_p pc prop
             , queue )
         | Extern "caml_js_get", [ Pv o; Pc (NativeString (Utf f)) ] when J.is_ident' f ->

compiler/lib/javascript.ml

@@ -280,7 +280,7 @@ and expression =
   | EAccess of expression * access_kind * expression
   | EDot of expression * access_kind * identifier
   | EDotPrivate of expression * access_kind * identifier
-  | ENew of expression * arguments option
+  | ENew of expression * arguments option * location
   | EVar of ident
   | EFun of ident option * function_declaration
   | EClass of ident option * class_declaration

compiler/lib/javascript.mli

@@ -197,7 +197,7 @@ and expression =
   | EAccess of expression * access_kind * expression
   | EDot of expression * access_kind * identifier
   | EDotPrivate of expression * access_kind * identifier
-  | ENew of expression * arguments option
+  | ENew of expression * arguments option * location
   | EVar of ident
   | EFun of ident option * function_declaration
   | EClass of ident option * class_declaration

compiler/lib/js_output.ml

@@ -854,12 +854,13 @@ struct
         | ANormal -> PP.string f ".#"
         | ANullish -> PP.string f "?.#");
         PP.string f nm
-    | ENew (e, None) ->
+    | ENew (e, None, loc) ->
         if Prec.(l > NewExpression)
         then (
           PP.start_group f 1;
           PP.string f "(");
         PP.start_group f 1;
+        output_debug_info f loc;
         PP.string f "new";
         PP.space f;
         expression NewExpression f e;
@@ -868,8 +869,9 @@ struct
         then (
           PP.string f ")";
           PP.end_group f)
-    | ENew (e, Some el) ->
+    | ENew (e, Some el, loc) ->
         PP.start_group f 1;
+        output_debug_info f loc;
         PP.string f "new";
         PP.space f;
         expression MemberExpression f e;

compiler/lib/js_parser.mly

@@ -906,7 +906,7 @@ call_expr(x):
 
 new_expr(x):
  | e=member_expr(x)    { e }
- | T_NEW e=new_expr(d1) { (ENew (e,None)) }
+ | T_NEW e=new_expr(d1) { (ENew (e,None, p $symbolstartpos)) }
 
 access:
   | "." { ANormal }
@@ -924,7 +924,7 @@ member_expr(x):
  | e1=member_expr(x) ak=access i=field_name
      { (EDot(e1,ak,i)) }
  | T_NEW e1=member_expr(d1) a=arguments
-     { (ENew(e1, Some a)) }
+     { (ENew(e1, Some a, p $symbolstartpos)) }
  | e=member_expr(x) t=template_literal
      { ECallTemplate(e, t, p $symbolstartpos) }
  | T_SUPER "[" e=expr "]"

compiler/lib/js_traverse.ml

@@ -314,8 +314,8 @@ class map : mapper =
       | EAccess (e1, ak, e2) -> EAccess (m#expression e1, ak, m#expression e2)
       | EDot (e1, ak, id) -> EDot (m#expression e1, ak, id)
       | EDotPrivate (e1, ak, id) -> EDotPrivate (m#expression e1, ak, id)
-      | ENew (e1, args) ->
-          ENew (m#expression e1, Option.map ~f:(List.map ~f:m#argument) args)
+      | ENew (e1, args, loc) ->
+          ENew (m#expression e1, Option.map ~f:(List.map ~f:m#argument) args, m#loc loc)
       | EVar v -> EVar (m#ident v)
       | EFun (idopt, fun_decl) ->
           let idopt = Option.map ~f:m#ident idopt in
@@ -668,10 +668,10 @@ class iter : iterator =
           m#expression e2
       | EDot (e1, _ak, _) -> m#expression e1
       | EDotPrivate (e1, _, _) -> m#expression e1
-      | ENew (e1, Some args) ->
+      | ENew (e1, Some args, _) ->
           m#expression e1;
           List.iter args ~f:m#argument
-      | ENew (e1, None) -> m#expression e1
+      | ENew (e1, None, _) -> m#expression e1
       | EVar v -> m#ident v
       | EFun (idopt, fun_decl) ->
           (match idopt with

compiler/lib/wasm/wa_gc_target.ml

@@ -1559,7 +1559,8 @@ let () =
                                , Some
                                    (List.map
                                       ~f:(fun x -> J.Arg (EVar (J.ident x)))
-                                      params) ))
+                                      params)
+                               , N ))
                         , N )
                     , N )
                   ]

compiler/lib/wasm/wa_link.ml

@@ -490,7 +490,8 @@ let build_runtime_arguments
                                         (EStr
                                            (Utf8_string.of_string_exn
                                               (nm ^ " not implemented")))
-                                    ] ))
+                                    ]
+                                , N ))
                          , N )
                        ]
                        N