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

Move ExpnInfo to Name

Browse source
This commit is contained in:
Manish Goregaokar 2015-08-27 05:41:53 +05:30
parent 4ec7b713dd
commit 25cbb4385e
9 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libsyntax/codemap.rs
View file

@ -29,6 +29,8 @@ use std::io::{self, Read};
use serialize::{Encodable, Decodable, Encoder, Decoder};
use parse::token::intern;
use ast::Name;
// _____________________________________________________________________________
// Pos, BytePos, CharPos
@ -260,9 +262,9 @@ pub struct FileMapAndBytePos { pub fm: Rc<FileMap>, pub pos: BytePos }
#[derive(Clone, Hash, Debug, PartialEq, Eq)]
pub enum ExpnFormat {
/// e.g. #[derive(...)] <item>
MacroAttribute(String),
MacroAttribute(Name),
/// e.g. `format!()`
MacroBang(String),
MacroBang(Name),
/// Syntax sugar expansion performed by the compiler (libsyntax::expand).
CompilerExpansion(CompilerExpansionFormat),
}
@ -302,13 +304,13 @@ pub struct NameAndSpan {
}
impl NameAndSpan {
pub fn name(&self) -> &str{
pub fn name(&self) -> Name {
match self.format {
ExpnFormat::MacroAttribute(ref s) => &s,
ExpnFormat::MacroBang(ref s) => &s,
ExpnFormat::CompilerExpansion(ce) => ce.name(),
ExpnFormat::MacroAttribute(s) => s,
ExpnFormat::MacroBang(s) => s,
ExpnFormat::CompilerExpansion(ce) => intern(ce.name()),
}
}
}
}
/// Extra information for tracking spans of macro and syntax sugar expansion