Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Michael Schwarz
CUP Eclipse Plugin
Commits
599d462e
Commit
599d462e
authored
Feb 23, 2016
by
Michael Schwarz
🤔
Browse files
exclude resolved conflicts from trace as well
parent
a8a6967e
Changes
1
Hide whitespace changes
Inline
Side-by-side
CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictGraphView.java
View file @
599d462e
...
...
@@ -70,6 +70,7 @@ import de.in.tum.www2.cup.ShiftReduceConflict;
import
de.in.tum.www2.cup.ast.Symbol
;
import
de.in.tum.www2.cup.internal.lalr_state
;
import
de.tum.in.www2.cupplugin.Colors
;
import
de.tum.in.www2.cupplugin.conflictresolution.ConflictFilter
;
import
de.tum.in.www2.cupplugin.controller.Controller
;
import
de.tum.in.www2.cupplugin.controller.Controller.JobsToDo
;
import
de.tum.in.www2.cupplugin.controller.IRegisterForControllerChanges
;
...
...
@@ -396,9 +397,9 @@ public class CupConflictGraphView extends CupGraphBase implements
}
conflictResolutionManager
.
setLaLrContext
(
lalrContext
);
// TODO: This should only contain tainted states!!
List
<
Conflict
>
allInterstingConflicts
=
conflictResolutionManager
.
getAllConflicts
(
);
ConflictFilter
cf
=
new
ConflictFilter
(
editor
.
getDocument
());
List
<
Conflict
>
allInterstingConflicts
=
cf
.
getConflictsNotResolved
(
conflictResolutionManager
);
List
<
String
>
stateNames
=
new
ArrayList
<
String
>();
for
(
Conflict
conf
:
allInterstingConflicts
)
{
lalr_state
state
=
conf
.
getState
();
...
...
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