Quote reserved keywords when printing expressions #8110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aakropotkin
changed the title
edolstra
reviewed
Mar 27, 2023
aakropotkin
force-pushed
the
quote-reserved
branch
from
4e50e4c
to
f93d833
Compare
|
@edolstra I squashed and gave this a proper commit message. Let me know if you have any additional review. |
Ericson2314
reviewed
Apr 3, 2023
Ericson2314
reviewed
Apr 3, 2023
|
The main thing this needs is tests. I hereby approve of the idea because it fixes a clear bug --- don't print out invalid syntax! |
Ericson2314
added
the
idea approved
|
Rebasing this after #8193 should be interesting --- I hope in a good way! |
github-actions
bot
added
the
with-tests
|
I rebased and added tests. |
roberth
previously requested changes
Apr 30, 2023
roberth
added
the
language
This fixes a bug in commands like `nix eval' which would emit invalid attribute sets if they contained reserved keywords such as "assert", "let", etc. These keywords will not be quoted when printed, making them valid expressions. All keywords recognized by the lexer are quoted except "or", which does not require quotation.
aakropotkin
force-pushed
the
quote-reserved
branch
from
10f40db
to
82d1d74
Compare
aakropotkin
commented
May 9, 2023
Ericson2314
approved these changes
May 9, 2023
roberth
reviewed
May 9, 2023
| // You can test if a keyword needs to be added by running: | ||
| // $ nix eval --expr '{ <KEYWORD> = 1; }' | ||
| // For example `or' doesn't need to be quoted. | ||
| bool isReservedKeyword(const std::string_view str) |
There was a problem hiding this comment.
Hmm, technically reserved keywords would be keywords that aren't in use. I don't think Nix has any of those.
IIRC JavaScript reserved some Java/C/C++ keywords early on, that remain reserved and unused until this day.
There was a problem hiding this comment.
Want to rename it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
This allows the output of
nix evalto be re-evaluated without errors when attrsets use keys such asassert.Context
Related Issue: #7656
You can compare the output of
nix evalwith these examples:I covered the keyword symbols recognized by the parser, and added
throwandimportjust for good measure.The list is : "if", "then", "else", "assert", "with", "let", "in", "rec", "inherit", "or", "throw", "import".
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*Priorities
Add 馃憤 to pull requests you find important.