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

Merge remote-tracking branch 'sharwell/automata-cleanup'

This commit is contained in:
Terence Parr 2012-08-04 12:04:09 -07:00
parent f8aeb04eda 674471c090
commit 20d96b0a86
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/src/org/antlr/v4/automata/ATNVisitor.java
View File

@ -57,5 +57,5 @@ public class ATNVisitor {
} }
} }
public void visitState(ATNState s) { } public void visitState(@NotNull ATNState s) { }
} }

13
tool/src/org/antlr/v4/automata/ParserATNFactory.java
View File

@ -103,7 +103,14 @@ public class ParserATNFactory implements ATNFactory {
public int currentOuterAlt; public int currentOuterAlt;
public ParserATNFactory(@NotNull Grammar g) { this.g = g; atn = new ATN(); } public ParserATNFactory(@NotNull Grammar g) {
if (g == null) {
throw new NullPointerException("g");
}
this.g = g;
this.atn = new ATN();
}
@Override @Override
public ATN createATN() { public ATN createATN() {
@ -288,7 +295,7 @@ public class ParserATNFactory implements ATNFactory {
/** Build what amounts to an epsilon transition with an action. /** Build what amounts to an epsilon transition with an action.
* The action goes into ATN though it is ignored during prediction * The action goes into ATN though it is ignored during prediction
* if actionIndex < 0. Only forced are executed during prediction. * if actionIndex &lt; 0. Only forced are executed during prediction.
*/ */
@Override @Override
public Handle action(ActionAST action) { public Handle action(ActionAST action) {
@ -323,7 +330,7 @@ public class ParserATNFactory implements ATNFactory {
* begin/end. * begin/end.
* *
* Special case: if just a list of tokens/chars/sets, then collapse * Special case: if just a list of tokens/chars/sets, then collapse
* to a single edge'd o-set->o graph. * to a single edged o-set->o graph.
* *
* TODO: Set alt number (1..n) in the states? * TODO: Set alt number (1..n) in the states?
*/ */