* Working evaluator.

* Mutually recursive attribute sets.
* Print evaluator efficiency statistics.

1 files changed, 18 insertions, 2 deletions

diff --git a/src/fix-ng/fix-expr.hh b/src/fix-ng/fix-expr.hh
index 5c50e9170fe5..700f7beca906 100644
--- a/src/fix-ng/fix-expr.hh
+++ b/src/fix-ng/fix-expr.hh
@@ -1,6 +1,8 @@
 #ifndef __FIXEXPR_H
 #define __FIXEXPR_H
 
+#include <map>
+
 #include <aterm2.h>
 
 #include "util.hh"
@@ -15,13 +17,27 @@ typedef ATerm Expr;
 /* Generic bottomup traversal over ATerms.  The traversal first
    recursively descends into subterms, and then applies the given term
    function to the resulting term. */
-
 struct TermFun
 {
     virtual ATerm operator () (ATerm e) = 0;
 };
-
 ATerm bottomupRewrite(TermFun & f, ATerm e);
 
+/* Query all attributes in an attribute set expression.  The
+   expression must be in normal form. */
+typedef map<string, Expr> Attrs;
+void queryAllAttrs(Expr e, Attrs & attrs);
+
+/* Query a specific attribute from an attribute set expression.  The
+   expression must be in normal form. */
+Expr queryAttr(Expr e, const string & name);
+
+/* Create an attribute set expression from an Attrs value. */
+Expr makeAttrs(const Attrs & attrs);
+
+/* Perform a set of substitutions on an expression. */
+typedef map<string, Expr> Subs;
+ATerm substitute(Subs & subs, ATerm e);
+
 
 #endif /* !__FIXEXPR_H */