Allow path lookups in un-delimited splices

lambda-fairy · Feb 1, 2016 · ed8c119 · ed8c119
1 parent 3deb7a7
commit ed8c119
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/maud_macros/src/parse.rs b/maud_macros/src/parse.rs
@@ -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))
 }
@@ -199,6 +202,7 @@ impl<'cx, 'i> Parser<'cx, 'i> {
             // ???
             _ => {
                 if let [ref tt, ..] = self.input {
+                    println!("{:?}", tt);
                     parse_error!(self, tt.get_span(), "invalid syntax");
                 } else {
                     parse_error!(self, self.span, "unexpected end of block");
@@ -328,6 +332,12 @@ impl<'cx, 'i> Parser<'cx, 'i> {
                 tts.push(dot.clone());
                 tts.push(ident.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);

diff --git a/maud_macros/tests/tests.rs b/maud_macros/tests/tests.rs
@@ -309,3 +309,17 @@ fn issue_23() {
     let s = to_string!(p { "Hi, " $name "!" });
     assert_eq!(s, "<p>Hi, Lyra!</p>");
 }
+
+#[test]
+fn splice_with_path() {
+    mod inner {
+        pub fn name() -> &'static str {
+            "Rusticle"
+        }
+    }
+
+    let mut s = String::new();
+    html!(s, $inner::name()).unwrap();
+    assert_eq!(s, "Rusticle");
+}
+