fix(tvix/eval): update identifier quoting to match cppnix 2.17
In cppnix 2.17, commit b72bc4a972fe568744d98b89d63adcd504cb586c, the libexpr pretty-printing routine was fixed so that it would no longer pretty-print attrsets with keywords in their attrnames incorrectly. This commit implements the corresponding fix for tvix, fixes our tests to work with cppnix>=2.17 oracles, and expands our test cases to cover all the keywords. Change-Id: I4b51389cd3a9c44babc8ab2a84b383b7b0b116ca Reviewed-on: https://cl.tvl.fyi/c/depot/+/9283 Autosubmit: Adam Joseph <adam@westernsemico.com> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
This commit is contained in:
parent
95ee688f03
commit
9256621009
13 changed files with 38 additions and 6 deletions
|
|
@ -135,7 +135,7 @@ impl NixString {
|
|||
// A borrowed string is unchanged and can be returned as
|
||||
// is.
|
||||
Cow::Borrowed(_) => {
|
||||
if is_valid_nix_identifier(&escaped) {
|
||||
if is_valid_nix_identifier(&escaped) && !is_keyword(&escaped) {
|
||||
escaped
|
||||
} else {
|
||||
Cow::Owned(format!("\"{}\"", escaped))
|
||||
|
|
@ -171,6 +171,17 @@ fn nix_escape_char(ch: char, next: Option<&char>) -> Option<&'static str> {
|
|||
}
|
||||
}
|
||||
|
||||
/// Return true if this string is a keyword -- character strings
|
||||
/// which lexically match the "identifier" production but are not
|
||||
/// parsed as identifiers. See also cppnix commit
|
||||
/// b72bc4a972fe568744d98b89d63adcd504cb586c.
|
||||
fn is_keyword(s: &str) -> bool {
|
||||
match s {
|
||||
"if" | "then" | "else" | "assert" | "with" | "let" | "in" | "rec" | "inherit" => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Return true if this string can be used as an identifier in Nix.
|
||||
fn is_valid_nix_identifier(s: &str) -> bool {
|
||||
// adapted from rnix-parser's tokenizer.rs
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue