From 2135e7c0417b366b4161d01ebf794d25e96b61ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 16 Jul 2005 23:19:20 +0000 Subject: * Wat cleanups. --- src/libexpr/nix.sdf | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/libexpr/nix.sdf b/src/libexpr/nix.sdf index 19e9bd1e9..e60311e73 100644 --- a/src/libexpr/nix.sdf +++ b/src/libexpr/nix.sdf @@ -14,15 +14,11 @@ imports Nix-Exprs Nix-Layout module Nix-Exprs imports Nix-Lexicals exports - sorts Expr Formal Bind Binds ExprList + sorts Expr Formal Bind ExprList context-free start-symbols Expr context-free syntax - Id -> Expr {cons("Var")} - Int -> Expr {cons("Int")} - Str -> Expr {cons("Str")} - Uri -> Expr {cons("Uri")} - Path -> Expr {cons("Path")} + Id | Int | Str | Uri | Path -> Expr {cons("Var")} "(" Expr ")" -> Expr {bracket} @@ -37,11 +33,10 @@ exports "with" Expr ";" Expr -> Expr {cons("With")} - "rec" "{" Binds "}" -> Expr {cons("Rec")} - "let" "{" Binds "}" -> Expr {cons("LetRec")} - "{" Binds "}" -> Expr {cons("Attrs")} + "rec" "{" Bind* "}" -> Expr {cons("Rec")} + "let" "{" Bind* "}" -> Expr {cons("LetRec")} + "{" Bind* "}" -> Expr {cons("Attrs")} - Bind* -> Binds Id "=" Expr ";" -> Bind {cons("Bind")} "inherit" ("(" Expr ")")? Id* ";" -> Bind {cons("Inherit")} -- cgit v1.2.3