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

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

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

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

@ -40,7 +40,7 @@ pub struct TtReader {
priv repeat_len: RefCell<~[uint]>, priv repeat_len: RefCell<~[uint]>,
/* cached: */ /* cached: */
cur_tok: RefCell<Token>, cur_tok: RefCell<Token>,
cur_span: Span cur_span: RefCell<Span>,
} }
/** This can do Macro-By-Example transcription. On the other hand, if /** This can do Macro-By-Example transcription. On the other hand, if
@ -67,7 +67,7 @@ pub fn new_tt_reader(sp_diag: @mut SpanHandler,
repeat_len: RefCell::new(~[]), repeat_len: RefCell::new(~[]),
/* dummy values, never read: */ /* dummy values, never read: */
cur_tok: RefCell::new(EOF), cur_tok: RefCell::new(EOF),
cur_span: DUMMY_SP cur_span: RefCell::new(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 */
return r; return r;
@ -93,7 +93,7 @@ pub fn dup_tt_reader(r: @mut TtReader) -> @mut TtReader {
repeat_idx: r.repeat_idx.clone(), repeat_idx: r.repeat_idx.clone(),
repeat_len: r.repeat_len.clone(), repeat_len: r.repeat_len.clone(),
cur_tok: r.cur_tok.clone(), cur_tok: r.cur_tok.clone(),
cur_span: r.cur_span, cur_span: r.cur_span.clone(),
interpolations: r.interpolations.clone(), interpolations: r.interpolations.clone(),
} }
} }
@ -123,7 +123,8 @@ fn lookup_cur_matched(r: &mut TtReader, name: Ident) -> @named_match {
match matched_opt { match matched_opt {
Some(s) => lookup_cur_matched_by_matched(r, s), Some(s) => lookup_cur_matched_by_matched(r, s),
None => { None => {
r.sp_diag.span_fatal(r.cur_span, format!("unknown macro variable `{}`", r.sp_diag.span_fatal(r.cur_span.get(),
format!("unknown macro variable `{}`",
ident_to_str(&name))); ident_to_str(&name)));
} }
} }
@ -176,7 +177,7 @@ 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.get(), tok: r.cur_tok.get(),
sp: r.cur_span, sp: r.cur_span.get(),
}; };
loop { loop {
{ {
@ -243,7 +244,7 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
// if this could be 0-length, we'd need to potentially recur here // if this could be 0-length, we'd need to potentially recur here
} }
tt_tok(sp, tok) => { tt_tok(sp, tok) => {
r.cur_span = sp; r.cur_span.set(sp);
r.cur_tok.set(tok); r.cur_tok.set(tok);
r.stack.idx += 1u; r.stack.idx += 1u;
return ret_val; return ret_val;
@ -299,21 +300,21 @@ 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_span.set(sp);
r.cur_tok.set(IDENT(sn,b)); 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.set(sp);
r.cur_tok.set(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;
} }
matched_seq(..) => { matched_seq(..) => {
r.sp_diag.span_fatal( r.sp_diag.span_fatal(
r.cur_span, /* blame the macro writer */ r.cur_span.get(), /* blame the macro writer */
format!("variable '{}' is still repeating at this depth", format!("variable '{}' is still repeating at this depth",
ident_to_str(&ident))); ident_to_str(&ident)));
} }

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

@ -143,13 +143,13 @@ impl reader for TtReader {
return r; return r;
} }
fn fatal(@mut self, m: ~str) -> ! { fn fatal(@mut self, m: ~str) -> ! {
self.sp_diag.span_fatal(self.cur_span, m); self.sp_diag.span_fatal(self.cur_span.get(), m);
} }
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.get(), tok: self.cur_tok.get(),
sp: self.cur_span, sp: self.cur_span.get(),
} }
} }
fn dup(@mut self) -> @mut reader { dup_tt_reader(self) as @mut reader } fn dup(@mut self) -> @mut reader { dup_tt_reader(self) as @mut reader }