nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 11:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsyntax: Get "extern mod foo;" working in .rc files

Browse Source
This commit is contained in:
Patrick Walton 2012-08-31 11:45:14 -07:00
parent c3fdc8c7b5
commit 340a219290
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3423,12 +3423,19 @@ struct parser {
}
fn is_view_item() -> bool {
let tok = if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
self.token
} else { self.look_ahead(1u) };
let tok, next_tok;
if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
tok = self.token;
next_tok = self.look_ahead(1);
} else {
tok = self.look_ahead(1);
next_tok = self.look_ahead(2);
};
self.token_is_keyword(~"use", tok)
|| self.token_is_keyword(~"import", tok)
|| self.token_is_keyword(~"export", tok)
|| (self.token_is_keyword(~"extern", tok) &&
self.token_is_keyword(~"mod", next_tok))
}
fn parse_view_item(+attrs: ~[attribute]) -> @view_item {
@ -3439,7 +3446,14 @@ struct parser {
view_item_import(self.parse_view_paths())
} else if self.eat_keyword(~"export") {
view_item_export(self.parse_view_paths())
} else { fail; };
} else if self.eat_keyword(~"extern") {
self.expect_keyword(~"mod");
let ident = self.parse_ident();
let metadata = self.parse_optional_meta();
view_item_use(ident, metadata, self.get_id())
} else {
fail;
};
self.expect(token::SEMI);
@{node: node, attrs: attrs,
vis: vis, span: mk_sp(lo, self.last_span.hi)}
@ -3564,7 +3578,8 @@ struct parser {
} else if self.is_view_item() {
let vi = self.parse_view_item(outer_attrs);
return spanned(lo, vi.span.hi, cdir_view_item(vi));
} else { return self.fatal(~"expected crate directive"); }
}
return self.fatal(~"expected crate directive");
}
fn parse_crate_directives(term: token::token,