bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

let #[allow_internal_unstable] cover :vis

Browse source
This commit is contained in:
Alex Burka 2017-04-21 23:54:38 +00:00
parent 8e7c4888b7
commit f9f4707469
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libsyntax/ext/tt/macro_rules.rs
View file

@ -222,7 +222,7 @@ pub fn compile(sess: &ParseSess, features: &RefCell<Features>, def: &ast::Item)
if let MatchedNonterminal(ref nt) = *m { if let MatchedNonterminal(ref nt) = *m {
if let NtTT(ref tt) = **nt { if let NtTT(ref tt) = **nt {
let tt = quoted::parse(tt.clone().into(), true, sess).pop().unwrap(); let tt = quoted::parse(tt.clone().into(), true, sess).pop().unwrap();
valid &= check_lhs_nt_follows(sess, features, &tt); valid &= check_lhs_nt_follows(sess, features, &def.attrs, &tt);
return tt; return tt;
} }
} }
@ -272,11 +272,12 @@ pub fn compile(sess: &ParseSess, features: &RefCell<Features>, def: &ast::Item)
fn check_lhs_nt_follows(sess: &ParseSess, fn check_lhs_nt_follows(sess: &ParseSess,
features: &RefCell<Features>, features: &RefCell<Features>,
attrs: &[ast::Attribute],
lhs: &quoted::TokenTree) -> bool { lhs: &quoted::TokenTree) -> bool {
// lhs is going to be like TokenTree::Delimited(...), where the // lhs is going to be like TokenTree::Delimited(...), where the
// entire lhs is those tts. Or, it can be a "bare sequence", not wrapped in parens. // entire lhs is those tts. Or, it can be a "bare sequence", not wrapped in parens.
if let quoted::TokenTree::Delimited(_, ref tts) = *lhs { if let quoted::TokenTree::Delimited(_, ref tts) = *lhs {
check_matcher(sess, features, &tts.tts) check_matcher(sess, features, attrs, &tts.tts)
} else { } else {
let msg = "invalid macro matcher; matchers must be contained in balanced delimiters"; let msg = "invalid macro matcher; matchers must be contained in balanced delimiters";
sess.span_diagnostic.span_err(lhs.span(), msg); sess.span_diagnostic.span_err(lhs.span(), msg);
@ -328,11 +329,12 @@ fn check_rhs(sess: &ParseSess, rhs: &quoted::TokenTree) -> bool {
fn check_matcher(sess: &ParseSess, fn check_matcher(sess: &ParseSess,
features: &RefCell<Features>, features: &RefCell<Features>,
attrs: &[ast::Attribute],
matcher: &[quoted::TokenTree]) -> bool { matcher: &[quoted::TokenTree]) -> bool {
let first_sets = FirstSets::new(matcher); let first_sets = FirstSets::new(matcher);
let empty_suffix = TokenSet::empty(); let empty_suffix = TokenSet::empty();
let err = sess.span_diagnostic.err_count(); let err = sess.span_diagnostic.err_count();
check_matcher_core(sess, features, &first_sets, matcher, &empty_suffix); check_matcher_core(sess, features, attrs, &first_sets, matcher, &empty_suffix);
err == sess.span_diagnostic.err_count() err == sess.span_diagnostic.err_count()
} }
@ -575,6 +577,7 @@ impl TokenSet {
// see `FirstSets::new`. // see `FirstSets::new`.
fn check_matcher_core(sess: &ParseSess, fn check_matcher_core(sess: &ParseSess,
features: &RefCell<Features>, features: &RefCell<Features>,
attrs: &[ast::Attribute],
first_sets: &FirstSets, first_sets: &FirstSets,
matcher: &[quoted::TokenTree], matcher: &[quoted::TokenTree],
follow: &TokenSet) -> TokenSet { follow: &TokenSet) -> TokenSet {
@ -605,7 +608,7 @@ fn check_matcher_core(sess: &ParseSess,
match *token { match *token {
TokenTree::Token(..) | TokenTree::MetaVar(..) | TokenTree::MetaVarDecl(..) => { TokenTree::Token(..) | TokenTree::MetaVar(..) | TokenTree::MetaVarDecl(..) => {
let can_be_followed_by_any; let can_be_followed_by_any;
if let Err(bad_frag) = has_legal_fragment_specifier(sess, features, token) { if let Err(bad_frag) = has_legal_fragment_specifier(sess, features, attrs, token) {
let msg = format!("invalid fragment specifier `{}`", bad_frag); let msg = format!("invalid fragment specifier `{}`", bad_frag);
sess.span_diagnostic.struct_span_err(token.span(), &msg) sess.span_diagnostic.struct_span_err(token.span(), &msg)
.help("valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, \ .help("valid fragment specifiers are `ident`, `block`, `stmt`, `expr`, \
@ -631,7 +634,7 @@ fn check_matcher_core(sess: &ParseSess,
} }
TokenTree::Delimited(span, ref d) => { TokenTree::Delimited(span, ref d) => {
let my_suffix = TokenSet::singleton(d.close_tt(span)); let my_suffix = TokenSet::singleton(d.close_tt(span));
check_matcher_core(sess, features, first_sets, &d.tts, &my_suffix); check_matcher_core(sess, features, attrs, first_sets, &d.tts, &my_suffix);
// don't track non NT tokens // don't track non NT tokens
last.replace_with_irrelevant(); last.replace_with_irrelevant();
@ -663,7 +666,12 @@ fn check_matcher_core(sess: &ParseSess,
// At this point, `suffix_first` is built, and // At this point, `suffix_first` is built, and
// `my_suffix` is some TokenSet that we can use // `my_suffix` is some TokenSet that we can use
// for checking the interior of `seq_rep`. // for checking the interior of `seq_rep`.
let next = check_matcher_core(sess, features, first_sets, &seq_rep.tts, my_suffix); let next = check_matcher_core(sess,
features,
attrs,
first_sets,
&seq_rep.tts,
my_suffix);
if next.maybe_empty { if next.maybe_empty {
last.add_all(&next); last.add_all(&next);
} else { } else {
@ -836,12 +844,13 @@ fn is_in_follow(tok: &quoted::TokenTree, frag: &str) -> Result<bool, (String, &'
fn has_legal_fragment_specifier(sess: &ParseSess, fn has_legal_fragment_specifier(sess: &ParseSess,
features: &RefCell<Features>, features: &RefCell<Features>,
attrs: &[ast::Attribute],
tok: &quoted::TokenTree) -> Result<(), String> { tok: &quoted::TokenTree) -> Result<(), String> {
debug!("has_legal_fragment_specifier({:?})", tok); debug!("has_legal_fragment_specifier({:?})", tok);
if let quoted::TokenTree::MetaVarDecl(_, _, ref frag_spec) = *tok { if let quoted::TokenTree::MetaVarDecl(_, _, ref frag_spec) = *tok {
let frag_name = frag_spec.name.as_str(); let frag_name = frag_spec.name.as_str();
let frag_span = tok.span(); let frag_span = tok.span();
if !is_legal_fragment_specifier(sess, features, &frag_name, frag_span) { if !is_legal_fragment_specifier(sess, features, attrs, &frag_name, frag_span) {
return Err(frag_name.to_string()); return Err(frag_name.to_string());
} }
} }
@ -850,13 +859,15 @@ fn has_legal_fragment_specifier(sess: &ParseSess,
fn is_legal_fragment_specifier(sess: &ParseSess, fn is_legal_fragment_specifier(sess: &ParseSess,
features: &RefCell<Features>, features: &RefCell<Features>,
attrs: &[ast::Attribute],
frag_name: &str, frag_name: &str,
frag_span: Span) -> bool { frag_span: Span) -> bool {
match frag_name { match frag_name {
"item" | "block" | "stmt" | "expr" | "pat" | "item" | "block" | "stmt" | "expr" | "pat" |
"path" | "ty" | "ident" | "meta" | "tt" | "" => true, "path" | "ty" | "ident" | "meta" | "tt" | "" => true,
"vis" => { "vis" => {
if !features.borrow().macro_vis_matcher { if !features.borrow().macro_vis_matcher
&& !attr::contains_name(attrs, "allow_internal_unstable") {
let explain = feature_gate::EXPLAIN_VIS_MATCHER; let explain = feature_gate::EXPLAIN_VIS_MATCHER;
emit_feature_err(sess, emit_feature_err(sess,
"macro_vis_matcher", "macro_vis_matcher",