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

Remove unnecessary casts

This commit is contained in:
Sam Harwell 2012-11-27 08:11:14 -06:00
parent 8e9619a731
commit 1bc15c5926
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tool/src/org/antlr/v4/codegen/model/Choice.java
View File

@ -77,14 +77,13 @@ public abstract class Choice extends RuleElement {
return altLook; return altLook;
} }
public SrcOp addCodeForLookaheadTempVar(IntervalSet look) { public TestSetInline addCodeForLookaheadTempVar(IntervalSet look) {
List<SrcOp> testOps = factory.getLL1Test(look, ast); List<SrcOp> testOps = factory.getLL1Test(look, ast);
SrcOp expr = (SrcOp) Utils.find(testOps, TestSetInline.class); TestSetInline expr = Utils.find(testOps, TestSetInline.class);
if ( expr instanceof TestSetInline) { if (expr != null) {
TestSetInline e = (TestSetInline)expr; Decl d = new TokenTypeDecl(factory, expr.varName);
Decl d = new TokenTypeDecl(factory, e.varName);
factory.getCurrentRuleFunction().addLocalDecl(d); factory.getCurrentRuleFunction().addLocalDecl(d);
CaptureNextTokenType nextType = new CaptureNextTokenType(factory,e.varName); CaptureNextTokenType nextType = new CaptureNextTokenType(factory,expr.varName);
addPreambleOp(nextType); addPreambleOp(nextType);
} }
return expr; return expr;

7
tool/src/org/antlr/v4/codegen/model/LL1Loop.java
View File

@ -59,10 +59,9 @@ public abstract class LL1Loop extends Choice {
} }
public SrcOp addCodeForLoopLookaheadTempVar(IntervalSet look) { public SrcOp addCodeForLoopLookaheadTempVar(IntervalSet look) {
SrcOp expr = addCodeForLookaheadTempVar(look); TestSetInline expr = addCodeForLookaheadTempVar(look);
if ( expr instanceof TestSetInline ) { if (expr != null) {
TestSetInline e = (TestSetInline)expr; CaptureNextTokenType nextType = new CaptureNextTokenType(factory, expr.varName);
CaptureNextTokenType nextType = new CaptureNextTokenType(factory, e.varName);
addIterationOp(nextType); addIterationOp(nextType);
} }
return expr; return expr;