diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-07 15:59:44 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-07 16:53:21 -0700 |
| commit | 249668f22396bde43523207117b3869e63b49c4f (patch) | |
| tree | e2fa1ce33c4609eff693800bf338d266f15f3b57 /src/libsyntax/parse/parser.rs | |
| parent | f0eae8f1c19a051ab750383e479f979c32d4598a (diff) | |
| download | rust-249668f22396bde43523207117b3869e63b49c4f.tar.gz rust-249668f22396bde43523207117b3869e63b49c4f.zip | |
Remove module keyword
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 015399e62b1..175247bfaf3 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2936,9 +2936,6 @@ struct parser { if self.is_keyword(~"mod") { must_be_named_mod = true; self.expect_keyword(~"mod"); - } 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", @@ -3244,8 +3241,7 @@ struct parser { } return self.parse_item_foreign_mod(lo, visibility, attrs, items_allowed); - } else if items_allowed && (self.eat_keyword(~"mod") || - self.eat_keyword(~"module")) { + } else if items_allowed && self.eat_keyword(~"mod") { let (ident, item_, extra_attrs) = self.parse_item_mod(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, @@ -3557,14 +3553,10 @@ struct parser { let expect_mod = vec::len(outer_attrs) > 0u; let lo = self.span.lo; - if expect_mod || self.is_keyword(~"mod") || - self.is_keyword(~"module") { + if expect_mod || self.is_keyword(~"mod") { + + self.expect_keyword(~"mod"); - if self.is_keyword(~"mod") { - self.expect_keyword(~"mod"); - } else { - self.expect_keyword(~"module"); - } let id = self.parse_ident(); match self.token { // mod x = "foo.rs"; @@ -3603,11 +3595,7 @@ struct parser { // accept seeing the terminator next, so if we do see it then fail the // same way parse_crate_directive would if vec::len(first_outer_attr) > 0u && self.token == term { - if self.is_keyword(~"mod") { - self.expect_keyword(~"mod"); - } else { - self.expect_keyword(~"module"); - } + self.expect_keyword(~"mod"); } let mut cdirs: ~[@crate_directive] = ~[]; |
