fix regression; didn't work with stdin

This commit is contained in:
Terence Parr 2012-08-04 13:50:52 -07:00
parent aed26c690e
commit 6d12cbfddb
1 changed files with 75 additions and 55 deletions

View File

@ -39,11 +39,14 @@ import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.TokenStream; import org.antlr.v4.runtime.TokenStream;
import javax.print.PrintException;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -60,21 +63,21 @@ import java.util.List;
* [input-filename(s)] * [input-filename(s)]
*/ */
public class TestRig { public class TestRig {
static String grammarName;
static String startRuleName;
static List<String> inputFiles = new ArrayList<String>();
static boolean printTree = false;
static boolean gui = false;
static String psFile = null;
static boolean showTokens = false;
static boolean trace = false;
static boolean diagnostics = false;
static String encoding = null;
static boolean SLL = false;
public static final String LEXER_START_RULE_NAME = "tokens"; public static final String LEXER_START_RULE_NAME = "tokens";
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
String grammarName;
String startRuleName;
List<String> inputFiles = new ArrayList<String>();
boolean printTree = false;
boolean gui = false;
String psFile = null;
boolean showTokens = false;
boolean trace = false;
boolean diagnostics = false;
String encoding = null;
boolean SLL = false;
if ( args.length < 2 ) { if ( args.length < 2 ) {
System.err.println("java org.antlr.v4.runtime.misc.TestRig GrammarName startRuleName\n" + System.err.println("java org.antlr.v4.runtime.misc.TestRig GrammarName startRuleName\n" +
@ -159,6 +162,19 @@ public class TestRig {
Constructor<Parser> parserCtor = parserClass.getConstructor(TokenStream.class); Constructor<Parser> parserCtor = parserClass.getConstructor(TokenStream.class);
Parser parser = parserCtor.newInstance((TokenStream)null); Parser parser = parserCtor.newInstance((TokenStream)null);
if ( inputFiles.size()==0 ) {
InputStream is = System.in;
Reader r;
if ( encoding!=null ) {
r = new InputStreamReader(is, encoding);
}
else {
r = new InputStreamReader(is);
}
process(lexer, parserClass, parser, is, r);
return;
}
for (String inputFile : inputFiles) { for (String inputFile : inputFiles) {
InputStream is = System.in; InputStream is = System.in;
if ( inputFile!=null ) { if ( inputFile!=null ) {
@ -175,6 +191,11 @@ public class TestRig {
if ( inputFiles.size()>1 ) { if ( inputFiles.size()>1 ) {
System.err.println(inputFile); System.err.println(inputFile);
} }
process(lexer, parserClass, parser, is, r);
}
}
static void process(Lexer lexer, Class parserClass, Parser parser, InputStream is, Reader r) throws IOException, IllegalAccessException, InvocationTargetException, PrintException {
try { try {
ANTLRInputStream input = new ANTLRInputStream(r); ANTLRInputStream input = new ANTLRInputStream(r);
lexer.setInputStream(input); lexer.setInputStream(input);
@ -227,5 +248,4 @@ public class TestRig {
if ( is!=null ) is.close(); if ( is!=null ) is.close();
} }
} }
}
} }