From 25cbb4385ee58804cb2483af56d1333fbee6e27d Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 27 Aug 2015 05:41:53 +0530 Subject: [PATCH] Move ExpnInfo to Name --- src/libsyntax/codemap.rs | 16 ++++++------ src/libsyntax/ext/asm.rs | 4 +-- src/libsyntax/ext/deriving/generic/mod.rs | 4 +-- src/libsyntax/ext/expand.rs | 30 +++++++++++------------ src/libsyntax/std_inject.rs | 5 ++-- src/libsyntax/test.rs | 6 ++--- src/test/compile-fail-fulldeps/qquote.rs | 3 +-- src/test/run-fail-fulldeps/qquote.rs | 3 +-- src/test/run-pass-fulldeps/qquote.rs | 4 +-- 9 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index ce2adccbfc3f1..e07cd7b5847e8 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -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, pub pos: BytePos } #[derive(Clone, Hash, Debug, PartialEq, Eq)] pub enum ExpnFormat { /// e.g. #[derive(...)] - 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 diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 2509a071807a0..c48b740d83ae5 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -19,7 +19,7 @@ use codemap::Span; use ext::base; use ext::base::*; use feature_gate; -use parse::token::InternedString; +use parse::token::{intern, InternedString}; use parse::token; use ptr::P; @@ -211,7 +211,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let expn_id = cx.codemap().record_expansion(codemap::ExpnInfo { call_site: sp, callee: codemap::NameAndSpan { - format: codemap::MacroBang("asm".to_string()), + format: codemap::MacroBang(intern("asm")), span: None, allow_internal_unstable: false, }, diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index f23dec92f9357..3196380ec6c36 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -205,7 +205,7 @@ use codemap::Span; use diagnostic::SpanHandler; use fold::MoveMap; use owned_slice::OwnedSlice; -use parse::token::InternedString; +use parse::token::{intern, InternedString}; use parse::token::special_idents; use ptr::P; @@ -1436,7 +1436,7 @@ impl<'a> TraitDef<'a> { to_set.expn_id = cx.codemap().record_expansion(codemap::ExpnInfo { call_site: to_set, callee: codemap::NameAndSpan { - format: codemap::MacroAttribute(format!("derive({})", trait_name)), + format: codemap::MacroAttribute(intern(&format!("derive({})", trait_name))), span: Some(self.span), allow_internal_unstable: false, } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index bf995c000096d..3459caecb260a 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -543,7 +543,7 @@ fn expand_mac_invoc(mac: ast::Mac, fld.cx.bt_push(ExpnInfo { call_site: span, callee: NameAndSpan { - format: MacroBang(extname.to_string()), + format: MacroBang(extname), span: exp_span, allow_internal_unstable: allow_internal_unstable, }, @@ -721,7 +721,7 @@ pub fn expand_item_mac(it: P, fld.cx.bt_push(ExpnInfo { call_site: it.span, callee: NameAndSpan { - format: MacroBang(extname.to_string()), + format: MacroBang(extname), span: span, allow_internal_unstable: allow_internal_unstable, } @@ -740,7 +740,7 @@ pub fn expand_item_mac(it: P, fld.cx.bt_push(ExpnInfo { call_site: it.span, callee: NameAndSpan { - format: MacroBang(extname.to_string()), + format: MacroBang(extname), span: span, allow_internal_unstable: allow_internal_unstable, } @@ -760,7 +760,7 @@ pub fn expand_item_mac(it: P, fld.cx.bt_push(ExpnInfo { call_site: it.span, callee: NameAndSpan { - format: MacroBang(extname.to_string()), + format: MacroBang(extname), span: None, // `macro_rules!` doesn't directly allow // unstable (this is orthogonal to whether @@ -1087,7 +1087,7 @@ fn expand_pat(p: P, fld: &mut MacroExpander) -> P { fld.cx.bt_push(ExpnInfo { call_site: span, callee: NameAndSpan { - format: MacroBang(extname.to_string()), + format: MacroBang(extname), span: tt_span, allow_internal_unstable: allow_internal_unstable, } @@ -1289,8 +1289,8 @@ fn expand_decorators(a: Annotatable, new_attrs: &mut Vec) { for attr in a.attrs() { - let mname = attr.name(); - match fld.cx.syntax_env.find(&intern(&mname)) { + let mname = intern(&attr.name()); + match fld.cx.syntax_env.find(&mname) { Some(rc) => match *rc { Decorator(ref dec) => { attr::mark_used(&attr); @@ -1298,7 +1298,7 @@ fn expand_decorators(a: Annotatable, fld.cx.bt_push(ExpnInfo { call_site: attr.span, callee: NameAndSpan { - format: MacroAttribute(mname.to_string()), + format: MacroAttribute(mname), span: Some(attr.span), // attributes can do whatever they like, // for now. @@ -1325,7 +1325,7 @@ fn expand_decorators(a: Annotatable, fld.cx.bt_push(ExpnInfo { call_site: attr.span, callee: NameAndSpan { - format: MacroAttribute(mname.to_string()), + format: MacroAttribute(mname), span: Some(attr.span), // attributes can do whatever they like, // for now. @@ -1366,16 +1366,16 @@ fn expand_item_multi_modifier(mut it: Annotatable, } for attr in &modifiers { - let mname = attr.name(); + let mname = intern(&attr.name()); - match fld.cx.syntax_env.find(&intern(&mname)) { + match fld.cx.syntax_env.find(&mname) { Some(rc) => match *rc { MultiModifier(ref mac) => { attr::mark_used(attr); fld.cx.bt_push(ExpnInfo { call_site: attr.span, callee: NameAndSpan { - format: MacroAttribute(mname.to_string()), + format: MacroAttribute(mname), span: Some(attr.span), // attributes can do whatever they like, // for now @@ -1414,16 +1414,16 @@ fn expand_item_modifiers(mut it: P, } for attr in &modifiers { - let mname = attr.name(); + let mname = intern(&attr.name()); - match fld.cx.syntax_env.find(&intern(&mname)) { + match fld.cx.syntax_env.find(&mname) { Some(rc) => match *rc { Modifier(ref mac) => { attr::mark_used(attr); fld.cx.bt_push(ExpnInfo { call_site: attr.span, callee: NameAndSpan { - format: MacroAttribute(mname.to_string()), + format: MacroAttribute(mname), span: Some(attr.span), // attributes can do whatever they like, // for now diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs index 8fbaa6a7608fe..d6974abd394f9 100644 --- a/src/libsyntax/std_inject.rs +++ b/src/libsyntax/std_inject.rs @@ -14,8 +14,7 @@ use codemap::{DUMMY_SP, Span, ExpnInfo, NameAndSpan, MacroAttribute}; use codemap; use fold::Folder; use fold; -use parse::token::InternedString; -use parse::token::special_idents; +use parse::token::{intern, InternedString, special_idents}; use parse::{token, ParseSess}; use ptr::P; use util::small_vector::SmallVector; @@ -27,7 +26,7 @@ fn ignored_span(sess: &ParseSess, sp: Span) -> Span { let info = ExpnInfo { call_site: DUMMY_SP, callee: NameAndSpan { - format: MacroAttribute("std_inject".to_string()), + format: MacroAttribute(intern("std_inject")), span: None, allow_internal_unstable: true, } diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index 6278bc20bf1dc..c24c1364bd2a1 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -30,7 +30,7 @@ use ext::expand::ExpansionConfig; use fold::{Folder, MoveMap}; use fold; use owned_slice::OwnedSlice; -use parse::token::InternedString; +use parse::token::{intern, InternedString}; use parse::{token, ParseSess}; use print::pprust; use {ast, ast_util}; @@ -265,7 +265,7 @@ fn generate_test_harness(sess: &ParseSess, cx.ext_cx.bt_push(ExpnInfo { call_site: DUMMY_SP, callee: NameAndSpan { - format: MacroAttribute("test".to_string()), + format: MacroAttribute(intern("test")), span: None, allow_internal_unstable: false, } @@ -297,7 +297,7 @@ fn ignored_span(cx: &TestCtxt, sp: Span) -> Span { let info = ExpnInfo { call_site: DUMMY_SP, callee: NameAndSpan { - format: MacroAttribute("test".to_string()), + format: MacroAttribute(intern("test")), span: None, allow_internal_unstable: true, } diff --git a/src/test/compile-fail-fulldeps/qquote.rs b/src/test/compile-fail-fulldeps/qquote.rs index c83a154056ba2..7ffbbe69c3d6b 100644 --- a/src/test/compile-fail-fulldeps/qquote.rs +++ b/src/test/compile-fail-fulldeps/qquote.rs @@ -27,8 +27,7 @@ fn main() { cx.bt_push(syntax::codemap::ExpnInfo { call_site: DUMMY_SP, callee: syntax::codemap::NameAndSpan { - name: "".to_string(), - format: syntax::codemap::MacroBang, + format: syntax::codemap::MacroBang(parse::token::intern("")), allow_internal_unstable: false, span: None, } diff --git a/src/test/run-fail-fulldeps/qquote.rs b/src/test/run-fail-fulldeps/qquote.rs index eac38037b4bc1..d42a777a019a3 100644 --- a/src/test/run-fail-fulldeps/qquote.rs +++ b/src/test/run-fail-fulldeps/qquote.rs @@ -31,8 +31,7 @@ fn main() { cx.bt_push(syntax::codemap::ExpnInfo { call_site: DUMMY_SP, callee: syntax::codemap::NameAndSpan { - name: "".to_string(), - format: syntax::codemap::MacroBang, + format: syntax::codemap::MacroBang(parse::token::intern("")), allow_internal_unstable: false, span: None, } diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index e272a5fe4f6cd..ba713bb98f854 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -16,6 +16,7 @@ extern crate syntax; use syntax::codemap::DUMMY_SP; use syntax::print::pprust::*; +use syntax::parse::token::intern; fn main() { let ps = syntax::parse::ParseSess::new(); @@ -27,8 +28,7 @@ fn main() { cx.bt_push(syntax::codemap::ExpnInfo { call_site: DUMMY_SP, callee: syntax::codemap::NameAndSpan { - name: "".to_string(), - format: syntax::codemap::MacroBang, + format: syntax::codemap::MacroBang(intern("")), allow_internal_unstable: false, span: None, }