diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-07-13T12·19+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-07-13T12·19+0000 |
| commit | 0a623a10c7e89a80b6dc74445a0ae6240f65723e (patch) | |
| tree | 1c7a415095c4851c69d9b4c5dd1fea46a961a37c /src/libexpr/lexer.l | |
| parent | 2b9e29b1c8b6b8e4884a46a3ba71ee795f1f97cd (diff) | |
* Allow a default value in attribute selection by writing
x.y.z or default
(as originally proposed in
https://mail.cs.uu.nl/pipermail/nix-dev/2009-September/002989.html).
For instance, an expression like
stdenv.lib.attrByPath ["features" "ckSched"] false args
can now be written as
args.features.ckSched or false
Diffstat (limited to 'src/libexpr/lexer.l')
| -rw-r--r-- | src/libexpr/lexer.l | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l index 5b27e2582d..330c2bd54d 100644 --- a/src/libexpr/lexer.l +++ b/src/libexpr/lexer.l @@ -96,6 +96,7 @@ let { return LET; } in { return IN; } rec { return REC; } inherit { return INHERIT; } +or { return OR_KW; } \.\.\. { return ELLIPSIS; } \=\= { return EQ; } |