Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
graph_drawing
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
graph_drawing
Commits
cccf4d63
Commit
cccf4d63
authored
Jan 24, 2012
by
Taddeus Kroes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Negated n-ary operators are now enclosed in parentheses by line generator.
parent
d1e486ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
line.py
line.py
+7
-1
tests/test_line.py
tests/test_line.py
+7
-0
No files found.
line.py
View file @
cccf4d63
...
@@ -82,7 +82,13 @@ def generate_line(root):
...
@@ -82,7 +82,13 @@ def generate_line(root):
if
is_operator
(
node
):
if
is_operator
(
node
):
if
arity
==
1
:
if
arity
==
1
:
# Unary operator
# Unary operator
result
=
op
+
traverse
(
node
[
0
])
sub_exp
=
traverse
(
node
[
0
])
if
not
isinstance
(
node
[
0
],
Leaf
)
and
len
(
node
[
0
])
>
1
:
# Negated n-ary operators should be enclosed in parentheses
sub_exp
=
'('
+
sub_exp
+
')'
result
=
op
+
sub_exp
else
:
else
:
# N-ary operator
# N-ary operator
node_pred
=
pred
(
node
)
node_pred
=
pred
(
node
)
...
...
tests/test_line.py
View file @
cccf4d63
...
@@ -153,3 +153,10 @@ class TestLine(unittest.TestCase):
...
@@ -153,3 +153,10 @@ class TestLine(unittest.TestCase):
self
.
assertTrue
(
is_int
(
neg
))
self
.
assertTrue
(
is_int
(
neg
))
self
.
assertFalse
(
is_int
(
neg_a
))
self
.
assertFalse
(
is_int
(
neg_a
))
self
.
assertFalse
(
is_int
(
plus
))
self
.
assertFalse
(
is_int
(
plus
))
def
test_negated_nary
(
self
):
neg
=
N
(
'-'
,
N
(
'+'
,
L
(
1
),
L
(
2
)))
self
.
assertEquals
(
generate_line
(
neg
),
'-(1 + 2)'
)
neg
=
N
(
'-'
,
N
(
'-'
,
L
(
1
)))
self
.
assertEquals
(
generate_line
(
neg
),
'--1'
)
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