Skip to content

Commit

Permalink
Merge branch 'master' into flake
Browse files Browse the repository at this point in the history
  • Loading branch information
w-lfchen authored Mar 16, 2024
2 parents da058c1 + 4ce4245 commit 371f6e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to eww will be listed here, starting at changes since versio
### Fixes
- The `shell-completions` subcommand is now run before anything is set up
- Fix and refactor nix flake (By: w-lfchen)
- Fix `jq` (By: w-lfchen)

## [0.5.0] (17.02.2024)

Expand Down
2 changes: 2 additions & 0 deletions crates/simplexpr/src/eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ fn prepare_jaq_filter(code: String) -> Result<Arc<jaq_interpret::Filter>, EvalEr
None => return Err(EvalError::JaqParseError(Box::new(JaqParseError(errors.pop())))),
};
let mut defs = jaq_interpret::ParseCtx::new(Vec::new());
defs.insert_natives(jaq_core::core());
defs.insert_defs(jaq_std::std());

let filter = defs.compile(filter);
Expand Down Expand Up @@ -544,5 +545,6 @@ mod tests {
lazy_evaluation_and(r#"false && "null".test"#) => Ok(DynVal::from(false)),
lazy_evaluation_or(r#"true || "null".test"#) => Ok(DynVal::from(true)),
lazy_evaluation_elvis(r#""test"?: "null".test"#) => Ok(DynVal::from("test")),
jq_basic_index(r#"jq("[7,8,9]", ".[0]")"#) => Ok(DynVal::from(7)),
}
}

0 comments on commit 371f6e7

Please sign in to comment.