diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-12-30 15:32:56 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-01-02 14:16:07 -0800 |
| commit | 55a90f592820572d08dca3475aa6fb3cc190fc29 (patch) | |
| tree | fcc2125ddb8b18b64c3146e633b445da33c1751e /src/libsyntax/parse | |
| parent | 5c2c670d8fe4e5d0ce0153c6473069f25e01f7fa (diff) | |
| download | rust-55a90f592820572d08dca3475aa6fb3cc190fc29.tar.gz rust-55a90f592820572d08dca3475aa6fb3cc190fc29.zip | |
libsyntax: De-`@mut` `Parser::buffer_start` and `Parser::buffer_end`
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index f1fa1c86857..531823e4da0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -311,8 +311,8 @@ pub fn Parser(sess: @mut ParseSess, cfg: ast::CrateConfig, rdr: @mut reader) placeholder.clone(), placeholder.clone(), ], - buffer_start: @mut 0, - buffer_end: @mut 0, + buffer_start: 0, + buffer_end: 0, tokens_consumed: @mut 0, restriction: @mut UNRESTRICTED, quote_depth: 0, @@ -336,8 +336,8 @@ pub struct Parser { // the previous token or None (only stashed sometimes). last_token: Option<~token::Token>, buffer: [TokenAndSpan, ..4], - buffer_start: @mut int, - buffer_end: @mut int, + buffer_start: int, + buffer_end: int, tokens_consumed: @mut uint, restriction: @mut restriction, quote_depth: uint, // not (yet) related to the quasiquoter @@ -733,13 +733,13 @@ impl Parser { } else { None }; - let next = if *self.buffer_start == *self.buffer_end { + let next = if self.buffer_start == self.buffer_end { self.reader.next_token() } else { // Avoid token copies with `util::replace`. - let buffer_start = *self.buffer_start as uint; + let buffer_start = self.buffer_start as uint; let next_index = (buffer_start + 1) & 3 as uint; - *self.buffer_start = next_index as int; + self.buffer_start = next_index as int; let placeholder = TokenAndSpan { tok: token::UNDERSCORE, @@ -768,19 +768,19 @@ impl Parser { self.span = mk_sp(lo, hi); } pub fn buffer_length(&mut self) -> int { - if *self.buffer_start <= *self.buffer_end { - return *self.buffer_end - *self.buffer_start; + if self.buffer_start <= self.buffer_end { + return self.buffer_end - self.buffer_start; } - return (4 - *self.buffer_start) + *self.buffer_end; + return (4 - self.buffer_start) + self.buffer_end; } pub fn look_ahead<R>(&mut self, distance: uint, f: |&token::Token| -> R) -> R { let dist = distance as int; while self.buffer_length() < dist { - self.buffer[*self.buffer_end] = self.reader.next_token(); - *self.buffer_end = (*self.buffer_end + 1) & 3; + self.buffer[self.buffer_end] = self.reader.next_token(); + self.buffer_end = (self.buffer_end + 1) & 3; } - f(&self.buffer[(*self.buffer_start + dist - 1) & 3].tok) + f(&self.buffer[(self.buffer_start + dist - 1) & 3].tok) } pub fn fatal(&mut self, m: &str) -> ! { self.sess.span_diagnostic.span_fatal(self.span, m) |
