pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arst

Browse source
This commit is contained in:
elkowar 2021-06-29 13:18:50 +02:00
parent b388d04bfa
commit 2f85889ad9
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/config.rs
View file

@ -54,12 +54,10 @@ impl<T: FromExpr> FromExpr for Definitional<T> {
fn from_expr(e: Expr) -> Result<Self, AstError> { fn from_expr(e: Expr) -> Result<Self, AstError> {
if let Expr::List(list) = e { if let Expr::List(list) = e {
let mut iter = list.into_iter(); let mut iter = list.into_iter();
let def_type = DefType::from_sp(iter.next().unwrap())?; let def_type = DefType::from_sp(iter.next().unwrap())?;
let name = iter.next().unwrap().1.str()?; let name = iter.next().unwrap().1.str()?;
let mut attrs = HashMap::new(); let attrs = parse_key_values(&mut iter);
while let Some(Sp(_, Expr::Keyword(x), _)) = iter.next() {
attrs.insert(x, iter.next().unwrap());
}
let children = iter.map(T::from_sp).collect::<Result<Vec<_>, AstError>>()?; let children = iter.map(T::from_sp).collect::<Result<Vec<_>, AstError>>()?;
Ok(Definitional { Ok(Definitional {
@ -78,3 +76,23 @@ pub struct WidgetDefinition {
name: String, name: String,
argnames: Vec<VarName>, argnames: Vec<VarName>,
} }
pub fn parse_key_values(iter: impl Iterator<Item = Sp<Expr>>) -> HashMap<String, Sp<Expr>> {
let mut attrs = HashMap::new();
let mut iter = iter.multipeek();
loop {
let next = iter.peek();
let next2 = iter.peek();
iter.reset_peek();
if let (Some(Sp(_, Expr::Keyword(_), _)), Some(_)) = (next, next2) {
if let Some(Sp(_, Expr::Keyword(x), _)) = iter.next() {
attrs.insert(x.to_string(), iter.next().unwrap());
} else {
unreachable!();
}
} else {
break;
}
}
attrs
}