---

yaml
---
r: 30202
b: refs/heads/incoming
c: 4846aff
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: c3ac0f8fd95a6521c46ea32d1a7866635f96e921
+refs/heads/incoming: 4846affedb3c05cb692f41398b986ad7ed1844aa
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/parse/parser.rs

@@ -2915,15 +2915,34 @@ struct parser {
                               attrs: ~[attribute],
                               items_allowed: bool)
                            -> item_or_view_item {
+
+        let mut must_be_named_mod = false;
         if self.is_keyword(~"mod") {
+            must_be_named_mod = true;
             self.expect_keyword(~"mod");
-        } else {
+        } else if self.is_keyword(~"module") {
+            must_be_named_mod = true;
             self.expect_keyword(~"module");
+        } else if self.token != token::LBRACE {
+            self.span_fatal(copy self.span,
+                            fmt!("expected `{` or `mod` but found %s",
+                                 token_to_str(self.reader, self.token)));
         }
+
         let (sort, ident) = match self.token {
-                token::IDENT(*) => (ast::named, self.parse_ident()),
-                _ => (ast::anonymous,
-                      token::special_idents::clownshoes_foreign_mod)
+            token::IDENT(*) => (ast::named, self.parse_ident()),
+            _ => {
+                if must_be_named_mod {
+                    self.span_fatal(copy self.span,
+                                    fmt!("expected foreign module name but \
+                                          found %s",
+                                         token_to_str(self.reader,
+                                                      self.token)));
+                }
+
+                (ast::anonymous,
+                 token::special_idents::clownshoes_foreign_mod)
+            }
         };
 
         // extern mod { ... }

branches/incoming/src/rustc/metadata/encoder.rs

@@ -823,7 +823,6 @@ fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: ebml::Writer,
         encode_type(ecx, ebml_w, node_id_to_type(ecx.tcx, nitem.id));
         encode_symbol(ecx, ebml_w, nitem.id);
         encode_path(ecx, ebml_w, path, ast_map::path_name(nitem.ident));
-        ebml_w.end_tag();
       }
     }
     ebml_w.end_tag();

branches/incoming/src/rustc/middle/trans/base.rs

@@ -5528,7 +5528,6 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
                     let g = do str::as_c_str(*ident) |buf| {
                         llvm::LLVMAddGlobal(ccx.llmod, type_of(ccx, typ), buf)
                     };
-                    ccx.item_symbols.insert(ni.id, copy *ident);
                     g
                 }
             }

branches/incoming/src/test/run-pass/anon-extern-mod.rs

@@ -1,9 +1,9 @@
 #[abi = "cdecl"]
 #[link_name = "rustrt"]
-extern mod {
+extern {
   fn last_os_error() -> ~str;
 }
 
 fn main() {
   last_os_error();
-}
+}