From c52dda95a69e02cd62d5ddac6ecf2229fe0c478f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 26 Oct 2004 23:30:18 +0000
Subject: [PATCH] * Bug: check that term is an application.

---
 NEWS                        | 2 ++
 src/libexpr/aterm-helper.pl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c4d84740bd..4384e60cc1 100644
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,8 @@ Major changes include the following:
 
   * Various new operators (e.g., string concatenation).
 
+* Expression evaluation is much faster.
+
 * An Emacs mode for editing Nix expressions (with syntax highlighting
   and indentation) has been added.
 
diff --git a/src/libexpr/aterm-helper.pl b/src/libexpr/aterm-helper.pl
index 568141cb4a..9a1a931a91 100755
--- a/src/libexpr/aterm-helper.pl
+++ b/src/libexpr/aterm-helper.pl
@@ -66,7 +66,7 @@ while (<STDIN>) {
 
         print HEADER "#ifdef __cplusplus\n";
         print HEADER "static inline bool match$funname(ATerm e$formals2) {\n";
-        print HEADER "    if (ATgetAFun(e) != sym$funname) return false;\n";
+        print HEADER "    if (ATgetType(e) != AT_APPL || ATgetAFun(e) != sym$funname) return false;\n";
         print HEADER "$unpack";
         print HEADER "    return true;\n";
         print HEADER "}\n";