From 063f388534f84c12b46f2dc0dd632bcc86a805f5 Mon Sep 17 00:00:00 2001
From: Roy Frostig <rfrostig@mozilla.com>
Date: Thu, 8 Jul 2010 15:13:25 -0700
Subject: [PATCH] Err kindly instead of asserting on duplicate mod declarations
 in crates.

---
 src/boot/fe/cexp.ml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/boot/fe/cexp.ml b/src/boot/fe/cexp.ml
index bf5e32b863a..59904a452e9 100644
--- a/src/boot/fe/cexp.ml
+++ b/src/boot/fe/cexp.ml
@@ -678,7 +678,11 @@ let parse_crate_file
               begin
                 fun d ->
                   match d with
-                      CDIR_mod (name, item) -> htab_put items name item
+                      CDIR_mod (name, item) ->
+                        if Hashtbl.mem items name
+                        then raise
+                          (err ("duplicate mod declaration: " ^ name) ps)
+                        else Hashtbl.add items name item
                     | CDIR_meta metas ->
                         Array.iter (fun m -> Queue.add m meta) metas
                     | CDIR_auth (n,e) ->