Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
trs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Taddeüs Kroes
trs
Commits
330a223a
Commit
330a223a
authored
13 years ago
by
Taddeus Kroes
Browse files
Options
Downloads
Patches
Plain Diff
Added fix(/hack) that enables use of 'd' as a variable next to being iuses in 'd/dx'.
parent
2b325ca8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/parser.py
+54
-44
54 additions, 44 deletions
src/parser.py
tests/test_parser.py
+1
-1
1 addition, 1 deletion
tests/test_parser.py
with
55 additions
and
45 deletions
src/parser.py
+
54
−
44
View file @
330a223a
...
...
@@ -59,7 +59,7 @@ class Parser(BisonParser):
# of tokens of the lex script.
tokens
=
[
'
NUMBER
'
,
'
IDENTIFIER
'
,
'
NEWLINE
'
,
'
QUIT
'
,
'
RAISE
'
,
'
GRAPH
'
,
'
LPAREN
'
,
'
RPAREN
'
,
'
FUNCTION
'
,
'
LBRACKET
'
,
'
RBRACKET
'
,
\
'
APOSTROPH
'
,
'
DE
LTA
'
]
\
'
APOSTROPH
'
,
'
DE
RIVATIVE
'
]
\
+
filter
(
lambda
t
:
t
!=
'
FUNCTION
'
,
TOKEN_MAP
.
values
())
# ------------------------------
...
...
@@ -153,13 +153,13 @@ class Parser(BisonParser):
# - "4a" with "4*a".
# - "a4" with "a^4".
pattern
=
(
'
(?:(\))\s*(\()
'
# match: )( result: ) * (
+
'
|([a-
ce-
z0-9])\s*(\()
'
# match: a( result: a * (
+
'
|(\))\s*([a-
ce-
z0-9])
'
# match: )a result: ) * a
+
'
|([a-
ce-
z])\s*([a-
ce-
z]+)
'
# match: ab result: a * b
+
'
|([0-9])\s*([a-
ce-
z])
'
# match: 4a result: 4 * a
+
'
|([a-
ce-
z])\s*([0-9])
'
# match: a4 result: a ^ 4
+
'
|([0-9])\s+([0-9]))
'
)
# match: 4 4 result: 4 * 4
pattern
=
(
'
(?:(\))\s*(\()
'
# match: )(
result: ) * (
+
'
|([a-z0-9])\s*(\()
'
# match: a(
result: a * (
+
'
|(\))\s*([a-z0-9])
'
# match: )a
result: ) * a
+
'
|([a-z])\s*([a-z]+)
'
# match: ab
result: a * b
+
'
|([0-9])\s*([a-z])
'
# match: 4a
result: 4 * a
+
'
|([a-z])\s*([0-9])
'
# match: a4
result: a ^ 4
+
'
|([0-9])\s+([0-9]))
'
)
# match: 4 4
result: 4 * 4
def
preprocess_data
(
match
):
left
,
right
=
filter
(
None
,
match
.
groups
())
...
...
@@ -183,7 +183,10 @@ class Parser(BisonParser):
# Iteratively replace all matches.
while
True
:
data_after
=
re
.
sub
(
pattern
,
preprocess_data
,
data
)
# match: d/dx result: der_x
data_after
=
re
.
sub
(
r
'
d\s*/\s*d([a-z])
'
,
r
'
der_\1
'
,
data
)
data_after
=
re
.
sub
(
pattern
,
preprocess_data
,
data_after
)
if
data
==
data_after
:
break
...
...
@@ -333,8 +336,6 @@ class Parser(BisonParser):
| unary
| binary
| nary
| bracket_derivative
| delta_derivative
"""
# | concat
...
...
@@ -349,51 +350,35 @@ class Parser(BisonParser):
if
option
==
2
:
# rule: LPAREN exp RPAREN
return
values
[
1
]
if
3
<=
option
<=
7
:
# rule: unary | binary | nary
# | bracket_derivative | delta_derivative
if
3
<=
option
<=
5
:
# rule: unary | binary | nary
return
values
[
0
]
raise
BisonSyntaxError
(
'
Unsupported option %d in target
"
%s
"
.
'
%
(
option
,
target
))
# pragma: nocover
def
on_bracket_derivative
(
self
,
target
,
option
,
names
,
values
):
"""
bracket_derivative : LBRACKET exp RBRACKET APOSTROPH
| bracket_derivative APOSTROPH
"""
op
=
[
k
for
k
,
v
in
OP_MAP
.
iteritems
()
if
v
==
OP_DERIV
][
0
]
if
option
==
0
:
# rule: LBRACKET exp RBRACKET APOSTROPH
return
Node
(
op
,
values
[
1
])
if
option
==
1
:
# rule: bracket_derivative APOSTROPH
return
Node
(
op
,
values
[
0
])
raise
BisonSyntaxError
(
'
Unsupported option %d in target
"
%s
"
.
'
%
(
option
,
target
))
# pragma: nocover
def
on_delta_derivative
(
self
,
target
,
option
,
names
,
values
):
"""
delta_derivative : DELTA DIVIDE DELTA IDENTIFIER TIMES exp
| DELTA LPAREN exp RPAREN DIVIDE DELTA IDENTIFIER
"""
#def on_delta_derivative(self, target, option, names, values):
# """
# delta_derivative : DELTA DIVIDE DELTA IDENTIFIER TIMES exp
# | DELTA LPAREN exp RPAREN DIVIDE DELTA IDENTIFIER
# """
op
=
[
k
for
k
,
v
in
OP_MAP
.
iteritems
()
if
v
==
OP_DERIV
][
0
]
#
op = [k for k, v in OP_MAP.iteritems() if v == OP_DERIV][0]
if
option
==
0
:
# rule: DELTA DIVIDE DELTA IDENTIFIER TIMES exp
return
Node
(
op
,
values
[
5
],
Leaf
(
values
[
3
]))
#
if option == 0: # rule: DELTA DIVIDE DELTA IDENTIFIER TIMES exp
#
return Node(op, values[5], Leaf(values[3]))
if
option
==
1
:
# rule: DELTA LPAREN exp RPAREN DIVIDE DELTA IDENTIFIER
return
Node
(
op
,
values
[
2
],
Leaf
(
values
[
6
]))
#
if option == 1: # rule: DELTA LPAREN exp RPAREN DIVIDE DELTA IDENTIFIER
#
return Node(op, values[2], Leaf(values[6]))
raise
BisonSyntaxError
(
'
Unsupported option %d in target
"
%s
"
.
'
%
(
option
,
target
))
# pragma: nocover
#
raise BisonSyntaxError('Unsupported option %d in target "%s".'
#
% (option, target)) # pragma: nocover
def
on_unary
(
self
,
target
,
option
,
names
,
values
):
"""
unary : MINUS exp %prec NEG
| FUNCTION exp
| DERIVATIVE TIMES exp
| bracket_derivative
"""
if
option
==
0
:
# rule: NEG exp
...
...
@@ -413,6 +398,31 @@ class Parser(BisonParser):
return
Node
(
*
values
)
if
option
==
2
:
# rule: DERIVATIVE exp
op
=
[
k
for
k
,
v
in
OP_MAP
.
iteritems
()
if
v
==
OP_DERIV
][
0
]
return
Node
(
op
,
values
[
2
],
Leaf
(
values
[
0
][
-
1
]))
if
option
==
3
:
# rule: bracket_derivative
return
values
[
0
]
raise
BisonSyntaxError
(
'
Unsupported option %d in target
"
%s
"
.
'
%
(
option
,
target
))
# pragma: nocover
def
on_bracket_derivative
(
self
,
target
,
option
,
names
,
values
):
"""
bracket_derivative : LBRACKET exp RBRACKET APOSTROPH
| bracket_derivative APOSTROPH
"""
op
=
[
k
for
k
,
v
in
OP_MAP
.
iteritems
()
if
v
==
OP_DERIV
][
0
]
if
option
==
0
:
# rule: LBRACKET exp RBRACKET APOSTROPH
return
Node
(
op
,
values
[
1
])
if
option
==
1
:
# rule: bracket_derivative APOSTROPH
return
Node
(
op
,
values
[
0
])
raise
BisonSyntaxError
(
'
Unsupported option %d in target
"
%s
"
.
'
%
(
option
,
target
))
# pragma: nocover
...
...
@@ -511,9 +521,9 @@ class Parser(BisonParser):
%%
"
d
"
{ returntoken(DE
LTA
); }
"
d
er_
"
[a-z]
{ returntoken(DE
RIVATIVE
); }
[0-9]+
"
.
"
?[0-9]* { returntoken(NUMBER); }
[a-
ce-
zA-Z] { returntoken(IDENTIFIER); }
[a-zA-Z] { returntoken(IDENTIFIER); }
"
(
"
{ returntoken(LPAREN); }
"
)
"
{ returntoken(RPAREN); }
"""
+
operators
+
r
"""
...
...
This diff is collapsed.
Click to expand it.
tests/test_parser.py
+
1
−
1
View file @
330a223a
...
...
@@ -69,4 +69,4 @@ class TestParser(unittest.TestCase):
exp
,
x
=
tree
(
'
x ^ 2, x
'
)
self
.
assertEqual
(
tree
(
'
d/dx x ^ 2
'
),
der
(
exp
,
x
))
self
.
assertEqual
(
tree
(
'
d(x ^ 2)/dx
'
),
der
(
exp
,
x
))
#
self.assertEqual(tree('d(x ^ 2)/dx'), der(exp, x))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment