projects
/
linpy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4540f52
)
Format comments in domains.py
author
Vivien Maisonneuve
<v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 15:05:54 +0000
(17:05 +0200)
committer
Vivien Maisonneuve
<v.maisonneuve@gmail.com>
Tue, 19 Aug 2014 15:05:54 +0000
(17:05 +0200)
linpy/domains.py
patch
|
blob
|
history
diff --git
a/linpy/domains.py
b/linpy/domains.py
index
799b99d
..
b950e1e
100644
(file)
--- a/
linpy/domains.py
+++ b/
linpy/domains.py
@@
-703,17
+703,17
@@
class Domain(GeometricObject):
Create a domain from a string. Raise SyntaxError if the string is not
properly formatted.
"""
Create a domain from a string. Raise SyntaxError if the string is not
properly formatted.
"""
- #
remove curly brackets
+ #
Remove curly brackets.
string = cls._RE_BRACES.sub(r'', string)
string = cls._RE_BRACES.sub(r'', string)
- #
replace '=' by '=='
+ #
Replace '=' by '=='.
string = cls._RE_EQ.sub(r'\1==\2', string)
string = cls._RE_EQ.sub(r'\1==\2', string)
- #
replace 'and', 'or', 'not'
+ #
Replace 'and', 'or', 'not'.
string = cls._RE_AND.sub(r' & ', string)
string = cls._RE_OR.sub(r' | ', string)
string = cls._RE_NOT.sub(r' ~', string)
string = cls._RE_AND.sub(r' & ', string)
string = cls._RE_OR.sub(r' | ', string)
string = cls._RE_NOT.sub(r' ~', string)
- #
add implicit multiplication operators, e.g. '5x' -> '5*x'
+ #
Add implicit multiplication operators, e.g. '5x' -> '5*x'.
string = cls._RE_NUM_VAR.sub(r'\1*\2', string)
string = cls._RE_NUM_VAR.sub(r'\1*\2', string)
- #
add parentheses to force precedence
+ #
Add parentheses to force precedence.
tokens = cls._RE_OPERATORS.split(string)
for i, token in enumerate(tokens):
if i % 2 == 0:
tokens = cls._RE_OPERATORS.split(string)
for i, token in enumerate(tokens):
if i % 2 == 0: