diff options
| author | Reinier Heeres <reinier@heeres.eu> | 2007-11-18 10:45:42 (GMT) |
|---|---|---|
| committer | Reinier Heeres <reinier@heeres.eu> | 2007-11-18 10:45:42 (GMT) |
| commit | e0c9a2b65caca0b1d0d8e3c5983917d60aa3866a (patch) | |
| tree | 9198c758a2ad914dfa6e66351ac631d150b7b9e3 /eqnparser.py | |
| parent | 19b52ed3f9ababe1b09a5294f6beb12816cb217d (diff) | |
Big update; see NEWS
Diffstat (limited to 'eqnparser.py')
| -rw-r--r-- | eqnparser.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eqnparser.py b/eqnparser.py index c4ccca3..4895918 100644 --- a/eqnparser.py +++ b/eqnparser.py @@ -209,6 +209,7 @@ class EqnParser: self.register_operator('-', self.OP_PRE, 1, lambda x: self.ml.negate(x[0])) self.register_operator('*', self.OP_DIADIC, 1, lambda x: self.ml.mul(x[0], x[1])) self.register_operator(u'⨯', self.OP_DIADIC, 1, lambda x: self.ml.mul(x[0], x[1])) + self.register_operator(u'×', self.OP_DIADIC, 1, lambda x: self.ml.mul(x[0], x[1])) self.register_operator('/', self.OP_DIADIC, 1, lambda x: self.ml.div(x[0], x[1])) self.register_operator(u'÷', self.OP_DIADIC, 1, lambda x: self.ml.div(x[0], x[1])) @@ -297,7 +298,8 @@ class EqnParser: # _logger.error('EqnParser.lookup_var(): recursion detected') # return None # self.variables[name].highest_level = level - if type(self.variables[name]) is types.UnicodeType and self.parse_var[name]: + if (type(self.variables[name]) is types.UnicodeType or type(self.variables[name]) is types.StringType) \ + and self.parse_var[name]: return self.parse(self.variables[name], reset=False) else: return self.variables[name] @@ -353,9 +355,8 @@ class EqnParser: self.ps.set_error(ParserState.PARSE_ERROR, msg=_('Unable to parse argument %d: \'%s\'') % (i, args[i])) return None - res = f(pargs) try: - pass + res = f(pargs) # Maybe we should map exceptions to more obvious error messages except Exception, inst: @@ -543,7 +544,6 @@ class EqnParser: if right_val == None: return None - print('left: %r, right: %r') % (left_val, right_val) res = of([left_val, right_val]) _logger.debug('OP: %s, %s ==> %s', self.ml.format_number(left_val), self.ml.format_number(right_val), self.ml.format_number(res)) left_val = res |