Commit aac36302 authored by Michael Schwarz's avatar Michael Schwarz

panel for SR conflict always include terminal in lookahead even output

is truncated
parent ee55970d
......@@ -486,7 +486,12 @@ class ConflictPanel extends Composite {
String s = item.toString();
if(s.length() > 100){
s = "[" +item.to_simple_string() +",{...}]";
if(item.dot_at_end() && conflict instanceof ShiftReduceConflict){
s = "[" +item.to_simple_string() +",{" + ((ShiftReduceConflict)conflict).getTerminal().name() +",...}]";
}
else {
s = "[" +item.to_simple_string() +",{...}]";
}
}
return s.replace("(*)", "\u2022");
......@@ -625,7 +630,7 @@ class ConflictPanel extends Composite {
};
/**
* Show the message that the precedences were cyclic. Reset the dropdown to the vlaue determined by the
* Show the message that the precedences were cyclic. Reset the dropdown to the value determined by the
* precedences
* @param e Exception that caused this. Contains cycle
*/
......
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