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

tweaks per Sam's comment. define default version so targets don't fail to compile.

This commit is contained in:
Terence Parr 2014-05-28 11:26:44 -07:00
parent db0830e00d
commit 0b8a70a2a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class Tool {
public static final String VERSION;
static {
String version = Tool.class.getPackage().getImplementationVersion();
VERSION = version != null ? version : "4.2";
VERSION = version != null ? version : "4.3";
}
public static final String GRAMMAR_EXTENSION = ".g4";

4
tool/src/org/antlr/v4/codegen/Target.java
View File

@ -92,15 +92,15 @@ public abstract class Target {
* For now, a simple string match used on x.y of x.y.z scheme. We use a method to avoid mismatches
* between a template called VERSION. This value is checked against Tool.VERSION during load of templates.
*/
public abstract String getVersion();
public String getVersion() { return "4.3"; }
public STGroup getTemplates() {
if (templates == null) {
templates = loadTemplates();
String version = getVersion();
if (version == null || !version.equals(Tool.VERSION)) {
gen.tool.errMgr.toolError(ErrorType.INCOMPATIBLE_TOOL_AND_TEMPLATES, version, Tool.VERSION, language);
}
templates = loadTemplates();
}
return templates;