first set of changes #4
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| bin.includes = META-INF/,\ | ||
| . | ||
| output.. = bin/ | ||
| jars.extra.classpath = ../ant.jar | ||
| source.. = src/ | ||
| jre.compilation.profile = JavaSE-1.8 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,113 @@ | ||
| package com.github.jhoenicke.javacup; | ||
|
|
||
| import java.util.Set; | ||
| import java.util.TreeSet; | ||
|
|
||
| import com.github.jhoenicke.javacup.runtime.Symbol; | ||
|
|
||
| public class ErrorManager { | ||
|
|
||
| private static ErrorManager errorManager; | ||
|
|
||
| static enum Severity { | ||
| Info, | ||
| Warning, | ||
| Error, | ||
| Fatal, | ||
| } | ||
|
|
||
| private int infos = 0; | ||
| private int warnings = 0; | ||
| private int errors = 0; | ||
| private int fatals = 0; | ||
|
|
||
| private Set<String> filter; | ||
|
|
||
| private ErrorManager() { | ||
| } | ||
|
|
||
| public static ErrorManager getManager() { | ||
| if (errorManager == null) errorManager = new ErrorManager(); | ||
| return errorManager; | ||
| } | ||
|
|
||
| public static void clear () { | ||
| errorManager = null; | ||
| } | ||
|
|
||
| private Set<String> getFilter () { | ||
| if (filter == null) filter = new TreeSet<>(); | ||
| return filter; | ||
| } | ||
|
|
||
| public int getFatalCount() { | ||
| return fatals; | ||
| } | ||
|
|
||
| public int getErrorCount() { | ||
| return errors; | ||
| } | ||
|
|
||
| public int getWarningCount() { | ||
| return warnings; | ||
| } | ||
|
|
||
| /** | ||
| * Error message format: | ||
| * ERRORLEVEL : MESSAGE @ Symbol: name#token=="value"(line/column) | ||
| * ERRORLEVEL : MESSAGE | ||
| **/ | ||
|
|
||
| private void emit (Severity severity, String message, Symbol sym) { | ||
|
Member
There was a problem hiding this comment. nit-pick: no space before "(".
Author
There was a problem hiding this comment. Sorry I did not know this rule. I will respect it later. |
||
| if (sym != null && sym.value != null) { | ||
|
Member
There was a problem hiding this comment. Not sure if this is a good idea. What is the intention? It looks like it stops printing multiple error messages for the same location. Also since the ErrorManager is static, this would mean that on the second run the errors are no longer printed, doesn't it?
Author
There was a problem hiding this comment. It is a filter on the same symbol. IOn the previous release only the first message is emitted and subsequent messages vanishes. With this filter, a second (third,...) message about the same symbol (should exists and have a value) is not printed. So only the first one is printed but other error about other symbols are printed too.
Author
There was a problem hiding this comment. Sorry, I forgot to reply about the second run. No problem, In Main I call a clear method which nullify the instance so the getter will recreate one fresh with all fields set to initial value.
Member
There was a problem hiding this comment. I think this is a bit dangerous and sym.value may not even mean the right thing. The symbol is really the location in the source file where the error happened and it can be any error like undeclared symbol, symbols declared multiple times, or a unrecoverable syntax error. You may hide some error message here. If you just don't want to get multiple warnings about undefined symbols, it would be better to do this in the parser and keep a set of symbols that were already warned about there. This way you can be sure that only these kind of double reports are omitted and you get for free the clearing of the set. |
||
| if (getFilter().contains(sym.value.toString())) return; | ||
| getFilter().add(sym.value.toString()); | ||
| } | ||
| StringBuilder tmp = new StringBuilder(); | ||
| tmp.append(severity.name()); | ||
| tmp.append(": "); | ||
| tmp.append(message); | ||
| if (sym != null) { | ||
| tmp.append(" @ "); | ||
| tmp.append(sym); | ||
| } | ||
| System.err.println(tmp); | ||
| } | ||
|
|
||
| public void emit_info(String message) { | ||
| emit_info(message, null); | ||
| } | ||
|
|
||
| public void emit_info(String message, Symbol sym) { | ||
| emit(Severity.Info, message, sym); | ||
| infos++; | ||
| } | ||
|
|
||
| public void emit_warning(String message) { | ||
| emit_warning(message, null); | ||
| } | ||
|
|
||
| public void emit_warning(String message, Symbol sym) { | ||
| emit(Severity.Warning, message, sym); | ||
| warnings++; | ||
| } | ||
|
|
||
| public void emit_error(String message) { | ||
| emit_error(message, null); | ||
| } | ||
|
|
||
| public void emit_error(String message, Symbol sym) { | ||
| emit(Severity.Error, message, sym); | ||
| errors++; | ||
| } | ||
|
|
||
| public void emit_fatal(String message) { | ||
| emit_fatal(message, null); | ||
| } | ||
|
|
||
| public void emit_fatal(String message, Symbol sym) { | ||
| emit(Severity.Fatal, message, sym); | ||
| fatals++; | ||
| } | ||
|
|
||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these changes intended?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes/no, in fact I move the ant.jat outside the projet as I have to download it separatly. Unfortunatly, I have to update the build.properties (but may be it is environnement dependant and should not be part of a git.