From 4846affedb3c05cb692f41398b986ad7ed1844aa Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 30 Aug 2012 17:09:04 -0700 Subject: rustc: "extern mod { ... }" should be written "extern { ... }" instead --- src/libsyntax/parse/parser.rs | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8cc8994189b..c83e6893e3c 100644 --- a/src/libsyntax/parse/parser.rs +++ b/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 { ... } -- cgit 1.4.1-3-g733a5