Merge pull request #4299 from BuckleScript/tweak

tweak

Author: bobzhang

jscomp/syntax/bs_builtin_ppx.ml

@@ -344,7 +344,7 @@ let local_module_name =
 let expand_reverse  (stru : Ast_structure.t) (acc : Ast_structure.t) : Ast_structure.t = 
   if stru = [] then acc 
   else begin 
-    Ext_list.iter stru Typemod_hide.check; 
+    Typemod_hide.check stru; 
     let local_module_name = local_module_name () in 
     let last_loc = (List.hd stru).pstr_loc  in 
     let stru = List.rev stru in 

jscomp/syntax/typemod_hide.ml

@@ -33,14 +33,17 @@ let  should_hide ( x : Typedtree.module_binding) =
 let attrs : Parsetree.attributes = 
   [{txt = "internal.local";loc = Location.none}, PStr []]
 
-let check (x : Parsetree.structure_item) =
+let check (x : Parsetree.structure) =
+  Ext_list.iter x (fun x ->   
    match x.pstr_desc with 
    | Pstr_eval _
    | Pstr_value _
    | Pstr_primitive _
    | Pstr_typext _
    | Pstr_exception _
+   (* | Pstr_module {pmb_expr = {pmod_desc = Pmod_ident _} }  *)
      -> ()
+   
    |  _ -> 
     Location.raise_errorf ~loc:x.pstr_loc 
-      "the structure is not supported in local extension"
+      "the structure is not supported in local extension")

jscomp/test/internal_unused_test.ml

@@ -49,4 +49,6 @@ end
 
 ;; Js.log (h 1 2 [@bs])
 
+(* module%private X  = Arg  
+type x = X.spec *)
 (* [%%debugger.chrome] *)

lib/4.06.1/unstable/js_compiler.ml

@@ -315028,17 +315028,20 @@ let  should_hide ( x : Typedtree.module_binding) =
 let attrs : Parsetree.attributes = 
   [{txt = "internal.local";loc = Location.none}, PStr []]
 
-let check (x : Parsetree.structure_item) =
+let check (x : Parsetree.structure) =
+  Ext_list.iter x (fun x ->   
    match x.pstr_desc with 
    | Pstr_eval _
    | Pstr_value _
    | Pstr_primitive _
    | Pstr_typext _
    | Pstr_exception _
+   (* | Pstr_module {pmb_expr = {pmod_desc = Pmod_ident _} }  *)
      -> ()
+   
    |  _ -> 
     Location.raise_errorf ~loc:x.pstr_loc 
-      "the structure is not supported in local extension"
+      "the structure is not supported in local extension")
 end
 module Bs_builtin_ppx : sig 
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -315460,7 +315463,7 @@ let local_module_name =
 let expand_reverse  (stru : Ast_structure.t) (acc : Ast_structure.t) : Ast_structure.t = 
   if stru = [] then acc 
   else begin 
-    Ext_list.iter stru Typemod_hide.check; 
+    Typemod_hide.check stru; 
     let local_module_name = local_module_name () in 
     let last_loc = (List.hd stru).pstr_loc  in 
     let stru = List.rev stru in 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -315028,17 +315028,20 @@ let  should_hide ( x : Typedtree.module_binding) =
 let attrs : Parsetree.attributes = 
   [{txt = "internal.local";loc = Location.none}, PStr []]
 
-let check (x : Parsetree.structure_item) =
+let check (x : Parsetree.structure) =
+  Ext_list.iter x (fun x ->   
    match x.pstr_desc with 
    | Pstr_eval _
    | Pstr_value _
    | Pstr_primitive _
    | Pstr_typext _
    | Pstr_exception _
+   (* | Pstr_module {pmb_expr = {pmod_desc = Pmod_ident _} }  *)
      -> ()
+   
    |  _ -> 
     Location.raise_errorf ~loc:x.pstr_loc 
-      "the structure is not supported in local extension"
+      "the structure is not supported in local extension")
 end
 module Bs_builtin_ppx : sig 
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -315460,7 +315463,7 @@ let local_module_name =
 let expand_reverse  (stru : Ast_structure.t) (acc : Ast_structure.t) : Ast_structure.t = 
   if stru = [] then acc 
   else begin 
-    Ext_list.iter stru Typemod_hide.check; 
+    Typemod_hide.check stru; 
     let local_module_name = local_module_name () in 
     let last_loc = (List.hd stru).pstr_loc  in 
     let stru = List.rev stru in 

lib/4.06.1/whole_compiler.ml

@@ -361324,17 +361324,20 @@ let  should_hide ( x : Typedtree.module_binding) =
 let attrs : Parsetree.attributes = 
   [{txt = "internal.local";loc = Location.none}, PStr []]
 
-let check (x : Parsetree.structure_item) =
+let check (x : Parsetree.structure) =
+  Ext_list.iter x (fun x ->   
    match x.pstr_desc with 
    | Pstr_eval _
    | Pstr_value _
    | Pstr_primitive _
    | Pstr_typext _
    | Pstr_exception _
+   (* | Pstr_module {pmb_expr = {pmod_desc = Pmod_ident _} }  *)
      -> ()
+   
    |  _ -> 
     Location.raise_errorf ~loc:x.pstr_loc 
-      "the structure is not supported in local extension"
+      "the structure is not supported in local extension")
 end
 module Bs_conditional_initial : sig 
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -412940,7 +412943,7 @@ let local_module_name =
 let expand_reverse  (stru : Ast_structure.t) (acc : Ast_structure.t) : Ast_structure.t = 
   if stru = [] then acc 
   else begin 
-    Ext_list.iter stru Typemod_hide.check; 
+    Typemod_hide.check stru; 
     let local_module_name = local_module_name () in 
     let last_loc = (List.hd stru).pstr_loc  in 
     let stru = List.rev stru in