Mon, 04 May 2015 00:50:18 +0300
heh
124
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
1 | ''' |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
2 | Copyright 2015 Teemu Piippo |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
3 | All rights reserved. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
4 | |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
5 | Redistribution and use in source and binary forms, with or without |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
6 | modification, are permitted provided that the following conditions |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
7 | are met: |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
8 | |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
9 | 1. Redistributions of source code must retain the above copyright |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
10 | notice, this list of conditions and the following disclaimer. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
11 | 2. Redistributions in binary form must reproduce the above copyright |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
12 | notice, this list of conditions and the following disclaimer in the |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
13 | documentation and/or other materials provided with the distribution. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
14 | 3. The name of the author may not be used to endorse or promote products |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
15 | derived from this software without specific prior written permission. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
16 | |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
17 | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
18 | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
19 | OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
20 | IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
21 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
22 | NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
23 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
24 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
25 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
26 | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
27 | ''' |
7b2cd8b1ba86
- now with extra license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
123
diff
changeset
|
28 | |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
29 | import re |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
30 | import cmath |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
31 | import math |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
32 | import random |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
33 | import time |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
34 | import operator |
125
c44b1aa85257
- added hex support to the calculator
Teemu Piippo <crimsondusk64@gmail.com>
parents:
124
diff
changeset
|
35 | import string |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
36 | from copy import deepcopy |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
37 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
38 | epsilon = 1e-10 |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
39 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
40 | # http://stackoverflow.com/a/2182437 |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
41 | class Enum (set): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
42 | def __init__ (self, *args): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
43 | super (Enum, self).__init__ (args) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
44 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
45 | def __getattr__ (self, name): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
46 | if name in self: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
47 | return name |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
48 | raise AttributeError |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
49 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
50 | def __setattr__ (self, name, value): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
51 | raise AttributeError |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
52 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
53 | class Operator (object): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
54 | def __init__ (self, name, symbol, operands, priority, function): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
55 | self.name = name |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
56 | self.symbol = symbol |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
57 | self.operands = operands |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
58 | self.priority = priority |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
59 | self.function = function |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
60 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
61 | def __str__ (self): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
62 | return '''<operator %s>''' % self.name |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
63 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
64 | def __repr__ (self): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
65 | return self.__str__() |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
66 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
67 | class FunctionCall (object): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
68 | def __init__ (self, funcname, args): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
69 | assert (type(args) is list) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
70 | self.funcname = funcname |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
71 | self.args = args |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
72 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
73 | def __str__ (self): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
74 | return '''<function %s (%s)>''' % (self.funcname, self.args) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
75 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
76 | def __repr__ (self): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
77 | return self.__str__() |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
78 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
79 | def do_realf (func, *args): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
80 | for x in args: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
81 | if x.imag: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
82 | raise ValueError ('%s called with a complex number' % func.__name__) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
83 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
84 | return func (*[x.real for x in args]) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
85 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
86 | def do_intf (func, *args): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
87 | for x in args: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
88 | if x.imag: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
89 | raise ValueError ('%s called with a complex number' % func.__name__) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
90 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
91 | if x.real - math.floor (x.real): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
92 | raise ValueError ('%s called with a floating point number' % func.__name__) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
93 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
94 | return func (*[int (x.real) for x in args]) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
95 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
96 | def realf (func): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
97 | return lambda *args: do_realf (func, *args) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
98 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
99 | def intf (func): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
100 | return lambda *args: do_intf (func, *args) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
101 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
102 | Operators = [] |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
103 | OperatorData = { |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
104 | 'lneg': { 'symbol': '!', 'operands': 1, 'priority': 5, 'function': lambda x: not x }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
105 | 'compl': { 'symbol': '~', 'operands': 1, 'priority': 5, 'function': intf (operator.inv) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
106 | 'neg': { 'symbol': '-', 'operands': 1, 'priority': 5, 'function': lambda x: -x }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
107 | 'pow': { 'symbol': '**', 'operands': 2, 'priority': 10, 'function': lambda x, y: x ** y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
108 | 'mul': { 'symbol': '*', 'operands': 2, 'priority': 50, 'function': lambda x, y: x * y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
109 | 'div': { 'symbol': '/', 'operands': 2, 'priority': 50, 'function': lambda x, y: x / y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
110 | 'mod': { 'symbol': '%', 'operands': 2, 'priority': 50, 'function': lambda x, y: math.fmod (x, y) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
111 | 'add': { 'symbol': '+', 'operands': 2, 'priority': 100, 'function': lambda x, y: x + y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
112 | 'sub': { 'symbol': '-', 'operands': 2, 'priority': 100, 'function': lambda x, y: x - y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
113 | 'eq': { 'symbol': '==', 'operands': 2, 'priority': 500, 'function': lambda x, y: x == y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
114 | 'neq': { 'symbol': '!=', 'operands': 2, 'priority': 500, 'function': lambda x, y: x != y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
115 | 'lt': { 'symbol': '<', 'operands': 2, 'priority': 500, 'function': lambda x, y: x < y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
116 | 'lteq': { 'symbol': '<=', 'operands': 2, 'priority': 500, 'function': lambda x, y: x <= y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
117 | 'gt': { 'symbol': '>', 'operands': 2, 'priority': 500, 'function': lambda x, y: x > y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
118 | 'gteq': { 'symbol': '>=', 'operands': 2, 'priority': 500, 'function': lambda x, y: x >= y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
119 | 'btand': { 'symbol': '&', 'operands': 2, 'priority': 600, 'function': intf (operator.and_) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
120 | 'btxor': { 'symbol': '^', 'operands': 2, 'priority': 601, 'function': intf (operator.xor) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
121 | 'btor': { 'symbol': '|', 'operands': 2, 'priority': 602, 'function': intf (operator.or_) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
122 | 'and': { 'symbol': '&&', 'operands': 2, 'priority': 603, 'function': lambda x, y: x and y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
123 | 'or': { 'symbol': '||', 'operands': 2, 'priority': 604, 'function': lambda x, y: x or y }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
124 | } |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
125 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
126 | for name, data in OperatorData.iteritems(): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
127 | Operators.append (Operator (name=name, symbol=data['symbol'], operands=data['operands'], |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
128 | priority=data['priority'], function=data['function'])) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
129 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
130 | OperatorSymbols={} |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
131 | for op in Operators: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
132 | if op.symbol in OperatorSymbols: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
133 | OperatorSymbols[op.symbol].append (op) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
134 | else: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
135 | OperatorSymbols[op.symbol] = [op] |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
136 | |
131
7349e9c6176b
Added sgn(x) to .calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
130
diff
changeset
|
137 | def sgn (x): |
7349e9c6176b
Added sgn(x) to .calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
130
diff
changeset
|
138 | return cmp (x, 0) |
7349e9c6176b
Added sgn(x) to .calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
130
diff
changeset
|
139 | |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
140 | Constants = { |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
141 | 'pi': cmath.pi, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
142 | 'e': cmath.e, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
143 | 'phi': 1.6180339887498948482, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
144 | 'epsilon': epsilon, |
132 | 145 | 'potato': cmath.sqrt(8) / 3, |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
146 | } |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
147 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
148 | random.seed (time.time()) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
149 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
150 | Functions = { |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
151 | 'round': { 'function': realf (round) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
152 | 'floor': { 'function': realf (math.floor) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
153 | 'ceil': { 'function': realf (math.ceil) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
154 | 'fact': { 'function': intf (math.factorial) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
155 | 'abs': { 'function': realf (math.fabs) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
156 | 'degrees': { 'function': realf (math.degrees) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
157 | 'radians': { 'function': realf (math.radians) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
158 | 'erf': { 'function': realf (math.erf) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
159 | 'erfc': { 'function': realf (math.erfc) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
160 | 'gamma': { 'function': realf (math.gamma) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
161 | 'lgamma': { 'function': realf (math.lgamma) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
162 | 'sqrt': { 'function': cmath.sqrt }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
163 | 'ln': { 'function': cmath.log }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
164 | 'log': { 'function': cmath.log10 }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
165 | 'sin': { 'function': cmath.sin }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
166 | 'sinh': { 'function': cmath.sinh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
167 | 'asin': { 'function': cmath.asin }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
168 | 'asinh': { 'function': cmath.asinh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
169 | 'cos': { 'function': cmath.cos }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
170 | 'cosh': { 'function': cmath.cosh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
171 | 'acos': { 'function': cmath.acos }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
172 | 'acosh': { 'function': cmath.acosh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
173 | 'tan': { 'function': cmath.tan }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
174 | 'tanh': { 'function': cmath.tanh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
175 | 'atan': { 'function': cmath.atan }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
176 | 'atanh': { 'function': cmath.atanh }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
177 | 'exp': { 'function': cmath.exp }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
178 | 'phase': { 'function': cmath.phase }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
179 | 'lg': { 'function': lambda x: cmath.log (x, 2) }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
180 | 're': { 'function': lambda x: x.real }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
181 | 'im': { 'function': lambda x: x.imag }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
182 | 'conjugate':{ 'function': lambda x: x.conjugate() }, |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
183 | 'rand': { 'function': random.random }, |
131
7349e9c6176b
Added sgn(x) to .calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
130
diff
changeset
|
184 | 'sgn': { 'function': realf (sgn) }, |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
185 | } |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
186 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
187 | Tokens = ['(', ')'] |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
188 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
189 | # Symbol table |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
190 | SymbolType = Enum ('CONSTANT', 'FUNCTION', 'OPERATOR', 'TOKEN') |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
191 | SymbolTypes = {} |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
192 | Symbols = [] |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
193 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
194 | for name, value in Constants.iteritems(): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
195 | Symbols.append (name) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
196 | SymbolTypes[name] = SymbolType.CONSTANT |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
197 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
198 | for name, data in Functions.iteritems(): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
199 | Symbols.append (name) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
200 | SymbolTypes[name] = SymbolType.FUNCTION |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
201 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
202 | for op in Operators: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
203 | if op.symbol not in Symbols: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
204 | Symbols.append (op.symbol) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
205 | SymbolTypes[op.symbol] = SymbolType.OPERATOR |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
206 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
207 | for name in Tokens: |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
208 | SymbolTypes[name] = SymbolType.TOKEN |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
209 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
210 | Symbols += Tokens |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
211 | Symbols = sorted (Symbols, key=lambda x: len (x), reverse=True) |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
212 | PreferredBase = 10 |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
213 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
214 | def set_preferred_base(x): |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
215 | global PreferredBase |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
216 | PreferredBase = x |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
217 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
218 | def rindex (li, value): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
219 | return (len(li) - 1) - li[::-1].index(value) |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
220 | |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
221 | def realPrint (x): |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
222 | print x |
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
223 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
224 | Attributes = { |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
225 | 'hex': lambda self: self.set_preferred_base (0x10), |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
226 | 'binary': lambda self: self.set_preferred_base (0b10), |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
227 | 'decimal': lambda self: self.set_preferred_base (10), |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
228 | } |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
229 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
230 | Attributes['bin'] = Attributes['binary'] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
231 | Attributes['dec'] = Attributes['decimal'] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
232 | AttributeNames = sorted ([key for key in Attributes], key=lambda x:len(x), reverse=True) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
233 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
234 | class Calculator (object): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
235 | def __init__ (self): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
236 | self.preferred_base = None |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
237 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
238 | def set_preferred_base (self, x): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
239 | self.preferred_base = x |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
240 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
241 | def trim_spaces (self, expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
242 | return re.sub ('\s+', '', expr.strip()) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
243 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
244 | def parse_attributes (self, expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
245 | if expr[0] != '<': |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
246 | return expr |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
247 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
248 | i = 1 |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
249 | while expr[i] != '>': |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
250 | if expr[i] == '|': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
251 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
252 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
253 | for name in AttributeNames: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
254 | if expr[i:i + len(name)] == name: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
255 | Attributes[name] (self) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
256 | i += len(name) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
257 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
258 | if expr[i] == '>': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
259 | break |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
260 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
261 | if expr[i] != '|': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
262 | raise ValueError ('malformed attributes') |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
263 | break |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
264 | else: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
265 | raise ValueError ('bad attributes: %s' % expr[i:]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
266 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
267 | return expr[i + 1:] |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
268 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
269 | def parse_number (self, expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
270 | """Tries to parse a number from the expression. Returns (value, length) on success.""" |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
271 | i = 0 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
272 | value = None |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
273 | base = 10 |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
274 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
275 | # Possibly it's hexadecimal |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
276 | if expr[0:2].lower() == '0x': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
277 | base = 0x10 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
278 | digits = string.hexdigits |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
279 | digitname = 'hexit' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
280 | i = 2 |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
281 | elif expr[0:2].lower() == '0b': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
282 | base = 0b10 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
283 | digits = ['0', '1'] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
284 | digitname = 'bit' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
285 | i = 2 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
286 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
287 | if base != 10: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
288 | if not self.preferred_base: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
289 | self.preferred_base = base |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
290 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
291 | # Skip leading zeroes |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
292 | while i < len (expr) and expr[i] == '0': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
293 | i += 1 |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
294 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
295 | startingIndex = i |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
296 | while i < len (expr) and expr[i] in digits: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
297 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
298 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
299 | if i < len(expr) and expr[i] == '.': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
300 | raise ValueError ('non-decimal floating point numbers are not supported') |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
301 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
302 | if i == startingIndex: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
303 | if i < len (expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
304 | raise ValueError ('not a valid %s "%s" in %s' % (digitname, expr[i], expr[0:i+1])) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
305 | else: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
306 | raise ValueError ('end of expression encountered while parsing ' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
307 | 'base-%d literal' % base) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
308 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
309 | return (complex (int (expr[startingIndex:i], base), 0), i) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
310 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
311 | if expr[0] == 'i': |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
312 | # Special case, we just have 'i' -- need special handling here because otherwise this would |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
313 | # call float('') in the complex number routine, which throws an error. |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
314 | # TODO: maybe 'i' can be a symbol instead? |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
315 | return (1j, 1) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
316 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
317 | # Try parse increasingly long substrings until we are unable to create a float or complex number |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
318 | # from it. |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
319 | try: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
320 | while i < len (expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
321 | if expr[i] == 'i': |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
322 | value = complex (0.0, float (expr[:i])) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
323 | else: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
324 | value = complex (float (expr [:i + 1]), 0.0) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
325 | i += 1 |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
326 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
327 | return (value, i) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
328 | except ValueError: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
329 | if i != 0: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
330 | # Got a number (the error happened when we tried to parse past the number) |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
331 | return (value, i) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
332 | else: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
333 | # The error happened on the first character. So this is not a number. |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
334 | return None |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
335 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
336 | def parse_symbol (self, expr): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
337 | for sym in Symbols: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
338 | if expr[:len (sym)] == sym: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
339 | return sym |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
340 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
341 | return None |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
342 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
343 | def tokenize (self, expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
344 | i=0 |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
345 | tokens = [] |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
346 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
347 | while i < len(expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
348 | sym = self.parse_symbol (expr[i:]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
349 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
350 | if sym: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
351 | symtype = SymbolTypes[sym] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
352 | if symtype == SymbolType.CONSTANT: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
353 | tokens.append (Constants[sym]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
354 | else: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
355 | tokens.append (sym) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
356 | |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
357 | i += len(sym) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
358 | continue |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
359 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
360 | result = self.parse_number (expr[i:]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
361 | if result: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
362 | num, length = result |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
363 | tokens.append (num) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
364 | i += length |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
365 | continue |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
366 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
367 | raise ValueError ("""bad expression, couldn't parse: %s""" % expr[i:]) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
368 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
369 | return tokens |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
370 | |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
371 | def process_parens (self, expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
372 | """Processes parentheses of expr into sublists in-place. |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
373 | [1.0, '*', '(', 3.5, '+', 1j, ')'] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
374 | -> [1.0, '*', [3.5, '+', 1j]]""" |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
375 | if '(' not in expr and ')' not in expr: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
376 | return |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
377 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
378 | try: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
379 | parenStart = rindex (expr, '(') |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
380 | parenEnd = expr.index (')', parenStart) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
381 | except ValueError: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
382 | raise ValueError ("""mismatched parentheses in expression: %s""" % expr) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
383 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
384 | subexpr = expr[parenStart + 1:parenEnd] |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
385 | del expr[parenStart + 1:parenEnd + 1] |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
386 | expr[parenStart] = subexpr |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
387 | self.process_parens (expr) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
388 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
389 | def process_functions (self, expr): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
390 | """Processes functions in-place""" |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
391 | i = 0 |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
392 | while i < len (expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
393 | if type (expr[i]) is list: |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
394 | self.process_functions (expr[i]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
395 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
396 | if (type(expr[i]) is not str) or (expr[i] not in Functions): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
397 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
398 | continue |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
399 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
400 | # Ensure that arguments follow |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
401 | if (i + 1 >= len (expr)) or (type (expr[i + 1]) is not list): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
402 | raise ValueError ("""function %s used without arguments""" % expr[i]) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
403 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
404 | args = expr[i + 1] |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
405 | del expr[i + 1] |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
406 | expr[i] = FunctionCall (expr[i], args) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
407 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
408 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
409 | def is_operand (self, x): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
410 | # Operands can be either lists (which also mean parens, thus can be single-expressions) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
411 | # or complex numbers |
132 | 412 | return type(x) in [complex, list, FunctionCall] |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
413 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
414 | def find_fitting_operator (self, sym, numOperands): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
415 | # Pass 1: exact numOperands match |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
416 | for op in Operators: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
417 | if op.symbol != sym: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
418 | continue |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
419 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
420 | if op.operands == numOperands: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
421 | return op |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
422 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
423 | # Pass 2: by symbol |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
424 | for op in Operators: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
425 | if op.symbol == sym: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
426 | return op |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
427 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
428 | raise ValueError ('''unknown operator %s!''' % sym) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
429 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
430 | def process_operators (self, expr): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
431 | """Processes operators""" |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
432 | i = 0 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
433 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
434 | # Find all operators in this expression |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
435 | while i < len (expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
436 | if type (expr[i]) is list: |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
437 | self.process_functions (expr[i]) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
438 | self.process_operators (expr[i]) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
439 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
440 | if type (expr[i]) is FunctionCall: |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
441 | self.process_functions (expr[i].args) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
442 | self.process_operators (expr[i].args) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
443 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
444 | if (type(expr[i]) is not str) or (expr[i] not in OperatorSymbols): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
445 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
446 | continue |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
447 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
448 | args = [] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
449 | argIndices = [] |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
450 | if i > 0 and self.is_operand (expr[i - 1]): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
451 | args.append (expr[i - 1]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
452 | argIndices.append (i - 1) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
453 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
454 | if i - 1 < len(expr) and self.is_operand (expr[i + 1]): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
455 | args.append (expr[i + 1]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
456 | argIndices.append (i + 1) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
457 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
458 | # Resolve operators with the same symbol based on operand count |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
459 | numOperands = 0 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
460 | for arg in args: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
461 | if self.is_operand (arg): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
462 | numOperands += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
463 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
464 | expr[i] = self.find_fitting_operator (expr[i], numOperands) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
465 | i += 1 |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
466 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
467 | def find_priority_operator (self, expr): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
468 | """Finds the operator with most priority in the expression""" |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
469 | bestOp = None |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
470 | bestOpIndex = -1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
471 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
472 | for i in range (0, len (expr)): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
473 | sym = expr[i] |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
474 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
475 | if type (sym) is not Operator: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
476 | continue |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
477 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
478 | if not bestOp or sym.priority < bestOp.priority: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
479 | bestOp = sym |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
480 | bestOpIndex = i |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
481 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
482 | return (bestOp, bestOpIndex) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
483 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
484 | def evaluate (self, expr, verbose=False): |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
485 | printFunc = realPrint if verbose else lambda x:None |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
486 | printFunc (self.tabs + 'Preprocess: %s' % expr) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
487 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
488 | # If there are sub-expressions in here, those need to be evaluated first |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
489 | i = 0 |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
490 | while i < len (expr): |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
491 | sym = expr[i] |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
492 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
493 | if type (sym) is list and sym: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
494 | printFunc (self.tabs + 'Evaluating sub-expression: %s' % (sym)) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
495 | self.tabs += '\t' |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
496 | expr[i] = self.evaluate (list (sym), verbose) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
497 | self.tabs = self.tabs[:-1] |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
498 | printFunc (self.tabs + '-> %s' % expr[i]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
499 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
500 | # If there are function calls, evaluate those |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
501 | if type (sym) is FunctionCall: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
502 | self.tabs += '\t' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
503 | if sym.args: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
504 | sym.args = [self.evaluate (sym.args, verbose)] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
505 | self.tabs = self.tabs[:-1] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
506 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
507 | printFunc (self.tabs + 'Evaluating function call: %s' % (sym)) |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
508 | expr[i] = Functions[sym.funcname]['function'] (*sym.args) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
509 | printFunc (self.tabs + '-> %s' % expr[i]) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
510 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
511 | i += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
512 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
513 | printFunc (self.tabs + 'Evaluate: %s' % expr) |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
514 | runaway = 0 |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
515 | while True: |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
516 | runaway += 1 |
127
66b206bd9510
Cranked up the runaway (8 was only for testing)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
126
diff
changeset
|
517 | if runaway > 1000: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
518 | raise ValueError ('infinite loop detected') |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
519 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
520 | op, i = self.find_priority_operator (expr) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
521 | if not op: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
522 | break |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
523 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
524 | if op.operands == 2: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
525 | argIndices = [i - 1, i + 1] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
526 | else: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
527 | argIndices = [i + 1] |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
528 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
529 | args = [expr[x] for x in argIndices] |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
530 | argIndices = sorted (argIndices, reverse=True) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
531 | printFunc (self.tabs + 'Processing: (%s, %d) with args %s' % (op, i, args)) |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
532 | expr[i] = op.function (*args) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
533 | printFunc (self.tabs + '-> %s' % expr[i]) |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
534 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
535 | for i2 in argIndices: |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
536 | del expr[i2] |
126
0fc519afba89
- added binary support for calc
Teemu Piippo <crimsondusk64@gmail.com>
parents:
125
diff
changeset
|
537 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
538 | printFunc (self.tabs + 'Result: %s' % expr[0]) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
539 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
540 | if len(expr) != 1: |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
541 | printFunc (self.tabs + 'Bad expression detected, tokens: %s' % expr) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
542 | raise ValueError ('malformed expression') |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
543 | |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
544 | return expr[0] |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
545 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
546 | def repr_number (self, x): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
547 | """Returns a string representation for a real number""" |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
548 | base = self.preferred_base if self.preferred_base else 10 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
549 | if math.fabs (x - math.floor(x)) < epsilon and base != 10: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
550 | digits='0123456789abcdef' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
551 | assert base <= len (digits), '''base %d is too large''' % base |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
552 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
553 | divisor = base |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
554 | rep = '' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
555 | x = int (x) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
556 | runaway = 0 |
125
c44b1aa85257
- added hex support to the calculator
Teemu Piippo <crimsondusk64@gmail.com>
parents:
124
diff
changeset
|
557 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
558 | while x > 0: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
559 | runaway += 1 |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
560 | if runaway > 1000: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
561 | raise ValueError('runaway triggered') |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
562 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
563 | i = (x % divisor) / (divisor / base) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
564 | x -= i * (divisor / base) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
565 | rep += digits[i] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
566 | divisor *= base |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
567 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
568 | rep += 'x' if base == 16 else 'b' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
569 | rep += '0' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
570 | return rep[::-1] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
571 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
572 | rep = '%.10f' % x |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
573 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
574 | if '.' in rep: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
575 | while rep[-1] == '0': |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
576 | rep = rep[:-1] |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
577 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
578 | if rep[-1] == '.': |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
579 | rep = rep[:-1] |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
580 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
581 | return rep |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
582 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
583 | def repr_imaginary (self, x): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
584 | rep = self.repr_number (x) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
585 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
586 | if rep == '1': |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
587 | return 'i' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
588 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
589 | if rep == '-1': |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
590 | return '-i' |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
591 | |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
592 | return rep + 'i' |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
593 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
594 | def represent (self, x): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
595 | """Returns a string representation of a float or complex number""" |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
596 | if math.fabs (x.imag) > epsilon: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
597 | if math.fabs (x.real) > epsilon: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
598 | # Complex number |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
599 | return '%s %s %s' % (self.repr_number (x.real), |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
600 | '+' if x.imag >= 0 else '-', |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
601 | self.repr_imaginary (math.fabs (x.imag))) |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
602 | else: |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
603 | # Pure imaginary number |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
604 | return self.repr_imaginary (x.imag) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
605 | else: |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
606 | # Real number |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
607 | return self.repr_number (x.real) |
123
aeb0d0788869
- added commits.db and mercurial support restructure
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
608 | |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
609 | def calc (self, expr, verbose=False): |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
610 | self.state = {} |
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
611 | self.tabs = '' |
130
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
612 | expr = self.trim_spaces (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
613 | expr = self.parse_attributes (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
614 | expr = self.tokenize (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
615 | self.process_parens (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
616 | self.process_functions (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
617 | self.process_operators (expr) |
c82cef747008
- reverted previous commit (now that was a bad idea)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
129
diff
changeset
|
618 | result = self.evaluate (expr, verbose) |
128
bd949c554dd2
Major refactor: moved calculator routines into a Calculator class.
Teemu Piippo <crimsondusk64@gmail.com>
parents:
127
diff
changeset
|
619 | return self.represent (result) |