Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
trs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Taddeüs Kroes
trs
Commits
974545c7
Commit
974545c7
authored
Sep 13, 2012
by
Taddeüs Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed bug in preprocessor that caused 'pi*a' to occur as 'pi a'.
parent
47ed0625
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
25 deletions
+20
-25
TODO
TODO
+0
-2
src/parser.py
src/parser.py
+17
-23
tests/test_parser.py
tests/test_parser.py
+3
-0
No files found.
TODO
View file @
974545c7
...
@@ -58,8 +58,6 @@ Division of 0 by 1 reduces to 0.
...
@@ -58,8 +58,6 @@ Division of 0 by 1 reduces to 0.
- Line printer: 1 / (n + n)x -> 1 / (n + n) * x
- Line printer: 1 / (n + n)x -> 1 / (n + n) * x
- Parser: 'apia' -> 'aa'
- Unit tests for strategy.
- Unit tests for strategy.
- Parser: add unit tests for operator associativity (derivatives/integrals).
- Parser: add unit tests for operator associativity (derivatives/integrals).
...
...
src/parser.py
View file @
974545c7
...
@@ -179,32 +179,24 @@ class Parser(BisonParser):
...
@@ -179,32 +179,24 @@ class Parser(BisonParser):
# Replace known keywords with escape sequences.
# Replace known keywords with escape sequences.
words
=
list
(
self
.
__class__
.
words
)
words
=
list
(
self
.
__class__
.
words
)
words
.
insert
(
10
,
'
\
n
'
)
words
.
insert
(
10
,
'
\
n
'
)
words
.
insert
(
13
,
'
\
r
'
)
for
i
,
keyword
in
enumerate
(
words
):
for
i
,
keyword
in
enumerate
(
words
):
# FIXME: Why case-insensitivity?
# FIXME: Why case-insensitivity?
data
=
re
.
sub
(
keyword
,
chr
(
i
),
data
,
flags
=
re
.
I
)
data
=
re
.
sub
(
keyword
,
chr
(
i
),
data
,
flags
=
re
.
I
)
# TODO: remove this quick preprocessing hack. This hack enables
rsv
=
'
\
x00
-
\
x09
\
x0b
-
\
x0c
\
x0e
-
\
x19
'
# concatenated expressions, since the grammar currently does not
# support those. This workaround will replace:
# - ")(" with ")*(".
# - "a(" with "a*(".
# - ")a" with ")*a".
# - "ab" with "a*b".
# - "4a" with "4*a".
# - "a4" with "a^4".
pattern
=
(
'(?:(
\
))
\
s*([([])'
# )( -> ) * (
pattern
=
(
'(?:(
\
))
\
s*([([])'
# )( -> ) * (
# )[ -> ) * [
# )[ -> ) * [
+
'|([
\
x00
-
\
x09
\
x0b
-
\
x19
a-z0-9])
\
s*([([])
'
# a( -> a * (
+
'|([
'
+
rsv
+
'a-z0-9])
\
s*([([])
'
# a( -> a * (
# a[ -> a * [
# a[ -> a * [
+ '
|
(
\
))
\
s
*
([
\
x00
-
\
x09
\
x0b
-
\
x19a
-
z0
-
9
])
'
# )a -> ) * a
+ '
|
(
\
))
\
s
*
([
' + rsv + '
a
-
z0
-
9
])
'
# )a -> ) * a
+ '
|
([
\
x00
-
\
x09
\
x0b
-
\
x19
a
-
z
])
\
s
*
'
+ '
|
([
' + rsv + '
a
-
z
])
\
s
*
'
+ '
([
\
x00
-
\
x09
\
x0b
-
\
x19a
-
z0
-
9
])
'
# ab -> a * b
+ '
([
' + rsv + '
a
-
z0
-
9
])
'
# ab -> a * b
+ '
|
(
\
|
)(
\
|
)
' # || -> | * |
+ '
|
(
\
|
)(
\
|
)
' # || -> | * |
+ '
|
([
0
-
9
])
\
s
*
([
\
x00
-
\
x09
\
x0b
-
\
x19a
-
z
])
'
# 4a -> 4 * a
+ '
|
([
0
-
9
])
\
s
*
([
' + rsv + '
a
-
z
])
'
# 4a -> 4 * a
+ '
|
([
\
x00
-
\
x09
\
x0b
-
\
x19a
-
z
])([
0
-
9
])
'
# a4 -> a ^ 4
+ '
|
([
' + rsv + '
a
-
z
])([
0
-
9
])
'
# a4 -> a ^ 4
+ '
|
([
\
x00
-
\
x09
\
x0b
-
\
x190
-
9
])(
\
s
+
[
0
-
9
]))
'
# 4 4 -> 4 * 4
+ '
|
([
' + rsv + '
0
-
9
])(
\
s
+
[
0
-
9
]))
'
# 4 4 -> 4 * 4
)
)
def preprocess_data(match):
def preprocess_data(match):
...
@@ -213,7 +205,9 @@ class Parser(BisonParser):
...
@@ -213,7 +205,9 @@ class Parser(BisonParser):
# Make sure there are no multiplication and exponentiation signs
# Make sure there are no multiplication and exponentiation signs
# inserted between a function and its argument(s): "sin x" should
# inserted between a function and its argument(s): "sin x" should
# not be written as "sin*x", because that is bogus.
# not be written as "sin*x", because that is bogus.
if ord(left) <= 0x9 or 0x0b <= ord(left) <= 0x19:
# Bugfix: omit 0x0e (pi) to prevent "pi a" (should be "pi*a")
if ord(left) <= 0x9 or 0x0b <= ord(left) <= 0x0d
\
or 0x0f <= ord(left) <= 0x19:
return left + '
' + right
return left + '
' + right
# If all characters on the right are numbers. e.g. "a4", the
# If all characters on the right are numbers. e.g. "a4", the
...
@@ -223,7 +217,7 @@ class Parser(BisonParser):
...
@@ -223,7 +217,7 @@ class Parser(BisonParser):
# return '%s^%s' % (left, right)
# return '%s^%s' % (left, right)
# match: ab | abc | abcd (where left = "a")
# match: ab | abc | abcd (where left = "a")
return
'*'
.
join
([
left
]
+
list
(
r
e
.
sub
(
r'^ +'
,
''
,
right
)))
return
'*'
.
join
([
left
]
+
list
(
r
ight
.
lstrip
(
)))
if
self
.
verbose
:
# pragma: nocover
if
self
.
verbose
:
# pragma: nocover
data_before
=
data
data_before
=
data
...
...
tests/test_parser.py
View file @
974545c7
...
@@ -187,3 +187,6 @@ class TestParser(RulesTestCase):
...
@@ -187,3 +187,6 @@ class TestParser(RulesTestCase):
def
test_precedence
(
self
):
def
test_precedence
(
self
):
self
.
assertEqual
(
tree
(
'ab / cd'
),
tree
(
'a * (b / c) * d'
))
self
.
assertEqual
(
tree
(
'ab / cd'
),
tree
(
'a * (b / c) * d'
))
def
test_pi_multiplication_sign
(
self
):
self
.
assertEqual
(
tree
(
'apia'
),
tree
(
'a * pi * a'
))
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