properly filter out 'default' when re-exporting names

fastpack · Aug 21, 2018 · 47eff04 · 47eff04
1 parent 738f3bd
commit 47eff04
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Fastpack/ExportFinder.ml b/Fastpack/ExportFinder.ml
@@ -51,17 +51,17 @@ let make () =
                let exports =
                  M.merge
                    (fun key v1 v2 ->
-                      match key with
-                      | "default" -> None
-                      | _ ->
-                        match v1, v2 with
-                        | Some v1, Some v2 ->
+                      match v1, v2 with
+                      | Some v1, Some v2 ->
+                        if key = "default"
+                        then Some v1
+                        else
                           (* TODO: define proper error here *)
                           failwith ("ExportFinder > Cannot export twice: " ^ key ^ ". Module 1: " ^ (Module.location_to_string v1.parent_module.location) ^ ". Module 2: " ^ (Module.location_to_string v2.parent_module.location))
-                        | Some v, None | None, Some v ->
-                          Some v
-                        | None, None ->
-                          None
+                      | Some v, None | None, Some v ->
+                        Some v
+                      | None, None ->
+                        None
                    )
                    exports
                    batch_exports