Merge pull request #27 from Nemo157/path-in-splice
Allow path lookups in un-delimited splices
This commit is contained in:
commit
0440f5c74f
2 changed files with 21 additions and 0 deletions
|
@ -32,6 +32,9 @@ macro_rules! pound {
|
|||
macro_rules! dot {
|
||||
() => (TokenTree::Token(_, Token::Dot))
|
||||
}
|
||||
macro_rules! modsep {
|
||||
() => (TokenTree::Token(_, Token::ModSep))
|
||||
}
|
||||
macro_rules! eq {
|
||||
() => (TokenTree::Token(_, Token::Eq))
|
||||
}
|
||||
|
@ -337,6 +340,12 @@ impl<'cx, 'i> Parser<'cx, 'i> {
|
|||
tts.push(dot.clone());
|
||||
tts.push(num.clone());
|
||||
},
|
||||
// Munch path lookups e.g. `$some_mod::Struct`
|
||||
[ref sep @ modsep!(), ref ident @ ident!(_, _), ..] => {
|
||||
self.shift(2);
|
||||
tts.push(sep.clone());
|
||||
tts.push(ident.clone());
|
||||
},
|
||||
// Munch function calls `()` and indexing operations `[]`
|
||||
[TokenTree::Delimited(sp, ref d), ..] if d.delim != DelimToken::Brace => {
|
||||
self.shift(1);
|
||||
|
|
|
@ -318,3 +318,15 @@ fn tuple_accessors() {
|
|||
assert_eq!(s, "ducks");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn splice_with_path() {
|
||||
mod inner {
|
||||
pub fn name() -> &'static str {
|
||||
"Maud"
|
||||
}
|
||||
}
|
||||
|
||||
let mut s = String::new();
|
||||
html!(s, $inner::name()).unwrap();
|
||||
assert_eq!(s, "Maud");
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue