|
|
@@ -162,15 +162,16 @@ class Parser(BisonParser):
|
|
|
# - "4a" with "4*a".
|
|
|
# - "a4" with "a^4".
|
|
|
|
|
|
- pattern = ('(?:(\))\s*(\()' # )( -> ) * (
|
|
|
- + '|(\))\s*(\[)' # )[ -> ) * [
|
|
|
- + '|([\x00-\x09\x0b-\x19a-z0-9])\s*(\()' # a( -> a * (
|
|
|
- + '|(\))\s*([\x00-\x09\x0b-\x19a-z0-9])' # )a -> ) * a
|
|
|
+ pattern = ('(?:(\))\s*(\(|\[)' # )( -> ) * (
|
|
|
+ # )[ -> ) * [
|
|
|
+ + '|([\x00-\x09\x0b-\x19a-z0-9])\s*(\(|\[)' # a( -> a * (
|
|
|
+ # a[ -> a * [
|
|
|
+ + '|(\))\s*([\x00-\x09\x0b-\x19a-z0-9])' # )a -> ) * a
|
|
|
+ '|([\x00-\x09\x0b-\x19a-z])\s*'
|
|
|
- + '([\x00-\x09\x0b-\x19a-z])' # ab -> a * b
|
|
|
- + '|([0-9])\s*([\x00-\x09\x0b-\x19a-z])' # 4a -> 4 * a
|
|
|
- + '|([\x00-\x09\x0b-\x19a-z])\s*([0-9])' # a4 -> a ^ 4
|
|
|
- + '|([0-9])\s+([0-9]))' # 4 4 -> 4 * 4
|
|
|
+ + '([\x00-\x09\x0b-\x19a-z])' # ab -> a * b
|
|
|
+ + '|([0-9])\s*([\x00-\x09\x0b-\x19a-z])' # 4a -> 4 * a
|
|
|
+ + '|([\x00-\x09\x0b-\x19a-z])\s*([0-9])' # a4 -> a ^ 4
|
|
|
+ + '|([0-9])\s+([0-9]))' # 4 4 -> 4 * 4
|
|
|
)
|
|
|
|
|
|
def preprocess_data(match):
|