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

fast linked list thing

Browse source
This commit is contained in:
elkowar 2021-06-29 15:01:18 +02:00
parent c937707865
commit 209123de3a
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/config.rs
View file

@ -113,28 +113,29 @@ impl Iterator for SExpIterator {
fn next(&mut self) -> Option<Self::Item> {
let mut data = vec![];
loop {
match (self.elements.pop_front(), self.elements.pop_front()) {
(Some(Sp(kw_l, Expr::Keyword(kw), kw_r)), Some(value)) => {
let first_is_kw = self.elements.front().map_or(false, |x| x.1.is_keyword());
if first_is_kw {
let (l, kw, r) = match self.elements.pop_front() {
Some(Sp(l, Expr::Keyword(kw), r)) => (l, kw, r),
_ => unreachable!(),
};
if let Some(value) = self.elements.pop_front() {
data.push((kw, value));
} else {
return if data.is_empty() {
Some(ExpressionElement::Single(Sp(l, Expr::Keyword(kw), r)))
} else {
Some(ExpressionElement::KeyValue(data))
};
}
(Some(x), Some(y)) => {
self.elements.push_front(y);
self.elements.push_front(x);
break;
}
(Some(x), None) => {
self.elements.push_front(x);
break;
}
(None, None) => break,
(None, Some(_)) => unreachable!(),
} else {
return if data.is_empty() {
Some(ExpressionElement::Single(self.elements.pop_front()?))
} else {
Some(ExpressionElement::KeyValue(data))
};
}
}
if data.is_empty() {
Some(ExpressionElement::Single(self.elements.pop_front()?))
} else {
Some(ExpressionElement::KeyValue(data))
}
}
}

6
src/main.rs
View file

@ -44,6 +44,12 @@ impl Expr {
_ => Err(WrongExprType),
}
}
fn is_keyword(&self) -> bool {
match self {
Expr::Keyword(_) => true,
_ => false,
}
}
}
impl std::fmt::Display for Expr {