From 6f82a78de7ac02ec5665f17248c4fe98bd4f5847 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat, 16 Jul 2005 21:38:15 +0000
Subject: [PATCH] * Define paths using regexps, as is done in the Flex
 definition.

---
 src/libexpr/nix.sdf | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libexpr/nix.sdf b/src/libexpr/nix.sdf
index 1940b5afc8..19e9bd1e92 100644
--- a/src/libexpr/nix.sdf
+++ b/src/libexpr/nix.sdf
@@ -93,7 +93,7 @@ exports
 
 module Nix-Lexicals
 exports
-  sorts Id Int Str Path PathComp Uri
+  sorts Id Int Str Path Uri
   lexical syntax
     [a-zA-Z\_][a-zA-Z0-9\_\']* -> Id
     "rec" | "let" | "if" | "then" | "else" | "assert" | "with" | "inherit" -> Id {reject}
@@ -102,10 +102,7 @@ exports
 
     "\"" ~[\n\"]* "\"" -> Str
 
-    "." ("/" PathComp)+ -> Path
-    ".." ("/" PathComp)+ -> Path
-    ("/" PathComp)+ -> Path
-    [a-zA-Z0-9\.\_\-\+]+ -> PathComp
+    [a-zA-Z0-9\.\_\-\+]* ("/"[a-zA-Z0-9\.\_\-\+]+)+ -> Path
 
     [a-zA-Z] [a-zA-Z0-9\+\-\.]* ":" [a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']* -> Uri