mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor

Browse source
This commit is contained in:
sxyazi 2026-05-09 22:26:10 +08:00
parent f8705f00d3
commit afff0af516
No known key found for this signature in database
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
yazi-shared/src/condition.rs
View file

@ -1,4 +1,4 @@
use std::str::FromStr;
use std::{cmp::Ordering, str::FromStr};
use anyhow::bail;
use serde_with::DeserializeFromStr;
@ -33,8 +33,7 @@ impl ConditionOp {
}
}
#[inline]
pub fn prec(&self) -> u8 {
fn prec(&self) -> u8 {
match self {
Self::Or => 1,
Self::And => 2,
@ -44,6 +43,18 @@ impl ConditionOp {
}
}
impl PartialOrd for ConditionOp {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
use Ordering::*;
match self.prec().cmp(&other.prec()) {
// Keep repeated `!` right-associative by making `! >= !` false.
Equal if matches!((self, other), (Self::Not, Self::Not)) => None,
ordering => Some(ordering),
}
}
}
#[derive(Debug, DeserializeFromStr)]
pub struct Condition {
ops: Vec<ConditionOp>,
@ -72,10 +83,7 @@ impl Condition {
let op = ConditionOp::new(token);
match op {
ConditionOp::Or | ConditionOp::And | ConditionOp::Not => {
while matches!(
stack.last(),
Some(last) if last.prec() > op.prec() || (op != ConditionOp::Not && last.prec() == op.prec())
) {
while matches!(stack.last(), Some(last) if last >= &op) {
output.push(stack.pop().unwrap());
}
stack.push(op);
@ -139,14 +147,14 @@ mod tests {
#[test]
fn test_condition_not() -> anyhow::Result<()> {
let cond: Condition = "!dir".parse()?;
assert!(!cond.eval(|s| s == "dir").unwrap());
assert!(cond.eval(|_| false).unwrap());
let cond: Condition = "!!dir".parse()?;
assert!(cond.eval(|s| s == "dir").unwrap());
assert!(!cond.eval(|_| false).unwrap());
let cond: Condition = "!!!dir".parse()?;
assert!(!cond.eval(|s| s == "dir").unwrap());
assert!(cond.eval(|_| false).unwrap());
Ok(())
}
}