From d0aa3d0a4f323cb1464c02d53711c2a0cd24c10d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Jun 2014 19:36:24 +0200 Subject: [PATCH] java8 fix Signed-off-by: Michael Simacek --- tool/src/main/java/org/antlr/codegen/CodeGenerator.java | 2 +- tool/src/main/java/org/antlr/tool/ErrorManager.java | 1 - tool/src/main/java/org/antlr/tool/Grammar.java | 4 ++-- tool/src/main/java/org/antlr/tool/Strip.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java index 57495b2..eada38e 100644 --- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java +++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java @@ -1087,7 +1087,7 @@ public class CodeGenerator { catch (Exception tse) { ErrorManager.internalError("can't parse template action",tse); } - GrammarAST rewriteTree = parseResult.getTree(); + GrammarAST rewriteTree = (GrammarAST)parseResult.getTree(); // then translate via codegen.g CodeGenTreeWalker gen = new CodeGenTreeWalker(new CommonTreeNodeStream(rewriteTree)); diff --git a/tool/src/main/java/org/antlr/tool/ErrorManager.java b/tool/src/main/java/org/antlr/tool/ErrorManager.java index d3223ae..122c861 100644 --- a/tool/src/main/java/org/antlr/tool/ErrorManager.java +++ b/tool/src/main/java/org/antlr/tool/ErrorManager.java @@ -385,7 +385,6 @@ public class ErrorManager { public void runTimeError(STMessage msg) { switch (msg.error) { case NO_SUCH_ATTRIBUTE: - case NO_SUCH_ATTRIBUTE_PASS_THROUGH: case NO_SUCH_PROPERTY: ErrorManager.warning(ErrorManager.MSG_STRING_TEMPLATE_ERROR, msg.toString()); return; diff --git a/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java index 91bbad9..dc4774a 100644 --- a/tool/src/main/java/org/antlr/tool/Grammar.java +++ b/tool/src/main/java/org/antlr/tool/Grammar.java @@ -706,7 +706,7 @@ public class Grammar { } } - setGrammarTree(result.getTree()); + setGrammarTree((GrammarAST)result.getTree()); //if ( grammarTree!=null ) System.out.println("grammar tree: "+grammarTree.toStringTree()); @@ -927,7 +927,7 @@ public class Grammar { parser.setGrammarType(this.type); try { ANTLRParser.rule_return result = parser.rule(); - return result.getTree(); + return (GrammarAST)result.getTree(); } catch (Exception e) { ErrorManager.error(ErrorManager.MSG_ERROR_CREATING_ARTIFICIAL_RULE, diff --git a/tool/src/main/java/org/antlr/tool/Strip.java b/tool/src/main/java/org/antlr/tool/Strip.java index f411090..ddda4ed 100644 --- a/tool/src/main/java/org/antlr/tool/Strip.java +++ b/tool/src/main/java/org/antlr/tool/Strip.java @@ -64,7 +64,7 @@ public class Strip { tokens = new TokenRewriteStream(lex); ANTLRv3Parser g = new ANTLRv3Parser(tokens); ANTLRv3Parser.grammarDef_return r = g.grammarDef(); - CommonTree t = r.getTree(); + CommonTree t = (CommonTree)r.getTree(); if (tree_option) System.out.println(t.toStringTree()); rewrite(g.getTreeAdaptor(),t,g.getTokenNames()); } -- 1.9.3