Merge pull request #2784 from BuckleScript/gpr_2781

bobzhang · web-flow · commit 61c0f1336677 · 2018-05-03T17:11:50.000+08:00
fix #2781
diff --git a/jscomp/syntax/ast_derive_abstract.ml b/jscomp/syntax/ast_derive_abstract.ml
@@ -85,13 +85,13 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
             if is_optional then
               let optional_type = Ast_core_type.lift_option_type pld_type in
               (Ast_core_type.opt_arrow pld_loc label_name optional_type maker,
-              Val.mk pld_name 
+              Val.mk ~loc:pld_loc pld_name 
                 ~attrs:get_optional_attrs ~prim
                 (Typ.arrow ~loc "" core_type optional_type)
                 )
             else
               Typ.arrow ~loc:pld_loc label_name pld_type maker,
-              Val.mk pld_name ~attrs:get_attrs
+              Val.mk ~loc:pld_loc pld_name ~attrs:get_attrs
               ~prim:(
                 ["" ; (* Not needed actually*)
                 External_ffi_types.to_string 
@@ -112,7 +112,7 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
                    (Typ.arrow ""
                       pld_type (* setter *)
                       (Ast_literal.type_unit ()))) in
-              Val.mk
+              Val.mk ~loc:pld_loc
                 {loc = label_loc; txt = label_name ^ "Set"}
                 (* setter *)
                 ~attrs:set_attrs
diff --git a/lib/bsdep.ml b/lib/bsdep.ml
@@ -36872,13 +36872,13 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
             if is_optional then
               let optional_type = Ast_core_type.lift_option_type pld_type in
               (Ast_core_type.opt_arrow pld_loc label_name optional_type maker,
-              Val.mk pld_name 
+              Val.mk ~loc:pld_loc pld_name 
                 ~attrs:get_optional_attrs ~prim
                 (Typ.arrow ~loc "" core_type optional_type)
                 )
             else
               Typ.arrow ~loc:pld_loc label_name pld_type maker,
-              Val.mk pld_name ~attrs:get_attrs
+              Val.mk ~loc:pld_loc pld_name ~attrs:get_attrs
               ~prim:(
                 ["" ; (* Not needed actually*)
                 External_ffi_types.to_string 
@@ -36899,7 +36899,7 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
                    (Typ.arrow ""
                       pld_type (* setter *)
                       (Ast_literal.type_unit ()))) in
-              Val.mk
+              Val.mk ~loc:pld_loc
                 {loc = label_loc; txt = label_name ^ "Set"}
                 (* setter *)
                 ~attrs:set_attrs
diff --git a/lib/bsppx.ml b/lib/bsppx.ml
@@ -18877,13 +18877,13 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
             if is_optional then
               let optional_type = Ast_core_type.lift_option_type pld_type in
               (Ast_core_type.opt_arrow pld_loc label_name optional_type maker,
-              Val.mk pld_name 
+              Val.mk ~loc:pld_loc pld_name 
                 ~attrs:get_optional_attrs ~prim
                 (Typ.arrow ~loc "" core_type optional_type)
                 )
             else
               Typ.arrow ~loc:pld_loc label_name pld_type maker,
-              Val.mk pld_name ~attrs:get_attrs
+              Val.mk ~loc:pld_loc pld_name ~attrs:get_attrs
               ~prim:(
                 ["" ; (* Not needed actually*)
                 External_ffi_types.to_string 
@@ -18904,7 +18904,7 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
                    (Typ.arrow ""
                       pld_type (* setter *)
                       (Ast_literal.type_unit ()))) in
-              Val.mk
+              Val.mk ~loc:pld_loc
                 {loc = label_loc; txt = label_name ^ "Set"}
                 (* setter *)
                 ~attrs:set_attrs
diff --git a/lib/js/belt_Debug.js b/lib/js/belt_Debug.js
@@ -123,8 +123,12 @@ var formatter = {
   }
 
 }
-
+if (typeof window === "undefined"){
 global.devtoolsFormatters = [formatter]
+}
+else {
+window.devtoolsFormatters = [formatter]
+}
 return 0
 
 };
diff --git a/lib/whole_compiler.ml b/lib/whole_compiler.ml
@@ -111243,13 +111243,13 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
             if is_optional then
               let optional_type = Ast_core_type.lift_option_type pld_type in
               (Ast_core_type.opt_arrow pld_loc label_name optional_type maker,
-              Val.mk pld_name 
+              Val.mk ~loc:pld_loc pld_name 
                 ~attrs:get_optional_attrs ~prim
                 (Typ.arrow ~loc "" core_type optional_type)
                 )
             else
               Typ.arrow ~loc:pld_loc label_name pld_type maker,
-              Val.mk pld_name ~attrs:get_attrs
+              Val.mk ~loc:pld_loc pld_name ~attrs:get_attrs
               ~prim:(
                 ["" ; (* Not needed actually*)
                 External_ffi_types.to_string 
@@ -111270,7 +111270,7 @@ let handleTdcl (tdcl : Parsetree.type_declaration) =
                    (Typ.arrow ""
                       pld_type (* setter *)
                       (Ast_literal.type_unit ()))) in
-              Val.mk
+              Val.mk ~loc:pld_loc
                 {loc = label_loc; txt = label_name ^ "Set"}
                 (* setter *)
                 ~attrs:set_attrs

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,12 @@ var formatter = {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`}`
`126`		`-`
	`126`	`+if (typeof window === "undefined"){`
`127`	`127`	`global.devtoolsFormatters = [formatter]`
	`128`	`+}`
	`129`	`+else {`
	`130`	`+window.devtoolsFormatters = [formatter]`
	`131`	`+}`
`128`	`132`	`return 0`
`129`	`133`
`130`	`134`	`};`