bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Move AST Repr impls to Debug impls in libsyntax.

Browse source
This commit is contained in:
Eduard Burtescu 2015-06-17 09:56:27 +03:00
parent af7daa0daf
commit 17e333d31b
7 changed files with 150 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libsyntax/codemap.rs
View file

@ -19,7 +19,7 @@
pub use self::ExpnFormat::*;
use std::cell::RefCell;
use std::cell::{Cell, RefCell};
use std::ops::{Add, Sub};
use std::path::Path;
use std::rc::Rc;
@ -115,7 +115,7 @@ impl Sub for CharPos {
/// are *absolute* positions from the beginning of the codemap, not positions
/// relative to FileMaps. Methods on the CodeMap can be used to relate spans back
/// to the original source.
#[derive(Clone, Copy, Debug, Hash)]
#[derive(Clone, Copy, Hash)]
pub struct Span {
pub lo: BytePos,
pub hi: BytePos,
@ -164,6 +164,20 @@ impl Decodable for Span {
}
}
fn default_span_debug(span: Span, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "Span {{ lo: {:?}, hi: {:?}, expn_id: {:?} }}",
span.lo, span.hi, span.expn_id)
}
thread_local!(pub static SPAN_DEBUG: Cell<fn(Span, &mut fmt::Formatter) -> fmt::Result> =
Cell::new(default_span_debug));
impl fmt::Debug for Span {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
SPAN_DEBUG.with(|span_debug| span_debug.get()(*self, f))
}
}
pub fn spanned<T>(lo: BytePos, hi: BytePos, t: T) -> Spanned<T> {
respan(mk_sp(lo, hi), t)
}