Bug fix with bases and improved error display for evaluating variables

git-svn-id: file:///svnroot/ejpi/trunk@30 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d

diff --git a/src/operation.py b/src/operation.py
index 4465f62..48659df 100644 (file)
--- a/src/operation.py
+++ b/src/operation.py
@@ -255,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):
@@ -306,7 +306,7 @@ class Function(Operation):
 
        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):
                selfArgs = [arg.simplify() for arg in self._args]