OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libsyntax: De-`@mut` `TtReader::cur_tok`

This commit is contained in:
Patrick Walton 2013-12-27 13:27:03 -08:00
parent bac8b2e557
commit c233c2edfd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsyntax/ext/tt/transcribe.rs
View File

@ -39,7 +39,7 @@ pub struct TtReader {
priv repeat_idx: RefCell<~[uint]>, priv repeat_idx: RefCell<~[uint]>,
priv repeat_len: RefCell<~[uint]>, priv repeat_len: RefCell<~[uint]>,
/* cached: */ /* cached: */
cur_tok: Token, cur_tok: RefCell<Token>,
cur_span: Span cur_span: Span
} }
@ -66,7 +66,7 @@ pub fn new_tt_reader(sp_diag: @mut SpanHandler,
repeat_idx: RefCell::new(~[]), repeat_idx: RefCell::new(~[]),
repeat_len: RefCell::new(~[]), repeat_len: RefCell::new(~[]),
/* dummy values, never read: */ /* dummy values, never read: */
cur_tok: EOF, cur_tok: RefCell::new(EOF),
cur_span: DUMMY_SP cur_span: DUMMY_SP
}; };
tt_next_token(r); /* get cur_tok and cur_span set up */ tt_next_token(r); /* get cur_tok and cur_span set up */
@ -175,7 +175,7 @@ fn lockstep_iter_size(t: &token_tree, r: &mut TtReader) -> lis {
pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan { pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
// XXX(pcwalton): Bad copy? // XXX(pcwalton): Bad copy?
let ret_val = TokenAndSpan { let ret_val = TokenAndSpan {
tok: r.cur_tok.clone(), tok: r.cur_tok.get(),
sp: r.cur_span, sp: r.cur_span,
}; };
loop { loop {
@ -195,7 +195,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
match r.stack.up { match r.stack.up {
None => { None => {
r.cur_tok = EOF; r.cur_tok.set(EOF);
return ret_val; return ret_val;
} }
Some(tt_f) => { Some(tt_f) => {
@ -221,7 +221,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
} }
match r.stack.sep.clone() { match r.stack.sep.clone() {
Some(tk) => { Some(tk) => {
r.cur_tok = tk; /* repeat same span, I guess */ r.cur_tok.set(tk); /* repeat same span, I guess */
return ret_val; return ret_val;
} }
None => () None => ()
@ -244,7 +244,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
} }
tt_tok(sp, tok) => { tt_tok(sp, tok) => {
r.cur_span = sp; r.cur_span = sp;
r.cur_tok = tok; r.cur_tok.set(tok);
r.stack.idx += 1u; r.stack.idx += 1u;
return ret_val; return ret_val;
} }
@ -299,14 +299,15 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
(a) idents can be in lots of places, so it'd be a pain (a) idents can be in lots of places, so it'd be a pain
(b) we actually can, since it's a token. */ (b) we actually can, since it's a token. */
matched_nonterminal(nt_ident(~sn,b)) => { matched_nonterminal(nt_ident(~sn,b)) => {
r.cur_span = sp; r.cur_tok = IDENT(sn,b); r.cur_span = sp;
r.cur_tok.set(IDENT(sn,b));
r.stack.idx += 1u; r.stack.idx += 1u;
return ret_val; return ret_val;
} }
matched_nonterminal(ref other_whole_nt) => { matched_nonterminal(ref other_whole_nt) => {
// XXX(pcwalton): Bad copy. // XXX(pcwalton): Bad copy.
r.cur_span = sp; r.cur_span = sp;
r.cur_tok = INTERPOLATED((*other_whole_nt).clone()); r.cur_tok.set(INTERPOLATED((*other_whole_nt).clone()));
r.stack.idx += 1u; r.stack.idx += 1u;
return ret_val; return ret_val;
} }

7
src/libsyntax/parse/lexer.rs
View File

@ -133,7 +133,10 @@ impl reader for StringReader {
} }
impl reader for TtReader { impl reader for TtReader {
fn is_eof(@mut self) -> bool { self.cur_tok == token::EOF } fn is_eof(@mut self) -> bool {
let cur_tok = self.cur_tok.borrow();
*cur_tok.get() == token::EOF
}
fn next_token(@mut self) -> TokenAndSpan { fn next_token(@mut self) -> TokenAndSpan {
let r = tt_next_token(self); let r = tt_next_token(self);
debug!("TtReader: r={:?}", r); debug!("TtReader: r={:?}", r);
@ -145,7 +148,7 @@ impl reader for TtReader {
fn span_diag(@mut self) -> @mut SpanHandler { self.sp_diag } fn span_diag(@mut self) -> @mut SpanHandler { self.sp_diag }
fn peek(@mut self) -> TokenAndSpan { fn peek(@mut self) -> TokenAndSpan {
TokenAndSpan { TokenAndSpan {
tok: self.cur_tok.clone(), tok: self.cur_tok.get(),
sp: self.cur_span, sp: self.cur_span,
} }
} }