* Added an operator `?' to test for attribute existence, e.g.,

  `attrs ? x' yields true iff `attrs' has an attribute named `x'.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 2281ee7212..0623e49532 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -288,10 +288,17 @@ Expr evalExpr2(EvalState & state, Expr e)
     if (atMatch(m, e) >> "OpOr" >> e1 >> e2)
         return makeBool(evalBool(state, e1) || evalBool(state, e2));
 
-    /* Attribut set update (//). */
+    /* Attribute set update (//). */
     if (atMatch(m, e) >> "OpUpdate" >> e1 >> e2)
         return updateAttrs(evalExpr(state, e1), evalExpr(state, e2));
 
+    /* Attribute existence test (?). */
+    if (atMatch(m, e) >> "OpHasAttr" >> e1 >> name) {
+        ATermMap attrs;
+        queryAllAttrs(evalExpr(state, e1), attrs);
+        return makeBool(attrs.get(name) != 0);
+    }
+
     /* Barf. */
     throw badTerm("invalid expression", e);
 }