|
 |
fad3d03 |
From 33f662c60e6e7b703e197854d2478a8747f044f0 Mon Sep 17 00:00:00 2001
|
|
|
fad3d03 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
fad3d03 |
Date: Tue, 17 Jun 2014 19:36:24 +0200
|
|
|
fad3d03 |
Subject: [PATCH] java8 fix
|
|
|
fad3d03 |
|
|
|
fad3d03 |
Signed-off-by: Michael Simacek <msimacek@redhat.com>
|
|
|
fad3d03 |
---
|
|
|
fad3d03 |
tool/src/main/java/org/antlr/codegen/CodeGenerator.java | 2 +-
|
|
|
fad3d03 |
tool/src/main/java/org/antlr/tool/Grammar.java | 4 ++--
|
|
|
fad3d03 |
tool/src/main/java/org/antlr/tool/Strip.java | 2 +-
|
|
|
fad3d03 |
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
fad3d03 |
|
|
|
fad3d03 |
diff --git a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
|
|
fad3d03 |
index b279bd5..566e33c 100644
|
|
|
fad3d03 |
--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
|
|
fad3d03 |
+++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
|
|
fad3d03 |
@@ -1087,7 +1087,7 @@ public class CodeGenerator {
|
|
|
fad3d03 |
catch (Exception tse) {
|
|
|
fad3d03 |
ErrorManager.internalError("can't parse template action",tse);
|
|
|
fad3d03 |
}
|
|
|
fad3d03 |
- GrammarAST rewriteTree = parseResult.getTree();
|
|
|
fad3d03 |
+ GrammarAST rewriteTree = (GrammarAST)parseResult.getTree();
|
|
|
fad3d03 |
|
|
|
fad3d03 |
// then translate via codegen.g
|
|
|
fad3d03 |
CodeGenTreeWalker gen = new CodeGenTreeWalker(new CommonTreeNodeStream(rewriteTree));
|
|
|
fad3d03 |
diff --git a/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java
|
|
|
fad3d03 |
index 667ebb2..4ca4328 100644
|
|
|
fad3d03 |
--- a/tool/src/main/java/org/antlr/tool/Grammar.java
|
|
|
fad3d03 |
+++ b/tool/src/main/java/org/antlr/tool/Grammar.java
|
|
|
fad3d03 |
@@ -706,7 +706,7 @@ public class Grammar {
|
|
|
fad3d03 |
}
|
|
|
fad3d03 |
}
|
|
|
fad3d03 |
|
|
|
fad3d03 |
- setGrammarTree(result.getTree());
|
|
|
fad3d03 |
+ setGrammarTree((GrammarAST)result.getTree());
|
|
|
fad3d03 |
|
|
|
fad3d03 |
//if ( grammarTree!=null ) System.out.println("grammar tree: "+grammarTree.toStringTree());
|
|
|
fad3d03 |
|
|
|
fad3d03 |
@@ -927,7 +927,7 @@ public class Grammar {
|
|
|
fad3d03 |
parser.setGrammarType(this.type);
|
|
|
fad3d03 |
try {
|
|
|
fad3d03 |
ANTLRParser.rule_return result = parser.rule();
|
|
|
fad3d03 |
- return result.getTree();
|
|
|
fad3d03 |
+ return (GrammarAST)result.getTree();
|
|
|
fad3d03 |
}
|
|
|
fad3d03 |
catch (Exception e) {
|
|
|
fad3d03 |
ErrorManager.error(ErrorManager.MSG_ERROR_CREATING_ARTIFICIAL_RULE,
|
|
|
fad3d03 |
diff --git a/tool/src/main/java/org/antlr/tool/Strip.java b/tool/src/main/java/org/antlr/tool/Strip.java
|
|
|
fad3d03 |
index f411090..ddda4ed 100644
|
|
|
fad3d03 |
--- a/tool/src/main/java/org/antlr/tool/Strip.java
|
|
|
fad3d03 |
+++ b/tool/src/main/java/org/antlr/tool/Strip.java
|
|
|
fad3d03 |
@@ -64,7 +64,7 @@ public class Strip {
|
|
|
fad3d03 |
tokens = new TokenRewriteStream(lex);
|
|
|
fad3d03 |
ANTLRv3Parser g = new ANTLRv3Parser(tokens);
|
|
|
fad3d03 |
ANTLRv3Parser.grammarDef_return r = g.grammarDef();
|
|
|
fad3d03 |
- CommonTree t = r.getTree();
|
|
|
fad3d03 |
+ CommonTree t = (CommonTree)r.getTree();
|
|
|
fad3d03 |
if (tree_option) System.out.println(t.toStringTree());
|
|
|
fad3d03 |
rewrite(g.getTreeAdaptor(),t,g.getTokenNames());
|
|
|
fad3d03 |
}
|
|
|
fad3d03 |
--
|
|
|
fad3d03 |
2.7.4
|
|
|
fad3d03 |
|