* Make the rejects a bit more compact.

* Add lexical restrictions for keywords.

1 files changed, 2 insertions, 7 deletions

diff --git a/src/libexpr/nix.sdf b/src/libexpr/nix.sdf
index 7c4b2e3c56c5..1940b5afc8fd 100644
--- a/src/libexpr/nix.sdf
+++ b/src/libexpr/nix.sdf
@@ -96,13 +96,7 @@ exports
   sorts Id Int Str Path PathComp Uri
   lexical syntax
     [a-zA-Z\_][a-zA-Z0-9\_\']* -> Id
-    "rec" -> Id {reject}
-    "let" -> Id {reject}
-    "if" -> Id {reject}
-    "then" -> Id {reject}
-    "else" -> Id {reject}
-    "assert" -> Id {reject}
-    "inherit" -> Id {reject}
+    "rec" | "let" | "if" | "then" | "else" | "assert" | "with" | "inherit" -> Id {reject}
 
     [0-9]+ -> Int
 
@@ -120,6 +114,7 @@ exports
     Int -/- [0-9]
     Path -/- [a-zA-Z0-9\.\_\-\+\/]
     Uri -/- [a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']
+    "rec" "let" "if" "then" "else" "assert" "with" "inherit" -/- [A-Za-z0-9\_\']
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%