Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
46686d8f
Commit
46686d8f
authored
Jun 13, 2013
by
Peter Baratta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Quick fixes in calc.py
Especially the var[0].isdigit() one.
parent
662c5779
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
common/lib/calc/calc.py
+4
-5
No files found.
common/lib/calc/calc.py
View file @
46686d8f
...
@@ -96,11 +96,11 @@ def check_variables(string, variables):
...
@@ -96,11 +96,11 @@ def check_variables(string, variables):
general_whitespace
=
re
.
compile
(
'[^
\\
w]+'
)
general_whitespace
=
re
.
compile
(
'[^
\\
w]+'
)
# List of all alnums in string
# List of all alnums in string
possible_variables
=
re
.
split
(
general_whitespace
,
string
)
possible_variables
=
re
.
split
(
general_whitespace
,
string
)
bad_variables
=
list
()
bad_variables
=
[]
for
var
in
possible_variables
:
for
var
in
possible_variables
:
if
len
(
var
)
==
0
:
if
len
(
var
)
==
0
:
continue
continue
if
var
[
0
]
<=
'9'
and
'0'
<=
var
:
# Skip things that begin with numbers
if
var
[
0
]
.
isdigit
()
:
# Skip things that begin with numbers
continue
continue
if
var
not
in
variables
:
if
var
not
in
variables
:
bad_variables
.
append
(
var
)
bad_variables
.
append
(
var
)
...
@@ -117,7 +117,7 @@ def lower_dict(input_dict):
...
@@ -117,7 +117,7 @@ def lower_dict(input_dict):
variables that have the same lowercase representation. It would be hard to
variables that have the same lowercase representation. It would be hard to
tell which is used in the final dict and which isn't.
tell which is used in the final dict and which isn't.
"""
"""
return
dict
([(
k
.
lower
(),
input_dict
[
k
])
for
k
in
input_dict
])
return
{
k
.
lower
():
v
for
k
,
v
in
input_dict
.
iteritems
()}
# The following few functions define parse actions, which are run on lists of
# The following few functions define parse actions, which are run on lists of
...
@@ -151,8 +151,7 @@ def exp_parse_action(parse_result):
...
@@ -151,8 +151,7 @@ def exp_parse_action(parse_result):
e.g. [ 3, 2, 3 ] (which is 3^2^3 = 3^(2^3)) -> 6561
e.g. [ 3, 2, 3 ] (which is 3^2^3 = 3^(2^3)) -> 6561
"""
"""
# pyparsing.ParseResults doesn't play well with reverse()
# pyparsing.ParseResults doesn't play well with reverse()
parse_result
=
parse_result
.
asList
()
parse_result
=
reversed
(
parse_result
)
parse_result
.
reverse
()
# the result of an exponentiation is called a power
# the result of an exponentiation is called a power
power
=
reduce
(
lambda
a
,
b
:
b
**
a
,
parse_result
)
power
=
reduce
(
lambda
a
,
b
:
b
**
a
,
parse_result
)
return
power
return
power
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment