Merge pull request #4482 from BuckleScript/not_allow_unit

not allowing unit to be redefined, refined error message

Author: bobzhang

jscomp/syntax/bs_ast_invariant.ml

@@ -117,11 +117,12 @@ let emit_external_warnings : iterator=
           );
       default_iterator.label_declaration self lbl      
     );  
-    constructor_declaration = (fun self ({pcd_name} as ctr) -> 
-      (match pcd_name.txt with  
+    constructor_declaration = (fun self ({pcd_name = {txt;loc}} as ctr) -> 
+      (match txt with  
       | "false"
-      | "true"  -> 
-        Location.raise_errorf ~loc:pcd_name.loc "true/false can not be redefined "
+      | "true" 
+      | "()" -> 
+        Location.raise_errorf ~loc:loc "%s can not be redefined " txt
       | _ -> ());
       default_iterator.constructor_declaration self ctr  
     );

jscomp/test/debug_tmp.js

@@ -1,9 +1 @@
-'use strict';
-
-
-throw {
-      RE_EXN_ID: "Not_found",
-      Error: new Error()
-    };
-
-/*  Not a pure module */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

jscomp/test/debug_tmp.ml

@@ -9,4 +9,4 @@
   |]
 }]
 
-let () = raise Not_found
+

jscomp/test/unit_undefined_test.ml

@@ -30,7 +30,7 @@ let fx () = ()
 let u0 (x : unit) = Some x 
 
 let u1 = Some ()
-type t = ()
+type t = unit
 
 let u2 (x : t) = Some x 
 let u3 : t option = Some ()

lib/4.06.1/unstable/js_compiler.ml

@@ -401616,11 +401616,12 @@ let emit_external_warnings : iterator=
           );
       default_iterator.label_declaration self lbl      
     );  
-    constructor_declaration = (fun self ({pcd_name} as ctr) -> 
-      (match pcd_name.txt with  
+    constructor_declaration = (fun self ({pcd_name = {txt;loc}} as ctr) -> 
+      (match txt with  
       | "false"
-      | "true"  -> 
-        Location.raise_errorf ~loc:pcd_name.loc "true/false can not be redefined "
+      | "true" 
+      | "()" -> 
+        Location.raise_errorf ~loc:loc "%s can not be redefined " txt
       | _ -> ());
       default_iterator.constructor_declaration self ctr  
     );

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -401616,11 +401616,12 @@ let emit_external_warnings : iterator=
           );
       default_iterator.label_declaration self lbl      
     );  
-    constructor_declaration = (fun self ({pcd_name} as ctr) -> 
-      (match pcd_name.txt with  
+    constructor_declaration = (fun self ({pcd_name = {txt;loc}} as ctr) -> 
+      (match txt with  
       | "false"
-      | "true"  -> 
-        Location.raise_errorf ~loc:pcd_name.loc "true/false can not be redefined "
+      | "true" 
+      | "()" -> 
+        Location.raise_errorf ~loc:loc "%s can not be redefined " txt
       | _ -> ());
       default_iterator.constructor_declaration self ctr  
     );