Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ All notable changes to eww will be listed here, starting at changes since versio
- Add `value-pos` to scale widget (By: ipsvn)
- Add `floor` and `ceil` function calls to simplexpr (By: wsbankenstein)
- Add `formatbytes` function calls to simplexpr (By: topongo)
- Add automatic coercing of bools to numbers (By: Kn4ughty)

## [0.6.0] (21.04.2024)

Expand Down
15 changes: 12 additions & 3 deletions crates/simplexpr/src/dynval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,24 @@ impl DynVal {
}

pub fn as_f64(&self) -> Result<f64> {
self.0.parse().map_err(|e| ConversionError::new(self.clone(), "f64", e))
self.0
.parse()
.or_else(|_| self.as_bool().map(|b| if b { 1.0 } else { 0.0 }))
.map_err(|e| ConversionError::new(self.clone(), "f64", e))
}

pub fn as_i32(&self) -> Result<i32> {
self.0.parse().map_err(|e| ConversionError::new(self.clone(), "i32", e))
self.0
.parse()
.or_else(|_| self.as_bool().map(|b| if b { 1 } else { 0 }))
.map_err(|e| ConversionError::new(self.clone(), "i32", e))
}

pub fn as_i64(&self) -> Result<i64> {
self.0.parse().map_err(|e| ConversionError::new(self.clone(), "i64", e))
self.0
.parse()
.or_else(|_| self.as_bool().map(|b| if b { 1 } else { 0 }))
.map_err(|e| ConversionError::new(self.clone(), "i64", e))
}

pub fn as_bool(&self) -> Result<bool> {
Expand Down