diff options
| author | John Clements <clements@racket-lang.org> | 2013-04-10 09:44:48 -0700 |
|---|---|---|
| committer | John Clements <clements@racket-lang.org> | 2013-04-28 09:49:20 -0700 |
| commit | 71c0bd5c5df8c3810b3c8dc369a9644dfd82c09b (patch) | |
| tree | 91582abedff060305ec3307a17249d152236c0c1 /src/libsyntax/parse | |
| parent | ae4e09f71ac545dbf51778ee3ffe695de1d50f60 (diff) | |
| download | rust-71c0bd5c5df8c3810b3c8dc369a9644dfd82c09b.tar.gz rust-71c0bd5c5df8c3810b3c8dc369a9644dfd82c09b.zip | |
simplify, based on invariant that items_allowed != foreign_items_allowed
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 3925d4aa9bf..d49ad1663b5 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4107,38 +4107,34 @@ pub impl Parser { maybe_append(attrs, extra_attrs))); } - if !foreign_items_allowed { + if items_allowed { // EXTERN MODULE ITEM return self.parse_item_foreign_mod(lo, opt_abis, visibility, attrs, items_allowed); } } - if items_allowed && !foreign_items_allowed && - self.eat_keyword(&~"mod") { + if items_allowed && self.eat_keyword(&~"mod") { // MODULE ITEM let (ident, item_, extra_attrs) = self.parse_item_mod(attrs); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, maybe_append(attrs, extra_attrs))); } - if items_allowed && !foreign_items_allowed && - self.eat_keyword(&~"type") { + if items_allowed && self.eat_keyword(&~"type") { // TYPE ITEM let (ident, item_, extra_attrs) = self.parse_item_type(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, maybe_append(attrs, extra_attrs))); } - if items_allowed && !foreign_items_allowed && - self.eat_keyword(&~"enum") { + if items_allowed && self.eat_keyword(&~"enum") { // ENUM ITEM let (ident, item_, extra_attrs) = self.parse_item_enum(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, maybe_append(attrs, extra_attrs))); } - if items_allowed && !foreign_items_allowed && - self.eat_keyword(&~"trait") { + if items_allowed && self.eat_keyword(&~"trait") { // TRAIT ITEM let (ident, item_, extra_attrs) = self.parse_item_trait(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, @@ -4154,15 +4150,14 @@ pub impl Parser { visibility, maybe_append(attrs, extra_attrs))); } - if items_allowed && !foreign_items_allowed && - self.eat_keyword(&~"struct") { + if items_allowed && self.eat_keyword(&~"struct") { // STRUCT ITEM let (ident, item_, extra_attrs) = self.parse_item_struct(); return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_, visibility, maybe_append(attrs, extra_attrs))); } - if !foreign_items_allowed && self.eat_keyword(&~"use") { + if items_allowed && self.eat_keyword(&~"use") { // USE ITEM let view_item = self.parse_use(); self.expect(&token::SEMI); |
