forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'tool-cleanup' of git://github.com/sharwell/antlr4

This commit is contained in:
Terence Parr 2012-04-04 13:06:55 -07:00
parent 16046a7ec1 2c1f673f62
commit cdb357b37f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/src/org/antlr/v4/Tool.java
View File

@ -74,6 +74,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public class Tool { public class Tool {
public String VERSION = "4.0-"+new Date(); public String VERSION = "4.0-"+new Date();
@ -166,8 +167,7 @@ public class Tool {
public ErrorManager errMgr = new ErrorManager(this); public ErrorManager errMgr = new ErrorManager(this);
public LogManager logMgr = new LogManager(); public LogManager logMgr = new LogManager();
List<ANTLRToolListener> listeners = List<ANTLRToolListener> listeners = new CopyOnWriteArrayList<ANTLRToolListener>();
Collections.synchronizedList(new ArrayList<ANTLRToolListener>());
/** Track separately so if someone adds a listener, it's the only one /** Track separately so if someone adds a listener, it's the only one
* instead of it and the default stderr listener. * instead of it and the default stderr listener.

12
tool/src/org/antlr/v4/tool/ErrorType.java
View File

@ -185,16 +185,18 @@ public enum ErrorType {
; ;
public String msg; public final String msg;
public int code; // unique, deterministic unchanging error code once we release public final int code; // unique, deterministic unchanging error code once we release
public ErrorSeverity severity; public final ErrorSeverity severity;
public Boolean abortsAnalysis; public final Boolean abortsAnalysis;
public Boolean abortsCodegen; public final Boolean abortsCodegen;
ErrorType(int code, String msg, ErrorSeverity severity) { ErrorType(int code, String msg, ErrorSeverity severity) {
this.code = code; this.code = code;
this.msg = msg; this.msg = msg;
this.severity = severity; this.severity = severity;
this.abortsAnalysis = false;
this.abortsCodegen = false;
} }
// ErrorType(String msg, ErrorSeverity severity, boolean abortsAnalysis) { // ErrorType(String msg, ErrorSeverity severity, boolean abortsAnalysis) {