From 8a10360c912bc344ea9ce7f8871a47a6e036552f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 25 Mar 2010 12:19:41 +0000
Subject: * Simplify @-patterns: only `{attrs}@name' or `name@{attrs}' are now 
  allowed.  So `name1@name2', `{attrs1}@{attrs2}' and so on are now no  
 longer legal.  This is no big loss because they were not useful   anyway.

  This also changes the output of builtins.toXML for @-patterns
  slightly.
---
 src/libexpr/nixexpr-ast.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libexpr/nixexpr-ast.def')

diff --git a/src/libexpr/nixexpr-ast.def b/src/libexpr/nixexpr-ast.def
index 00b5f5a13716..2bf8492dd05e 100644
--- a/src/libexpr/nixexpr-ast.def
+++ b/src/libexpr/nixexpr-ast.def
@@ -77,8 +77,7 @@ Inherit | Expr ATermList Pos | ATerm |
 Scope | | Expr |
 
 VarPat | string | Pattern |
-AttrsPat | ATermList ATermBool | Pattern | # bool = `...'
-AtPat | Pattern Pattern | Pattern |
+AttrsPat | ATermList ATermBool string | Pattern | # bool = `...'
 
 Formal | string DefaultValue | ATerm |
 
@@ -95,3 +94,4 @@ AttrRHS | Expr Pos | ATerm |
 eTrue = makeBool(makeTrue())
 eFalse = makeBool(makeFalse())
 sOverrides = toATerm("__overrides")
+sNoAlias = toATerm("")
-- 
cgit 1.4.1

