Merge pull request #4555 from BuckleScript/fix_4548

fix #4548 ghost location

Author: bobzhang

jscomp/syntax/bs_builtin_ppx.ml

@@ -83,16 +83,16 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
           let name =  "emptyArray" in 
           let unit : _ Asttypes.loc  = {txt = Ast_literal.Lid.val_unit ; loc  } in 
           let open Ast_helper in 
-          Exp.let_ Nonrecursive
+          Exp.let_ Nonrecursive ~loc 
             [{pvb_pat =
                 Pat.var  {txt = name ; loc} ~loc ;
               pvb_expr =
                 Exp.fun_ Nolabel None
                   (Pat.construct unit None)
                   (Exp.array [] ~attrs:[{txt = ""; loc}, PStr []]);
               pvb_loc  = loc; pvb_attributes = []}]
-            (Exp.apply
-               (Exp.ident {txt = Lident name; loc})
+            (Exp.apply ~loc
+               (Exp.ident ~loc {txt = Lident name; loc})
                [Nolabel,
                 Exp.construct unit None ~loc;
                ])

lib/4.06.1/unstable/bspack.ml

@@ -4592,6 +4592,7 @@ let absolute_path s = (* This function could go into Filename *)
   aux s
 
 let show_filename file =
+  let file = if file = "_none_"  then !input_name else file in 
   if !absname then absolute_path file else file
 
 let print_filename ppf file =

lib/4.06.1/unstable/js_compiler.ml

@@ -4863,6 +4863,7 @@ let absolute_path s = (* This function could go into Filename *)
   aux s
 
 let show_filename file =
+  let file = if file = "_none_"  then !input_name else file in 
   if !absname then absolute_path file else file
 
 let print_filename ppf file =
@@ -409918,16 +409919,16 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
           let name =  "emptyArray" in 
           let unit : _ Asttypes.loc  = {txt = Ast_literal.Lid.val_unit ; loc  } in 
           let open Ast_helper in 
-          Exp.let_ Nonrecursive
+          Exp.let_ Nonrecursive ~loc 
             [{pvb_pat =
                 Pat.var  {txt = name ; loc} ~loc ;
               pvb_expr =
                 Exp.fun_ Nolabel None
                   (Pat.construct unit None)
                   (Exp.array [] ~attrs:[{txt = ""; loc}, PStr []]);
               pvb_loc  = loc; pvb_attributes = []}]
-            (Exp.apply
-               (Exp.ident {txt = Lident name; loc})
+            (Exp.apply ~loc
+               (Exp.ident ~loc {txt = Lident name; loc})
                [Nolabel,
                 Exp.construct unit None ~loc;
                ])

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -4863,6 +4863,7 @@ let absolute_path s = (* This function could go into Filename *)
   aux s
 
 let show_filename file =
+  let file = if file = "_none_"  then !input_name else file in 
   if !absname then absolute_path file else file
 
 let print_filename ppf file =
@@ -409918,16 +409919,16 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
           let name =  "emptyArray" in 
           let unit : _ Asttypes.loc  = {txt = Ast_literal.Lid.val_unit ; loc  } in 
           let open Ast_helper in 
-          Exp.let_ Nonrecursive
+          Exp.let_ Nonrecursive ~loc 
             [{pvb_pat =
                 Pat.var  {txt = name ; loc} ~loc ;
               pvb_expr =
                 Exp.fun_ Nolabel None
                   (Pat.construct unit None)
                   (Exp.array [] ~attrs:[{txt = ""; loc}, PStr []]);
               pvb_loc  = loc; pvb_attributes = []}]
-            (Exp.apply
-               (Exp.ident {txt = Lident name; loc})
+            (Exp.apply ~loc
+               (Exp.ident ~loc {txt = Lident name; loc})
                [Nolabel,
                 Exp.construct unit None ~loc;
                ])

lib/4.06.1/unstable/native_ppx.ml

@@ -4592,6 +4592,7 @@ let absolute_path s = (* This function could go into Filename *)
   aux s
 
 let show_filename file =
+  let file = if file = "_none_"  then !input_name else file in 
   if !absname then absolute_path file else file
 
 let print_filename ppf file =

lib/4.06.1/whole_compiler.ml

@@ -4536,6 +4536,7 @@ let absolute_path s = (* This function could go into Filename *)
   aux s
 
 let show_filename file =
+  let file = if file = "_none_"  then !input_name else file in 
   if true then absolute_path file else file
 
 let print_filename ppf file =
@@ -412466,16 +412467,16 @@ let expr_mapper  (self : mapper) (e : Parsetree.expression) =
           let name =  "emptyArray" in 
           let unit : _ Asttypes.loc  = {txt = Ast_literal.Lid.val_unit ; loc  } in 
           let open Ast_helper in 
-          Exp.let_ Nonrecursive
+          Exp.let_ Nonrecursive ~loc 
             [{pvb_pat =
                 Pat.var  {txt = name ; loc} ~loc ;
               pvb_expr =
                 Exp.fun_ Nolabel None
                   (Pat.construct unit None)
                   (Exp.array [] ~attrs:[{txt = ""; loc}, PStr []]);
               pvb_loc  = loc; pvb_attributes = []}]
-            (Exp.apply
-               (Exp.ident {txt = Lident name; loc})
+            (Exp.apply ~loc
+               (Exp.ident ~loc {txt = Lident name; loc})
                [Nolabel,
                 Exp.construct unit None ~loc;
                ])