diff options
| author | Ben Striegel <ben.striegel@gmail.com> | 2012-10-11 22:47:31 -0400 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-10-20 17:50:46 -0700 |
| commit | 614624a34c7917c76927163ca3d82eef01e1c369 (patch) | |
| tree | 0755701f6549af9ebbff04d610553e6b899da234 /src/libsyntax/parse/parser.rs | |
| parent | 684d945ab78d6779c198dcb4a340b2269b0fb8aa (diff) | |
| download | rust-614624a34c7917c76927163ca3d82eef01e1c369.tar.gz rust-614624a34c7917c76927163ca3d82eef01e1c369.zip | |
No longer parse old fixed-length vec sytnax
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 46905b8fe01..879df19f11a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -554,12 +554,7 @@ impl Parser { let sp = mk_sp(lo, self.last_span.hi); return @{id: self.get_id(), - node: match self.maybe_parse_fixed_vstore() { - // Consider a fixed vstore suffix (/N or /_) - None => t, - Some(v) => { - ty_fixed_length(@{id: self.get_id(), node:t, span: sp}, v) - } }, + node: t, span: sp} } @@ -691,23 +686,6 @@ impl Parser { } } - fn maybe_parse_fixed_vstore() -> Option<Option<uint>> { - if self.token == token::BINOP(token::SLASH) { - self.bump(); - match copy self.token { - token::UNDERSCORE => { - self.bump(); Some(None) - } - token::LIT_INT_UNSUFFIXED(i) if i >= 0i64 => { - self.bump(); Some(Some(i as uint)) - } - _ => None - } - } else { - None - } - } - fn maybe_parse_fixed_vstore_with_star() -> Option<Option<uint>> { if self.eat(token::BINOP(token::STAR)) { match copy self.token { @@ -1083,21 +1061,6 @@ impl Parser { ex = expr_lit(@lit); } - // Vstore is legal following expr_lit(lit_str(...)) and expr_vec(...) - // only. - match ex { - expr_lit(@{node: lit_str(_), span: _}) | - expr_vec(_, _) => match self.maybe_parse_fixed_vstore() { - None => (), - Some(v) => { - hi = self.span.hi; - ex = expr_vstore(self.mk_expr(lo, hi, ex), - expr_vstore_fixed(v)); - } - }, - _ => () - } - return self.mk_pexpr(lo, hi, ex); } |
