Commit 7e04d127 authored by Michael Schwarz's avatar Michael Schwarz 🤔
Browse files

Replaced (*) with UTF-8 bullet character

parent b6ddbaef
...@@ -139,7 +139,7 @@ public class CupEditorErrorReporter implements IErrorReporter { ...@@ -139,7 +139,7 @@ public class CupEditorErrorReporter implements IErrorReporter {
msg.errorType = errorType; msg.errorType = errorType;
msg.source = source; msg.source = source;
msg.errorCode = errorCode; msg.errorCode = errorCode;
msg.message = message; msg.message = message.replace("(*)", "\u2022");
msg.start = start; msg.start = start;
msg.end = end; msg.end = end;
lst.add(msg); lst.add(msg);
......
...@@ -230,7 +230,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -230,7 +230,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
links.add(conflict1Ast.getRange()); links.add(conflict1Ast.getRange());
} }
try { try {
builder.append(rrc.getConflictItem1().to_simple_string()); builder.append(prettyString(rrc.getConflictItem1()));
} catch (internal_error e1) { } catch (internal_error e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
...@@ -247,7 +247,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -247,7 +247,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
links.add(conflict2Ast.getRange()); links.add(conflict2Ast.getRange());
} }
try { try {
builder.append(rrc.getConflictItem2().to_simple_string()); builder.append(prettyString(rrc.getConflictItem2()));
} catch (internal_error e1) { } catch (internal_error e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
...@@ -286,7 +286,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -286,7 +286,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
links.add(conflict1Ast.getRange()); links.add(conflict1Ast.getRange());
} }
try { try {
builder.append(src.getConflictItem1().to_simple_string()); builder.append(prettyString(src.getConflictItem1()));
} catch (internal_error e1) { } catch (internal_error e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
...@@ -304,7 +304,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -304,7 +304,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
links.add(conflict2ItemAst.getRange()); links.add(conflict2ItemAst.getRange());
} }
try { try {
builder.append(item.to_simple_string()); builder.append(prettyString(item));
} catch (internal_error e1) { } catch (internal_error e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
...@@ -325,7 +325,11 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -325,7 +325,11 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
} }
} }
// replace (*) generated by CUP with BULLET U+2022 •
private String prettyString(lalr_item item) throws internal_error {
return item.to_simple_string().replace("(*)", "\u2022");
}
} }
public CupConflictsView(Composite realParent, Jumper jumper, public CupConflictsView(Composite realParent, Jumper jumper,
......
Supports Markdown
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