Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug where -(7+5) didn't work

Browse Source
This commit is contained in:
Piotr Mitros
2012-01-03 19:23:54 -05:00
parent 522ef1cdc4
commit eb68f73ea7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
courseware/calc.py
View File

@@ -102,7 +102,7 @@ def evaluator(variables, functions, string):
paritem=paritem.setParseAction(parallel)
term = paritem + ZeroOrMore((times|div)+paritem)
term = term.setParseAction(prod_parse_action)
expr << term + ZeroOrMore((plus|minus)+term)
expr << Optional((plus|minus)) + term + ZeroOrMore((plus|minus)+term)
expr=expr.setParseAction(sum_parse_action)
return expr.parseString(string)[0]
@@ -115,3 +115,4 @@ if __name__=='__main__':
#
print evaluator({'a': 2.2997471478310274, 'k': 9, 'm': 8, 'x': 0.66009498411213041}, {}, "5")
print evaluator({},{}, "-1")
print evaluator({},{}, "-(7+5)")