Skip to content

Commit 340a219

Browse files
committed
libsyntax: Get "extern mod foo;" working in .rc files
1 parent c3fdc8c commit 340a219

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

src/libsyntax/parse/parser.rs

+20-5
Original file line numberDiff line numberDiff line change
@@ -3423,12 +3423,19 @@ struct parser {
34233423
}
34243424

34253425
fn is_view_item() -> bool {
3426-
let tok = if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
3427-
self.token
3428-
} else { self.look_ahead(1u) };
3426+
let tok, next_tok;
3427+
if !self.is_keyword(~"pub") && !self.is_keyword(~"priv") {
3428+
tok = self.token;
3429+
next_tok = self.look_ahead(1);
3430+
} else {
3431+
tok = self.look_ahead(1);
3432+
next_tok = self.look_ahead(2);
3433+
};
34293434
self.token_is_keyword(~"use", tok)
34303435
|| self.token_is_keyword(~"import", tok)
34313436
|| self.token_is_keyword(~"export", tok)
3437+
|| (self.token_is_keyword(~"extern", tok) &&
3438+
self.token_is_keyword(~"mod", next_tok))
34323439
}
34333440

34343441
fn parse_view_item(+attrs: ~[attribute]) -> @view_item {
@@ -3439,7 +3446,14 @@ struct parser {
34393446
view_item_import(self.parse_view_paths())
34403447
} else if self.eat_keyword(~"export") {
34413448
view_item_export(self.parse_view_paths())
3442-
} else { fail; };
3449+
} else if self.eat_keyword(~"extern") {
3450+
self.expect_keyword(~"mod");
3451+
let ident = self.parse_ident();
3452+
let metadata = self.parse_optional_meta();
3453+
view_item_use(ident, metadata, self.get_id())
3454+
} else {
3455+
fail;
3456+
};
34433457
self.expect(token::SEMI);
34443458
@{node: node, attrs: attrs,
34453459
vis: vis, span: mk_sp(lo, self.last_span.hi)}
@@ -3564,7 +3578,8 @@ struct parser {
35643578
} else if self.is_view_item() {
35653579
let vi = self.parse_view_item(outer_attrs);
35663580
return spanned(lo, vi.span.hi, cdir_view_item(vi));
3567-
} else { return self.fatal(~"expected crate directive"); }
3581+
}
3582+
return self.fatal(~"expected crate directive");
35683583
}
35693584

35703585
fn parse_crate_directives(term: token::token,

0 commit comments

Comments
 (0)