badmanners/maud
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed minuses in namespaces

Browse source
This commit is contained in:
msifeed 2016-07-18 14:40:45 +03:00
parent bad49d49c0
commit e222f5385d
2 changed files with 22 additions and 17 deletions
maud_macros
src
parse.rs
tests
tests.rs

35
maud_macros/src/parse.rs
View file

@ -550,25 +550,30 @@ impl<'cx, 'a, 'i> Parser<'cx, 'a, 'i> {
/// Parses a HTML element or attribute name.
fn name(&mut self) -> PResult<String> {
let mut s = match *self.input {
[ident!(_, namespace), colon!(), ident!(_, name), ..] => {
self.shift(3);
let mut r = String::from(&namespace.name.as_str() as &str);
r.push(':');
r.push_str(&name.name.as_str() as &str);
r
},
[ident!(_, name), ..] => {
macro_rules! ident_with_minuses {
($name:ident) => ({
self.shift(1);
String::from(&name.name.as_str() as &str)
},
let mut s = String::from(&$name.name.as_str() as &str);
while let [minus!(), ident!(_, name), ..] = *self.input {
self.shift(2);
s.push('-');
s.push_str(&name.name.as_str());
}
s
})
}
let mut s = match *self.input {
[ident!(_, name), ..] => ident_with_minuses!(name),
_ => return Err(FatalError),
};
while let [minus!(), ident!(_, name), ..] = *self.input {
self.shift(2);
s.push('-');
s.push_str(&name.name.as_str());
if let [colon!(), ident!(_, name), ..] = *self.input {
self.shift(1);
s.push(':');
s.push_str(ident_with_minuses!(name).as_str());
}
Ok(s)
}

4
maud_macros/tests/tests.rs
View file

@ -91,8 +91,8 @@ mod elements {
#[test]
fn namespaces() {
let mut s = String::new();
html!(s, pon:controls a on:click="yay()" "Yay!").unwrap();
assert_eq!(s, r#"<pon:controls><a on:click="yay()">Yay!</a></pon:controls>"#);
html!(s, pon-pon:controls-alpha a on:click="yay()" "Yay!").unwrap();
assert_eq!(s, r#"<pon-pon:controls-alpha><a on:click="yay()">Yay!</a></pon-pon:controls-alpha>"#);
}
}