})
}
- /// Parse a static item from a foreign module
+ /// Parse a static item from a foreign module.
+ /// Assumes that the `static` keyword is already parsed.
fn parse_item_foreign_static(&mut self, vis: ast::Visibility, lo: Span, attrs: Vec<Attribute>)
-> PResult<'a, ForeignItem> {
- self.expect_keyword(keywords::Static)?;
let mutbl = self.eat_keyword(keywords::Mut);
-
let ident = self.parse_ident()?;
self.expect(&token::Colon)?;
let ty = self.parse_ty()?;
let lo = self.span;
let visibility = self.parse_visibility(false)?;
- if self.check_keyword(keywords::Static) {
- // FOREIGN STATIC ITEM
+ // FOREIGN STATIC ITEM
+ // Treat `const` as `static` for error recovery, but don't add it to expected tokens.
+ if self.check_keyword(keywords::Static) || self.token.is_keyword(keywords::Const) {
+ if self.token.is_keyword(keywords::Const) {
+ self.diagnostic()
+ .struct_span_err(self.span, "extern items cannot be `const`")
+ .span_label(self.span, "use `static` instead").emit();
+ }
+ self.bump(); // `static` or `const`
return Ok(Some(self.parse_item_foreign_static(visibility, lo, attrs)?));
}
+ // FOREIGN FUNCTION ITEM
if self.check_keyword(keywords::Fn) {
- // FOREIGN FUNCTION ITEM
return Ok(Some(self.parse_item_foreign_fn(visibility, lo, attrs)?));
}
- if self.check_keyword(keywords::Const) {
- let mut err = self.span_fatal(self.span, "extern items cannot be `const`");
- err.help("use `static` instead");
- return Err(err);
- }
-
// FIXME #5668: this will occur for a macro invocation:
match self.parse_macro_use_or_failure(attrs, true, false, lo, visibility)? {
Some(item) => {
--- /dev/null
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z continue-parse-after-error
+
+extern "C" {
+ const C: u8; //~ ERROR extern items cannot be `const`
+}
+
+fn main() {
+ let x = C;
+}