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

Merge branch 'override-ruleindex' of github.com:sharwell/antlr4

This commit is contained in:
Terence Parr 2012-03-27 15:09:50 -07:00
parent 41e97791bb df2e24a228
commit bf07f7907f
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/Java/src/org/antlr/v4/runtime/Parser.java
View File

@ -45,18 +45,18 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
public class TraceListener implements ParseListener<Token> { public class TraceListener implements ParseListener<Token> {
@Override @Override
public void enterNonLRRule(ParserRuleContext<Token> ctx) { public void enterNonLRRule(ParserRuleContext<Token> ctx) {
System.out.println("enter " + getRuleNames()[ctx.ruleIndex] + ", LT(1)=" + _input.LT(1).getText()); System.out.println("enter " + getRuleNames()[ctx.getRuleIndex()] + ", LT(1)=" + _input.LT(1).getText());
} }
@Override @Override
public void exitEveryRule(ParserRuleContext<Token> ctx) { public void exitEveryRule(ParserRuleContext<Token> ctx) {
System.out.println("exit "+getRuleNames()[ctx.ruleIndex]+", LT(1)="+_input.LT(1).getText()); System.out.println("exit "+getRuleNames()[ctx.getRuleIndex()]+", LT(1)="+_input.LT(1).getText());
} }
@Override @Override
public void visitTerminal(ParserRuleContext<Token> parent, Token token) { public void visitTerminal(ParserRuleContext<Token> parent, Token token) {
System.out.println("consume "+token+" rule "+ System.out.println("consume "+token+" rule "+
getRuleNames()[parent.ruleIndex]+ getRuleNames()[parent.getRuleIndex()]+
" alt="+parent.altNum); " alt="+parent.altNum);
} }
} }
@ -380,7 +380,6 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
public void enterRule(ParserRuleContext<Token> localctx, int ruleIndex) { public void enterRule(ParserRuleContext<Token> localctx, int ruleIndex) {
_ctx = localctx; _ctx = localctx;
_ctx.start = _input.LT(1); _ctx.start = _input.LT(1);
_ctx.ruleIndex = ruleIndex;
if (_buildParseTrees) addContextToParseTree(); if (_buildParseTrees) addContextToParseTree();
if ( _parseListeners != null) triggerEnterRuleEvent(); if ( _parseListeners != null) triggerEnterRuleEvent();
} }
@ -408,7 +407,6 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
public void pushNewRecursionContext(ParserRuleContext<Token> localctx, int ruleIndex) { public void pushNewRecursionContext(ParserRuleContext<Token> localctx, int ruleIndex) {
_ctx = localctx; _ctx = localctx;
_ctx.start = _input.LT(1); _ctx.start = _input.LT(1);
_ctx.ruleIndex = ruleIndex;
} }
public void unrollRecursionContexts(ParserRuleContext<Token> _parentctx) { public void unrollRecursionContexts(ParserRuleContext<Token> _parentctx) {

7
runtime/Java/src/org/antlr/v4/runtime/ParserRuleContext.java
View File

@ -103,9 +103,6 @@ public class ParserRuleContext<Symbol extends Token> extends RuleContext {
public Symbol start, stop; public Symbol start, stop;
/** Set during parsing to identify which rule parser is in. */
public int ruleIndex;
/** Set during parsing to identify which alt of rule parser is in. */ /** Set during parsing to identify which alt of rule parser is in. */
public int altNum; public int altNum;
@ -126,7 +123,6 @@ public class ParserRuleContext<Symbol extends Token> extends RuleContext {
this.start = ctx.start; this.start = ctx.start;
this.stop = ctx.stop; this.stop = ctx.stop;
this.ruleIndex = ctx.ruleIndex;
} }
public ParserRuleContext(@Nullable ParserRuleContext<Symbol> parent, int invokingStateNumber, int stateNumber) { public ParserRuleContext(@Nullable ParserRuleContext<Symbol> parent, int invokingStateNumber, int stateNumber) {
@ -295,9 +291,6 @@ public class ParserRuleContext<Symbol extends Token> extends RuleContext {
@Override @Override
public int getChildCount() { return children!=null ? children.size() : 0; } public int getChildCount() { return children!=null ? children.size() : 0; }
@Override
public int getRuleIndex() { return ruleIndex; }
@Override @Override
public Interval getSourceInterval() { public Interval getSourceInterval() {
if ( start==null || stop==null ) return Interval.INVALID; if ( start==null || stop==null ) return Interval.INVALID;

1
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -608,6 +608,7 @@ public static class <struct.name> extends <superClass><if(interfaces)> implement
super(parent, state); super(parent, state);
<struct.ctorAttrs:{a | this.<a.name> = <a.name>;}; separator="\n"> <struct.ctorAttrs:{a | this.<a.name> = <a.name>;}; separator="\n">
} }
@Override public int getRuleIndex() { return RULE_<struct.derivedFromName>; }
<if(struct.provideCopyFrom)> <! don't need copy unless we have subclasses !> <if(struct.provideCopyFrom)> <! don't need copy unless we have subclasses !>
public <struct.name>() { } public <struct.name>() { }
public void copyFrom(<struct.name> ctx) { public void copyFrom(<struct.name> ctx) {