Skip to content

Commit

Permalink
Enable macros to pass $:literal to another macro
Browse files Browse the repository at this point in the history
  • Loading branch information
0e4ef622 committed Aug 5, 2018
1 parent 9f9ac89 commit 3d44da6
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/libsyntax/parse/token.rs
Expand Up @@ -302,6 +302,10 @@ impl Token {
BinOp(Minus) => true,
Ident(ident, false) if ident.name == keywords::True.name() => true,
Ident(ident, false) if ident.name == keywords::False.name() => true,
Interpolated(ref nt) => match nt.0 {
NtLiteral(..) => true,
_ => false,
},
_ => false,
}
}
Expand Down
24 changes: 24 additions & 0 deletions src/test/run-pass/issue-52169.rs
@@ -0,0 +1,24 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(macro_literal_matcher)]

macro_rules! a {
($i:literal) => { "right" };
($i:tt) => { "wrong" };
}

macro_rules! b {
($i:literal) => { a!($i) };
}

fn main() {
assert_eq!(b!(0), "right");
}

0 comments on commit 3d44da6

Please sign in to comment.