Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept strings as values of attributes #12467

Closed
wants to merge 2 commits into from
Closed

Accept strings as values of attributes #12467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9681d4
Accept strings as values of attributes, refs #11886
fhahn Feb 22, 2014
b7d3424
Accept #[lang(foo)] attributes, refs #11886
fhahn Feb 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/librustc/middle/lang_items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ struct LanguageItemVisitor<'a> {

impl<'a> Visitor<()> for LanguageItemVisitor<'a> {
fn visit_item(&mut self, item: &ast::Item, _: ()) {
match extract(item.attrs) {
match extract(self.this.session, item.attrs) {
Some(value) => {
let item_index = self.this.item_refs.find_equiv(&value).map(|x| *x);

Expand Down Expand Up @@ -183,14 +183,26 @@ impl LanguageItemCollector {
}
}

pub fn extract(attrs: &[ast::Attribute]) -> Option<InternedString> {
pub fn extract(_: Session, attrs: &[ast::Attribute]) -> Option<InternedString> {
for attribute in attrs.iter() {
match attribute.name_str_pair() {
Some((ref key, ref value)) if key.equiv(&("lang")) => {
// Raise error after snapshot landed
//session.err(format!("`lang = {}` was replaced by `lang({})`",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be format!(" ... {0} ... {0}", *value) to avoid the repeat.

// *value, *value));
return Some((*value).clone());
}
Some(..) | None => {}
}

if attribute.name().equiv(&("lang")) {
match attribute.meta_item_list() {
Some(ref l) if l.len() == 1 => {
return Some(l[0].name().clone());
}
_ => {}
}
}
}

return None;
Expand Down
27 changes: 22 additions & 5 deletions src/libsyntax/parse/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

use ast;
use codemap::{spanned, Spanned, mk_sp};
use codemap::{spanned, Spanned, mk_sp, Span};
use parse::common::*; //resolve bug?
use parse::token;
use parse::parser::Parser;
Expand Down Expand Up @@ -156,10 +156,22 @@ impl ParserAttr for Parser {
// | IDENT meta_seq
fn parse_meta_item(&mut self) -> @ast::MetaItem {
let lo = self.span.lo;
let ident = self.parse_ident();
let name = self.id_to_interned_str(ident);

let (ident, name) = match self.parse_optional_str() {
Some((s, _)) => (None, s),
None => {
let ident = self.parse_ident();
(Some(self.id_to_interned_str(ident)), self.id_to_interned_str(ident))
}
};

match self.token {
token::EQ => {
if ident.is_none() {
self.span_fatal(
Span { lo: lo, hi: self.span.hi, expn_info: self.span.expn_info },
"expected ident but found string");
}
self.bump();
let lit = self.parse_lit();
// FIXME #623 Non-string meta items are not serialized correctly;
Expand All @@ -173,12 +185,17 @@ impl ParserAttr for Parser {
}
}
let hi = self.span.hi;
@spanned(lo, hi, ast::MetaNameValue(name, lit))
@spanned(lo, hi, ast::MetaNameValue(ident.unwrap(), lit))
}
token::LPAREN => {
if ident.is_none() {
self.span_fatal(
Span { lo: lo, hi: self.span.hi, expn_info: self.span.expn_info },
"expected ident but found string");
}
let inner_items = self.parse_meta_seq();
let hi = self.span.hi;
@spanned(lo, hi, ast::MetaList(name, inner_items))
@spanned(lo, hi, ast::MetaList(ident.unwrap(), inner_items))
}
_ => {
let hi = self.last_span.hi;
Expand Down