Skip to content

GitLab

Commit 599d462e authored by Michael Schwarz's avatar Michael Schwarz
Browse files
Options

exclude resolved conflicts from trace as well

parent a8a6967e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment