add import for BaseTest so tool tests compile. it all appears to compile and tool tests pass.

This commit is contained in:
parrt 2015-06-24 18:08:34 -07:00
parent e1c22147f8
commit 1cd4ad125c
35 changed files with 40 additions and 4 deletions

View File

@ -902,7 +902,7 @@ public abstract class BaseTest {
return filtered;
}
void checkRuleATN(Grammar g, String ruleName, String expecting) {
public void checkRuleATN(Grammar g, String ruleName, String expecting) {
DOTGenerator dot = new DOTGenerator(g);
System.out.println(dot.getDOT(g.atn.ruleToStartState[g.getRule(ruleName).index]));
@ -1266,7 +1266,7 @@ public abstract class BaseTest {
}
public static class IntTokenStream implements TokenStream {
IntegerList types;
public IntegerList types;
int p=0;
public IntTokenStream(IntegerList types) { this.types = types; }

View File

@ -36,6 +36,8 @@ import org.antlr.v4.automata.ParserATNFactory;
import org.antlr.v4.parse.ANTLRParser;
import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNState;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.test.runtime.java.ErrorQueue;
import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;

View File

@ -34,6 +34,7 @@ import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNDeserializer;
import org.antlr.v4.runtime.atn.ATNSerializer;
import org.antlr.v4.runtime.misc.Utils;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -39,6 +39,7 @@ import org.antlr.v4.runtime.atn.BlockStartState;
import org.antlr.v4.runtime.atn.LexerATNSimulator;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.IntegerList;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.DOTGenerator;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;

View File

@ -35,6 +35,7 @@ import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNState;
import org.antlr.v4.runtime.misc.Utils;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.DOTGenerator;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -41,6 +41,7 @@ import org.antlr.v4.runtime.atn.LexerATNSimulator;
import org.antlr.v4.runtime.atn.PredictionContextCache;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.IntegerList;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.DOTGenerator;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LeftRecursiveRule;

View File

@ -32,6 +32,7 @@ package org.antlr.v4.test.tool;
import org.antlr.v4.runtime.atn.ATN;
import org.antlr.v4.runtime.atn.ATNSerializer;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.DOTGenerator;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;

View File

@ -34,6 +34,7 @@ import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.Token;
import org.antlr.v4.parse.ActionSplitter;
import org.antlr.v4.semantics.BlankActionSplitterListener;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import java.util.ArrayList;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
/** */

View File

@ -31,6 +31,7 @@
package org.antlr.v4.test.tool;
import org.antlr.runtime.RecognitionException;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.junit.Test;
import org.stringtemplate.v4.ST;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.junit.Test;
import org.stringtemplate.v4.ST;

View File

@ -37,6 +37,7 @@ import org.antlr.v4.runtime.LexerInterpreter;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenSource;
import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -35,6 +35,8 @@ import org.antlr.v4.automata.LexerATNFactory;
import org.antlr.v4.automata.ParserATNFactory;
import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.semantics.SemanticPipeline;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.test.runtime.java.ErrorQueue;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -30,6 +30,8 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.test.runtime.java.ErrorQueue;
import org.antlr.v4.tool.ANTLRMessage;
import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.Grammar;

View File

@ -1,5 +1,6 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import static org.junit.Assert.assertNull;

View File

@ -29,10 +29,10 @@
*/
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.junit.Test;
/** Test errors with the set stuff in lexer and parser */
public class TestErrorSets extends BaseTest {
protected boolean debug = false;

View File

@ -33,6 +33,7 @@ package org.antlr.v4.test.tool;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.misc.IntervalSet;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.junit.Test;

View File

@ -1,5 +1,6 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;

View File

@ -12,6 +12,7 @@ import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.pattern.ParseTreeMatch;
import org.antlr.v4.runtime.tree.pattern.ParseTreePattern;
import org.antlr.v4.runtime.tree.pattern.ParseTreePatternMatcher;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import java.lang.reflect.Constructor;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Ignore;
import org.junit.Test;

View File

@ -35,6 +35,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.LexerInterpreter;
import org.antlr.v4.runtime.ParserInterpreter;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -36,6 +36,7 @@ import org.antlr.v4.runtime.LexerInterpreter;
import org.antlr.v4.runtime.ParserInterpreter;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.atn.DecisionInfo;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;
import org.antlr.v4.tool.Rule;

View File

@ -58,12 +58,13 @@ import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.dfa.DFAState;
import org.antlr.v4.runtime.misc.Interval;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.antlr.v4.runtime.misc.Utils;
import org.antlr.v4.runtime.tree.ErrorNode;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.ParseTreeListener;
import org.antlr.v4.runtime.tree.ParseTreeWalker;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.test.runtime.java.ErrorQueue;
import org.junit.Assert;
import org.junit.Test;

View File

@ -31,6 +31,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.parse.ScopeParser;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.junit.Test;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -33,6 +33,7 @@ import org.antlr.runtime.Token;
import org.antlr.v4.misc.Utils;
import org.antlr.v4.parse.ANTLRParser;
import org.antlr.v4.runtime.misc.IntervalSet;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.ast.GrammarAST;
import org.junit.Test;

View File

@ -34,6 +34,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.LexerInterpreter;
import org.antlr.v4.runtime.TokenStreamRewriter;
import org.antlr.v4.runtime.misc.Interval;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Ignore;
import org.junit.Test;

View File

@ -31,6 +31,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.Grammar;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -31,6 +31,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.Tool;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.ErrorType;
import org.junit.Test;

View File

@ -30,6 +30,7 @@
package org.antlr.v4.test.tool;
import org.antlr.v4.misc.Graph;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import java.util.List;

View File

@ -37,6 +37,7 @@ import org.antlr.v4.runtime.IntStream;
import org.antlr.v4.runtime.LexerInterpreter;
import org.antlr.v4.runtime.UnbufferedCharStream;
import org.antlr.v4.runtime.misc.Interval;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -37,6 +37,7 @@ import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenSource;
import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.runtime.UnbufferedTokenStream;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.antlr.v4.tool.LexerGrammar;
import org.junit.Test;

View File

@ -32,6 +32,7 @@ package org.antlr.v4.test.tool;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.Vocabulary;
import org.antlr.v4.runtime.VocabularyImpl;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Assert;
import org.junit.Test;

View File

@ -7,6 +7,7 @@ import org.antlr.v4.runtime.misc.Pair;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.antlr.v4.runtime.tree.xpath.XPath;
import org.antlr.v4.test.runtime.java.BaseTest;
import org.junit.Test;
import java.util.ArrayList;