mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6672 : yjh0502/rust/fix_6342, r=graydon

Browse Source 
Fix #6342
This commit is contained in:
bors 2013-05-22 11:43:35 -07:00
commit 4bbbae625d
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libsyntax/parse/parser.rs
View File

@ -4186,10 +4186,10 @@ fn parse_foreign_item(
return iovi_foreign_item(item);
}
if (self.is_keyword("fn") || self.is_keyword("pure") ||
self.is_keyword("unsafe")) {
self.is_keyword("unsafe")) {
// FOREIGN FUNCTION ITEM
let item = self.parse_item_foreign_fn(attrs);
return iovi_foreign_item(item);
let item = self.parse_item_foreign_fn(attrs);
return iovi_foreign_item(item);
}
self.parse_macro_use_or_failure(attrs,macros_allowed,lo,visibility)
}
@ -4504,7 +4504,12 @@ fn parse_foreign_items(&self, first_item_attrs: ~[attribute],
let mut foreign_items = ~[];
loop {
match self.parse_foreign_item(/*bad*/ copy attrs, macros_allowed) {
iovi_none => break,
iovi_none => {
if *self.token == token::RBRACE {
break
}
self.unexpected();
},
iovi_view_item(view_item) => {
// I think this can't occur:
self.span_err(view_item.span,

17
src/test/compile-fail/extern-no-fn.rs Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2012 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.
// error-pattern:unexpected token
extern {
f();
}
fn main() {
}