With code changes, this is now unneeded

[ejpi] / src / operation.py

diff --git a/src/operation.py b/src/operation.py
index 165cac3..9a0cd5a 100644 (file)
--- a/src/operation.py
+++ b/src/operation.py
@@ -5,8 +5,8 @@ import itertools
 import functools
 import decimal
 
-from libraries.recipes import overloading
-from libraries.recipes import algorithms
+from util import overloading
+from util import algorithms
 
 
 @overloading.overloaded
@@ -157,11 +157,16 @@ class render_number(object):
 class Operation(object):
 
        def __init__(self):
-               self.base = 10
+               self._base = 10
 
        def __str__(self):
                raise NotImplementedError
 
+       @property
+       def base(self):
+               base = self._base
+               return base
+
        def get_children(self):
                return []
 
@@ -192,7 +197,7 @@ class Value(Operation):
        def __init__(self, value, base):
                super(Value, self).__init__()
                self.value = value
-               self.base = base
+               self._base = base
 
        def serialize(self, renderer):
                for item in super(Value, self).serialize(renderer):
@@ -250,7 +255,7 @@ class Variable(Operation):
                return self
 
        def evaluate(self):
-               raise KeyError
+               raise KeyError('Variable "%s" unable to evaluate to specific value' % self.name)
 
 
 class Function(Operation):
@@ -267,10 +272,11 @@ class Function(Operation):
 
        def __init__(self, *args, **kwd):
                super(Function, self).__init__()
+               self._base = None
                self._args = args
                self._kwd = kwd
-               self.__simple = self.__simplify()
-               self.__str = self.pretty_print(args, kwd)
+               self._simple = self._simplify()
+               self._str = self.pretty_print(args, kwd)
 
        def serialize(self, renderer):
                for item in super(Function, self).serialize(renderer):
@@ -283,17 +289,26 @@ class Function(Operation):
                        for arg in self._args
                )
 
+       @property
+       def base(self):
+               base = self._base
+               if base is None:
+                       bases = [arg.base for arg in self._args]
+                       base = bases[0]
+               assert base is not None
+               return base
+
        def __str__(self):
-               return self.__str
+               return self._str
 
        def simplify(self):
-               return self.__simple
+               return self._simple
 
        def evaluate(self):
                selfArgs = [arg.evaluate() for arg in self._args]
-               return Value(self._op(*selfArgs))
+               return Value(self._op(*selfArgs), self.base)
 
-       def __simplify(self):
+       def _simplify(self):
                selfArgs = [arg.simplify() for arg in self._args]
                selfKwd = dict(
                        (name, arg.simplify())
@@ -303,14 +318,11 @@ class Function(Operation):
                try:
                        args = [arg.evaluate() for arg in selfArgs]
                        base = self.base
-                       if base is None:
-                               bases = [arg.base for arg in selfArgs]
-                               base = bases[0]
                        result = self._op(*args)
 
                        node = Value(result, base)
                except KeyError:
-                       node = type(self)(*selfArgs, **selfKwd)
+                       node = self
 
                return node
 
@@ -370,7 +382,9 @@ def change_base(base, rep):
 
                def __init__(self, *args, **kwd):
                        super(GenFunc, self).__init__(*args, **kwd)
-                       self.base = base
+                       self._base = base
+                       self._simple = self._simplify()
+                       self._str = self.pretty_print(args, kwd)
 
                _op = lambda self, n: n
                _rep = Function.REP_FUNCTION