Skip to content

Compiler errors without column #9683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2020
Merged

Compiler errors without column #9683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e9f7a6
Fix exception on compiler errors with column numbers
matthijskooijman Jan 28, 2020
e387c23
Slightly simplify error message rebuilding
matthijskooijman Jan 28, 2020
3d4b026
Preserve "fatal" in compiler errors
matthijskooijman Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions arduino-core/src/cc/arduino/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ enum BuilderAction {
}
}

private static final Pattern ERROR_FORMAT = Pattern.compile("(.+\\.\\w+):(\\d+)(:\\d+)*:\\s*(fatal)?\\s*error:\\s*(.*)\\s*", Pattern.MULTILINE | Pattern.DOTALL);
private static final Pattern ERROR_FORMAT = Pattern.compile("(.+\\.\\w+):(\\d+)(:\\d+)*:\\s*((fatal)?\\s*error:\\s*)(.*)\\s*", Pattern.MULTILINE | Pattern.DOTALL);

private final File pathToSketch;
private final Sketch sketch;
Expand Down Expand Up @@ -516,16 +516,14 @@ public void message(String s) {

if (pieces != null) {
String msg = "";
int errorIdx = pieces.length - 1;
String error = pieces[errorIdx];
String filename = pieces[1];
int line = PApplet.parseInt(pieces[2]);
int col;
if (errorIdx > 3) {
int col = -1;
if (pieces[3] != null) {
col = PApplet.parseInt(pieces[3].substring(1));
} else {
col = -1;
}
String errorPrefix = pieces[4];
String error = pieces[6];

if (error.trim().equals("SPI.h: No such file or directory")) {
error = tr("Please import the SPI library from the Sketch > Import Library menu.");
Expand Down Expand Up @@ -585,11 +583,8 @@ public void message(String s) {
String fileName = ex.getCodeFile().getPrettyName();
int lineNum = ex.getCodeLine() + 1;
int colNum = ex.getCodeColumn();
if (colNum != -1) {
s = fileName + ":" + lineNum + ":" + colNum + ": error: " + error + msg;
} else {
s = fileName + ":" + lineNum + ": error: " + error + msg;
}
String column = (colNum != -1) ? (":" + colNum) : "";
s = fileName + ":" + lineNum + column + ": " + errorPrefix + error + msg;
}

if (ex != null) {
Expand Down