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

Merge branch 'master' into tree-patterns

This commit is contained in:
Terence Parr 2013-11-20 16:49:27 -08:00
parent 42cdf244eb cc07f8faec
commit 1c71d05074
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tool/src/org/antlr/v4/tool/interp/InterpreterRuleContext.java → runtime/Java/src/org/antlr/v4/runtime/InterpreterRuleContext.java
View File

@ -27,9 +27,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.tool.interp;
package org.antlr.v4.runtime;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.misc.Nullable;
/** This object is used by the ParserInterpreter and is the same as a regular

5
tool/src/org/antlr/v4/tool/interp/ParserInterpreter.java
View File

@ -30,10 +30,11 @@
package org.antlr.v4.tool.interp;
import org.antlr.runtime.Token;
import org.antlr.v4.runtime.FailedPredicateException;
import org.antlr.v4.runtime.InterpreterRuleContext;
import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNState;
@ -213,7 +214,7 @@ public class ParserInterpreter extends Parser {
case Transition.RANGE:
case Transition.SET:
case Transition.NOT_SET:
if (!transition.matches(_input.LA(1), Token.MIN_TOKEN_TYPE, 65535)) {
if (!transition.matches(_input.LA(1), Token.MIN_USER_TOKEN_TYPE, 65535)) {
_errHandler.recoverInline(this);
}
matchWildcard();