Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CUP Eclipse Plugin
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
Dr. Michael Petter
CUP Eclipse Plugin
Commits
42e5f1d1
Commit
42e5f1d1
authored
Feb 23, 2016
by
Michael Schwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce Reduce single also special case of connected
parent
4d5ce9e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
...gin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
+2
-9
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
.../src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
+10
-0
No files found.
CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java
View file @
42e5f1d1
...
...
@@ -653,18 +653,12 @@ class ConflictPanel extends Composite {
lr_item_core
item2
=
new
lr_item_core
(
rrc
.
getConflictItem2
().
the_production
(),
rrc
.
getConflictItem2
().
dot_pos
());
if
(!
cupConflictsView
.
settingOrderAffetsOtherConflicts
(
item1
,
item2
)){
ReduceReduceReorder
rrr
=
new
ReduceReduceReorder
(
cupConflictsView
.
getDocument
());
if
(
resolutionOptions
.
getSelectionIndex
()
==
1
){
rrr
.
moveItemToVeryEnd
(
rrc
.
getConflictItem1
());
rrr
.
moveItemToVeryEnd
(
rrc
.
getConflictItem2
());
cupConflictsView
.
insertSingleOrder
(
item1
,
item2
);
}
else
if
(
resolutionOptions
.
getSelectionIndex
()
==
2
){
rrr
.
moveItemToVeryEnd
(
rrc
.
getConflictItem2
());
rrr
.
moveItemToVeryEnd
(
rrc
.
getConflictItem1
());
cupConflictsView
.
insertSingleOrder
(
item2
,
item1
);
}
rrr
.
apply
();
}
else
{
cupConflictsView
.
beginConnectedResolutionRR
();
...
...
@@ -708,7 +702,6 @@ class ConflictPanel extends Composite {
try
{
resolutionButtonRRClick
();
}
catch
(
Exception
e1
)
{
// TODO Auto-generated catch block
e1
.
printStackTrace
();
}
}
...
...
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java
View file @
42e5f1d1
...
...
@@ -565,6 +565,16 @@ public class CupConflictsView extends FailableView
pti
.
setAssoc
(
terminal
,
assoc
);
pti
.
apply
(
editor
.
getDocument
());
}
void
insertSingleOrder
(
lr_item_core
higher
,
lr_item_core
lower
){
try
{
ReordersToDo
rtd
=
new
ReordersToDo
();
rtd
.
insertOrder
(
higher
,
lower
);
rtd
.
apply
(
editor
.
getDocument
());
}
catch
(
OrderCyclicException
e
)
{
e
.
printStackTrace
();
}
}
boolean
insertingPrecAffectsOtherConflicts
(
terminal
t
)
{
Integer
affected
=
terminalsAffectConflicts
.
get
(
t
);
...
...
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