* Obsolete.

2 files changed, 0 insertions, 290 deletions

diff --git a/src/libexpr/fix-expr.cc b/src/libexpr/fix-expr.cc
deleted file mode 100644
index e9c5a3ba63..0000000000
--- a/src/libexpr/fix-expr.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-#include "fix-expr.hh"
-#include "expr.hh"
-
-
-ATermMap::ATermMap(unsigned int initialSize, unsigned int maxLoadPct)
-{
-    table = ATtableCreate(initialSize, maxLoadPct);
-    if (!table) throw Error("cannot create ATerm table");
-}
-
-
-ATermMap::ATermMap(const ATermMap & map)
-    : table(0)
-{
-    ATermList keys = map.keys();
-
-    /* !!! adjust allocation for load pct */
-    table = ATtableCreate(ATgetLength(keys), map.maxLoadPct);
-    if (!table) throw Error("cannot create ATerm table");
-
-    for (ATermIterator i(keys); i; ++i)
-        set(*i, map.get(*i));
-}
-
-
-ATermMap::~ATermMap()
-{
-    if (table) ATtableDestroy(table);
-}
-
-
-void ATermMap::set(ATerm key, ATerm value)
-{
-    return ATtablePut(table, key, value);
-}
-
-
-void ATermMap::set(const string & key, ATerm value)
-{
-    set(string2ATerm(key), value);
-}
-
-
-ATerm ATermMap::get(ATerm key) const
-{
-    return ATtableGet(table, key);
-}
-
-
-ATerm ATermMap::get(const string & key) const
-{
-    return get(string2ATerm(key));
-}
-
-
-void ATermMap::remove(ATerm key)
-{
-    ATtableRemove(table, key);
-}
-
-
-void ATermMap::remove(const string & key)
-{
-    remove(string2ATerm(key));
-}
-
-
-ATermList ATermMap::keys() const
-{
-    ATermList keys = ATtableKeys(table);
-    if (!keys) throw Error("cannot query aterm map keys");
-    return keys;
-}
-
-
-ATerm string2ATerm(const string & s)
-{
-    return (ATerm) ATmakeAppl0(ATmakeAFun((char *) s.c_str(), 0, ATtrue));
-}
-
-
-string aterm2String(ATerm t)
-{
-    return ATgetName(ATgetAFun(t));
-}
-    
-
-ATerm bottomupRewrite(TermFun & f, ATerm e)
-{
-    if (ATgetType(e) == AT_APPL) {
-        AFun fun = ATgetAFun(e);
-        int arity = ATgetArity(fun);
-        ATermList args = ATempty;
-
-        for (int i = arity - 1; i >= 0; i--)
-            args = ATinsert(args, bottomupRewrite(f, ATgetArgument(e, i)));
-        
-        e = (ATerm) ATmakeApplList(fun, args);
-    }
-
-    else if (ATgetType(e) == AT_LIST) {
-        ATermList in = (ATermList) e;
-        ATermList out = ATempty;
-
-        for (ATermIterator i(in); i; ++i)
-            out = ATinsert(out, bottomupRewrite(f, *i));
-
-        e = (ATerm) ATreverse(out);
-    }
-
-    return f(e);
-}
-
-
-void queryAllAttrs(Expr e, ATermMap & attrs)
-{
-    ATMatcher m;
-    ATermList bnds;
-    if (!(atMatch(m, e) >> "Attrs" >> bnds))
-        throw badTerm("expected attribute set", e);
-
-    for (ATermIterator i(bnds); i; ++i) {
-        string s;
-        Expr e;
-        if (!(atMatch(m, *i) >> "Bind" >> s >> e))
-            abort(); /* can't happen */
-        attrs.set(s, e);
-    }
-}
-
-
-Expr queryAttr(Expr e, const string & name)
-{
-    ATermMap attrs;
-    queryAllAttrs(e, attrs);
-    return attrs.get(name);
-}
-
-
-Expr makeAttrs(const ATermMap & attrs)
-{
-    ATermList bnds = ATempty;
-    for (ATermIterator i(attrs.keys()); i; ++i)
-        bnds = ATinsert(bnds, 
-            ATmake("Bind(<term>, <term>)", *i, attrs.get(*i)));
-    return ATmake("Attrs(<term>)", ATreverse(bnds));
-}
-
-
-Expr substitute(const ATermMap & subs, Expr e)
-{
-    ATMatcher m;
-    string s;
-
-    if (atMatch(m, e) >> "Var" >> s) {
-        Expr sub = subs.get(s);
-        return sub ? sub : e;
-    }
-
-    /* In case of a function, filter out all variables bound by this
-       function. */
-    ATermList formals;
-    ATerm body;
-    if (atMatch(m, e) >> "Function" >> formals >> body) {
-        ATermMap subs2(subs);
-        for (ATermIterator i(formals); i; ++i) {
-            Expr def;
-            if (!(atMatch(m, *i) >> "NoDefFormal" >> s) &&
-                !(atMatch(m, *i) >> "DefFormal" >> s >> def))
-                abort();
-            subs2.remove(s);
-        }
-        return ATmake("Function(<term>, <term>)", formals,
-            substitute(subs2, body));
-    }
-
-    /* Idem for a mutually recursive attribute set. */
-    ATermList bindings;
-    if (atMatch(m, e) >> "Rec" >> bindings) {
-        ATermMap subs2(subs);
-        for (ATermIterator i(bindings); i; ++i) {
-            Expr e;
-            if (!(atMatch(m, *i) >> "Bind" >> s >> e))
-                abort(); /* can't happen */
-            subs2.remove(s);
-        }
-        return ATmake("Rec(<term>)", substitute(subs2, (ATerm) bindings));
-    }
-
-    if (ATgetType(e) == AT_APPL) {
-        AFun fun = ATgetAFun(e);
-        int arity = ATgetArity(fun);
-        ATermList args = ATempty;
-
-        for (int i = arity - 1; i >= 0; i--)
-            args = ATinsert(args, substitute(subs, ATgetArgument(e, i)));
-        
-        return (ATerm) ATmakeApplList(fun, args);
-    }
-
-    if (ATgetType(e) == AT_LIST) {
-        ATermList out = ATempty;
-        for (ATermIterator i((ATermList) e); i; ++i)
-            out = ATinsert(out, substitute(subs, *i));
-        return (ATerm) ATreverse(out);
-    }
-
-    return e;
-}
-
-
-Expr makeBool(bool b)
-{
-    return b ? ATmake("Bool(True)") : ATmake("Bool(False)");
-}
diff --git a/src/libexpr/fix-expr.hh b/src/libexpr/fix-expr.hh
deleted file mode 100644
index 6c1e51d9cc..0000000000
--- a/src/libexpr/fix-expr.hh
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef __FIXEXPR_H
-#define __FIXEXPR_H
-
-#include <map>
-
-#include <aterm2.h>
-
-#include "util.hh"
-
-
-/* Fix expressions are represented as ATerms.  The maximal sharing
-   property of the ATerm library allows us to implement caching of
-   normals forms efficiently. */
-typedef ATerm Expr;
-
-
-/* Mappings from ATerms to ATerms.  This is just a wrapper around
-   ATerm tables. */
-class ATermMap
-{
-private:
-    unsigned int maxLoadPct;
-    ATermTable table;
-    
-public:
-    ATermMap(unsigned int initialSize = 16, unsigned int maxLoadPct = 75);
-    ATermMap(const ATermMap & map);
-    ~ATermMap();
-
-    void set(ATerm key, ATerm value);
-    void set(const string & key, ATerm value);
-
-    ATerm get(ATerm key) const;
-    ATerm get(const string & key) const;
-
-    void remove(ATerm key);
-    void remove(const string & key);
-
-    ATermList keys() const;
-};
-
-
-/* Convert a string to an ATerm (i.e., a quoted nullary function
-   applicaton). */
-ATerm string2ATerm(const string & s);
-string aterm2String(ATerm t);
-
-/* 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. */
-void queryAllAttrs(Expr e, ATermMap & 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 ATermMap & attrs);
-
-/* Perform a set of substitutions on an expression. */
-Expr substitute(const ATermMap & subs, Expr e);
-
-/* Create an expression representing a boolean. */
-Expr makeBool(bool b);
-
-
-#endif /* !__FIXEXPR_H */