Commit 2183d00
authored
Merge #970: Changes to Shorthands (& op precedence); ParserTests refactor
Walked into the `Shorthands` module.
Main things: https://github.com/haskell-nix/hnix/blob/2021-07-09-changes/ChangeLog.md
* fixed `mkAssert`
* refactored `ParserTests`.
* Added `@.<|>` operator that represents (previously unrepresentable by shorthands) feature of a language: `s.x or y`.
* Established precedence between shorthand operators. This allows to write down the Haskell (pretty) directly to represent a one-to-one a Nix expression.File tree
8 files changed
+1043
-511
lines changed- src/Nix
- Expr
- tests
8 files changed
+1043
-511
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
5 | 35 | | |
6 | 36 | | |
7 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
583 | 583 | | |
584 | 584 | | |
585 | 585 | | |
586 | | - | |
| 586 | + | |
587 | 587 | | |
588 | 588 | | |
589 | 589 | | |
| |||
0 commit comments