dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test.py will now run the spec parser.

Browse Source 
This CL modifies tools/test.py such that it can run the spec parser
(after doing `make parser` in tools/spec_parser, and assuming that the
ANTLR 3 library is available at /usr/share/java/antlr3-runtime.jar)
with a command line like

  `tools/test.py -c spec_parser -r none language/callable_test`

It also changes status files to have a name which follows the expected
patterns (e.g., `language/language_spec_parser.status`). Finally, it
adds/changes many entries in status files, such that parsing of the
directories `language` and `language_2` run successfully.

Change-Id: I82a22e32ac4fecd23ac0d4434bcac08f75dd8ffe
Reviewed-on: https://dart-review.googlesource.com/12680
Commit-Queue: Erik Ernst <eernst@google.com>
Reviewed-by: Bob Nystrom <rnystrom@google.com>
This commit is contained in:
Erik Ernst
2017-10-12 09:22:28 +00:00
committed by commit-bot@chromium.org
parent 99af2fef35
commit 63de49ccde
14 changed files with 1477 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/spec_parser/SpecParser.java
+94 -24
View File
@@ -2,44 +2,114 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import java.io.*;
import java.util.*;
import org.antlr.runtime.*;
class ParsingResult {
public int numberOfFileArguments;
public int numberOfFailures;
}
/// Class for `main` which will parse files given as command line arguments.
public class SpecParser {
private static void helpAndExit() {
System.err.println("Expected arguments: [--verbose] <file>...");
System.exit(1);
private static void normalExit() {
// Terminate with exit code indicating normal termination.
System.exit(0);
}
public static void main(String[] args) throws Exception {
boolean verbose = false;
int numberOfFileArguments = 0;
int numberOfFailures = 0;
private static void compileTimeErrorExit() {
// Terminate with exit code indicating compile-time error.
System.exit(254);
}
if (args.length == 0) helpAndExit();
numberOfFileArguments = args.length;
for (int i = 0; i < args.length; i++) {
String filePath = args[i];
if (filePath.equals("--verbose")) {
verbose = true;
numberOfFileArguments--;
if (numberOfFileArguments == 0) helpAndExit();
private static void helpAndExit() {
System.err.println("Expected arguments: [--verbose] <file>...");
compileTimeErrorExit();
}
/// Receive command lines from standard input and produce feedback about
/// the outcome on standard output and standard error, as expected by
/// tools/test.py when running with `--batch`.
public static void runAsBatch() throws IOException, RecognitionException {
ParsingResult result = new ParsingResult();
long startTime = System.currentTimeMillis();
InputStreamReader input = new InputStreamReader(System.in);
BufferedReader bufferedInput = new BufferedReader(input);
String cmdLine;
System.out.println(">>> BATCH START");
while ((cmdLine = bufferedInput.readLine()) != null) {
if (cmdLine.length() == 0) {
System.out.println(
">>> BATCH END (" +
(result.numberOfFileArguments - result.numberOfFailures) +
"/" + result.numberOfFileArguments + ") " +
(System.currentTimeMillis() - startTime) + "ms");
if (result.numberOfFailures > 0) compileTimeErrorExit();
normalExit();
}
String[] lineArgs = cmdLine.split("\\s+");
result = parseFiles(lineArgs);
// Write stderr end token and flush.
System.err.println(">>> EOF STDERR");
String resultPassString = result.numberOfFailures == 0 ? "PASS" : "FAIL";
System.out.println(">>> TEST " + resultPassString + " " +
(System.currentTimeMillis() - startTime) + "ms");
startTime = System.currentTimeMillis();
}
}
/// From [arguments], obey the flags ("--<flag_name>") if known and ignore
/// them if unknown; treat the remaining [arguments] as file paths and
/// parse each of them. Return a [ParsingResult] specifying how many files
/// were parsed, and how many of them failed to parse.
private static ParsingResult parseFiles(String[] arguments)
throws IOException, RecognitionException {
ParsingResult result = new ParsingResult();
boolean verbose = false;
result.numberOfFileArguments = arguments.length;
for (int i = 0; i < arguments.length; i++) {
String filePath = arguments[i];
if (filePath.substring(0, 2).equals("--")) {
result.numberOfFileArguments--;
if (result.numberOfFileArguments == 0) return result;
if (filePath.equals("--verbose")) verbose = true;
if (filePath.equals("--batch")) runAsBatch();
// Ignore all other flags.
continue;
}
if (verbose) System.err.println("Parsing file: " + filePath);
DartParser parser = new DartParser(new CommonTokenStream(
new DartLexer(new ANTLRFileStream(filePath))));
if (!parser.parseLibrary(filePath)) numberOfFailures++;
if (!parser.parseLibrary(filePath)) result.numberOfFailures++;
}
if (numberOfFailures > 0) {
System.err.println("Parsed " + numberOfFileArguments + " files, " +
numberOfFailures + " failing.");
System.exit(1);
} else {
if (numberOfFileArguments == 1) {
System.out.println("Parsed successfully.");
return result;
}
public static void main(String[] args) throws Exception {
if (args.length == 0) helpAndExit();
ParsingResult result = parseFiles(args);
if (result.numberOfFileArguments == 0) {
helpAndExit();
} else if (result.numberOfFileArguments == 1) {
if (result.numberOfFailures > 0) {
System.err.println("Parsing failed");
compileTimeErrorExit();
} else {
System.out.println("Parsed " + numberOfFileArguments +
System.out.println("Parsing succeeded.");
}
} else {
if (result.numberOfFailures > 0) {
System.err.println(
"Parsed " + result.numberOfFileArguments + " files, " +
result.numberOfFailures + " failed.");
compileTimeErrorExit();
} else {
System.out.println("Parsed " + result.numberOfFileArguments +
" files successfully.");
}
}