cleanup

diff --git a/src/Dyna/Backend/Python/interpreter.py b/src/Dyna/Backend/Python/interpreter.py
index cfc5cceef6b664b0c24846bcdb482a7a87f0b2e0..4eef6dc9e886b9d7128b26a18066eeb210ba760e 100644 (file)
--- a/src/Dyna/Backend/Python/interpreter.py
+++ b/src/Dyna/Backend/Python/interpreter.py
@@ -7,8 +7,8 @@ from path import path
 
 from term import Term, Cons, Nil, MapsTo, Error
 from chart import Chart
-from utils import red, parse_attrs, ddict, dynac, read_anf, strip_comments, \
-    _repr, hide_ugly_filename, true, false, parse_parser_state, magenta, indent
+from utils import red, parse_attrs, dynac, read_anf, strip_comments, _repr, \
+    hide_ugly_filename, true, false, parse_parser_state, magenta, indent
 
 from prioritydict import prioritydict
 from config import dotdynadir

diff --git a/src/Dyna/Backend/Python/term.py b/src/Dyna/Backend/Python/term.py
index 6166dd5703ebd970152925569e4a61606b695f10..84f46abbc3b70854a9e05fffdaf55ad251620e42 100644 (file)
--- a/src/Dyna/Backend/Python/term.py
+++ b/src/Dyna/Backend/Python/term.py
@@ -1,4 +1,4 @@
-from utils import _repr, true, false
+from utils import _repr
 from aggregator import NoAggregator
 
 

diff --git a/src/Dyna/Backend/Python/unify.py b/src/Dyna/Backend/Python/unify.py
deleted file mode 100644 (file)
index c5f6f6f..0000000
--- a/src/Dyna/Backend/Python/unify.py
+++ /dev/null
@@ -1,183 +0,0 @@
-from term import Term
-from utils import _repr
-
-def isconst(x):
-    return not isinstance(x, (Variable, Term))
-
-
-class Variable(object):
-
-    def __init__(self, name):
-        self.fn = name
-        self._val = None
-
-    @property
-    def value(self):
-        return self.root._val
-
-    @property
-    def root(self):
-        if isinstance(self._val, Variable):
-            return self._val.root
-        else:
-            return self
-
-    @value.setter
-    def value(self, v):
-        self._val = v
-
-#    def __repr__(self, other):
-#        if self.value is None:
-#            return self.fn + '=' + self.root.fn
-#        else:
-#            return _repr(self.value)
-#            return '%s=%s' % (self.fn, _repr(self.value))
-
-    def __repr__(self):
-        if self.value is None:
-            return self.root.fn
-        else:
-            return _repr(self.value)
-
-    def __eq__(self, other):
-        if isinstance(other, Variable):
-
-            if self.root is other.root:
-                return True
-
-            if self.value is not None:
-                return other.value == self.value
-
-            return False
-
-        else:
-            return other == self.value
-
-#    def subst(self, v):
-#        if self in v:
-#            return v[self]
-#        return self
-
-
-def extend(v, x, t):
-    """
-    Extend valuation v with v[x] = t
-    """
-    v1 = v.copy()
-    v1[x] = t
-#    x.value = t
-    return v1
-
-
-def occurs_check(v, t):
-    """
-    Return true if variable ``v`` occurs anywhere in term ``t``."
-
-    >>> [f,g,h,X,Y,Z] = map(symbol, ['f','g','h','X','Y','Z'])
-
-    >>> occurs_check(X, f(g(h(X,Y),X)))
-    True
-
-    >>> occurs_check(Z, f(g(h(X,Y),X)))
-    False
-
-    """
-    if v == t:
-        return True
-    elif isinstance(t, Term):
-        return any(occurs_check(v, x) for x in t.args)
-    return False
-
-
-def unify_var(x, t, v):
-    """
-    Test if v can be extended with v[x] = t;
-    In that case return the extention
-    Else return None
-    """
-    if x in v:
-        return _unify(v[x], t, v)
-    elif occurs_check(x, t):
-        return None
-    else:
-        return extend(v, x, t)
-
-
-def unify(x,y):
-    return _unify(x,y,{})
-
-
-def _unify(x,y,v):
-    """
-    Find one valuation extending v and unifying x with y
-    """
-    if v is None:
-        return None
-    elif x == y:
-        return v
-    elif isinstance(x, Variable):
-        return unify_var(x, y, v)
-    elif isinstance(y, Variable):
-        return unify_var(y, x, v)
-    elif isinstance(x, Term) and isinstance(y, Term) and x.fn == y.fn:
-        if len(x.args) == len(y.args):
-            for a, b in zip(x.args, y.args):
-                v = _unify(a, b, v)
-            return v
-
-
-def symbol(name):
-    if name[0].isupper():
-        return Variable(name)
-
-    class Symbol(object):
-        def __init__(self, name):
-            self.name = name
-        def __call__(self, *args):
-            return Term('%s/%s' % (self.name, len(args)), args)
-        def __str__(self):
-            return self.name
-
-    return Symbol(name)
-
-
-#if __name__ == '__main__':
-#
-#    [f,g,h] = map(symbol, ['f','g','h'])
-#    vs = [X,Y,Z] = map(symbol, ['X','Y','Z'])
-#
-#    def test(a, b):
-#        for v in vs:
-#            v.value = None
-#
-#        print
-#        print 'unify %s and %s' % (a,b)
-#        s = unify(a, b)
-#        print '->', s
-#        if s is None:
-#            return
-#
-#        # apply new bindings
-#        for v, now in s.iteritems():
-#            print '%s [was: %r, now: %r]' % (v, v.value, now)
-#            v.value = now
-#
-#        print a, b
-#        assert a == b
-#        assert repr(a) == repr(b), [a,b]
-#
-#        for v in vs:
-#            v.value = None
-#
-#    test(f(X), f(g(h(X,Y),X)))
-#    test(f(X), f(g(h(Z),"foo")))
-#    test(f(X, Y), f("cat", 123))
-#    test(f(X), f(X))
-#    test(f(X), f(Y))
-#    test("abc", "abc")
-#
-#    Z.value = 3
-#    Y.value = Z
-#    X.value = Y
-#    print [X,Y,Z]
-#    assert X.value == Y.value == Z.value == 3