mirror of
https://github.com/processing/processing4.git
synced 2026-03-25 22:08:17 +01:00
Move to ANTLR 4 with Java 11 lang features and localization. (#5)
* Move to ANTLR 4 with Java 11 lang features and localization. Introduces ANTLR4 and Java 8 language feature support within IDE while also adding additional hooks for localization of syntax error messages, addressing https://github.com/processing/processing/issues/3054 and https://github.com/processing/processing/issues/3055. The PR is broadly a continuation of https://github.com/processing/processing/issues/3055, bringing it up to speed with the latest Processing master plus the changes introduced at https://github.com/processing/processing/pull/5753. **Requires https://github.com/processing/processing/pull/5753 as pre-requisite.** This introduces a number of edits beyond https://github.com/processing/processing/issues/3055 beyond compatibility with current Processing master and https://github.com/processing/processing/pull/5753 including: - Update to the grammar itself - Change ANTLR listeners to emit `TextTransform.Edit` to unify JDT-based `PreprocessingService` and `JavaBuild`, removing code with duplicate purpose. - Introduction of syntax error rewriting with support for localization. - Addition of complete localized strings set for English and Spanish. - Addition of partial localized strings set for other languages. - Refactor of ANTLR-related code for testability and readability - Expansion of tests including full parse tests for new Java features (type inference, lambdas). * Ask travis for ant upgrade prior to run. * Ask Travis for java11 update. * Add openjdk ppa * Travis no confirmation on add ppa. * Force newer ant on travis. * Swtich ant download to www-us mirror. * Switch ant to 1.10.7 * Start x for unit tests in travis. * More complete start x in travis. * Revert x in travis. * Try x in services.
This commit is contained in:
A Samuel Pottinger
committed by
GitHub
GitHub
parent
00dd2803f0
commit
ee299ef935
398
java/test/processing/mode/java/ParserTests.java
Normal file
398
java/test/processing/mode/java/ParserTests.java
Normal file
@@ -0,0 +1,398 @@
|
||||
package processing.mode.java;
|
||||
|
||||
import static junit.framework.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
import static processing.mode.java.ProcessingTestUtil.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.eclipse.jdt.core.compiler.IProblem;
|
||||
import org.eclipse.jdt.core.dom.AST;
|
||||
import org.eclipse.jdt.core.dom.ASTParser;
|
||||
import org.eclipse.jdt.core.dom.CompilationUnit;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import processing.app.SketchException;
|
||||
import processing.mode.java.pdex.JdtCompilerUtil;
|
||||
import processing.mode.java.preproc.PreprocessorResult;
|
||||
import processing.mode.java.preproc.issue.PdePreprocessIssueException;
|
||||
|
||||
|
||||
public class ParserTests {
|
||||
|
||||
@BeforeClass
|
||||
public static void init() {
|
||||
ProcessingTestUtil.init();
|
||||
}
|
||||
|
||||
static void expectRecognitionException(final String id,
|
||||
final int expectedLine) {
|
||||
|
||||
PreprocessorResult result;
|
||||
try {
|
||||
preprocess(id, res(id + ".pde"));
|
||||
fail("Expected to fail with on line " + expectedLine);
|
||||
} catch (PdePreprocessIssueException e) {
|
||||
assertNotNull(e.getIssue().getMsg());
|
||||
assertEquals(expectedLine, e.getIssue().getLine());
|
||||
} catch (Exception e) {
|
||||
if (!e.equals(e.getCause()) && e.getCause() != null)
|
||||
fail(e.getCause().toString());
|
||||
else
|
||||
fail(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
static void expectRunnerException(final String id,
|
||||
final int expectedLine) {
|
||||
|
||||
try {
|
||||
preprocess(id, res(id + ".pde"));
|
||||
fail("Expected to fail with on line " + expectedLine);
|
||||
} catch (SketchException e) {
|
||||
assertEquals(expectedLine, e.getCodeLine());
|
||||
} catch (PdePreprocessIssueException e) {
|
||||
assertNotNull(e.getIssue().getMsg());
|
||||
assertEquals(expectedLine, e.getIssue().getLine());
|
||||
} catch (Exception e) {
|
||||
if (!e.equals(e.getCause()) && e.getCause() != null)
|
||||
fail(e.getCause().toString());
|
||||
else
|
||||
fail(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
static void expectCompilerException(final String id) {
|
||||
try {
|
||||
final String program = preprocess(id, res(id + ".pde"));
|
||||
boolean succeeded = compile(id, program);
|
||||
if (succeeded) {
|
||||
fail("Expected to fail.");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (!e.equals(e.getCause()) && e.getCause() != null)
|
||||
fail(e.getCause().toString());
|
||||
else
|
||||
fail(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
static void expectGood(final String id) {
|
||||
expectGood(id, true);
|
||||
}
|
||||
|
||||
static void expectGood(final String id, boolean ignoreWhitespace) {
|
||||
try {
|
||||
final String program = preprocess(id, res(id + ".pde"));
|
||||
boolean successful = compile(id, program);
|
||||
if (successful) {
|
||||
System.err.println("----------------------------");
|
||||
System.err.println(program);
|
||||
System.err.println("----------------------------");
|
||||
fail("Compilation failed.");
|
||||
}
|
||||
|
||||
final File expectedFile = res(id + ".expected");
|
||||
if (expectedFile.exists()) {
|
||||
final String expected = ProcessingTestUtil.read(expectedFile);
|
||||
if (ignoreWhitespace) {
|
||||
String expectedStrip = expected.replace("\t", "")
|
||||
.replace(" ", "")
|
||||
.replace("\n", "")
|
||||
.replace("\r", "");
|
||||
|
||||
String actualStrip = program.replace("\t", "")
|
||||
.replace(" ", "")
|
||||
.replace("\n", "")
|
||||
.replace("\r", "");
|
||||
|
||||
if (!expectedStrip.equals(actualStrip)) {
|
||||
System.err.println("Expected >>>>>>>");
|
||||
System.err.println(expected);
|
||||
System.err.println("<<<<<<< Got >>>>>>>");
|
||||
System.err.println(program);
|
||||
System.err.println("<<<<<<<");
|
||||
assertEquals(expectedStrip, actualStrip);
|
||||
}
|
||||
} else {
|
||||
assertEquals(expected, program);
|
||||
}
|
||||
} else {
|
||||
System.err.println("WARN: " + id
|
||||
+ " does not have an expected output file. Generating.");
|
||||
final FileWriter sug = new FileWriter(res(id + ".expected"));
|
||||
sug.write(ProcessingTestUtil.normalize(program));
|
||||
sug.close();
|
||||
}
|
||||
|
||||
} catch (SketchException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug4() {
|
||||
expectGood("bug4");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug5a() {
|
||||
expectGood("bug5a");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug5b() {
|
||||
expectGood("bug5b");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug6() {
|
||||
expectRecognitionException("bug6", 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug16() {
|
||||
expectRunnerException("bug16", 3);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug136() {
|
||||
expectGood("bug136", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug196() {
|
||||
expectRecognitionException("bug196", 5);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug281() {
|
||||
expectGood("bug281");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug481() {
|
||||
expectGood("bug481");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug507() {
|
||||
expectRecognitionException("bug507", 5);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug598() {
|
||||
expectGood("bug598");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug631() {
|
||||
expectGood("bug631");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug763() {
|
||||
expectRunnerException("bug763", 8);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug820() {
|
||||
expectCompilerException("bug820");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1064() {
|
||||
expectGood("bug1064");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1145() {
|
||||
expectCompilerException("bug1145");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1362() {
|
||||
expectGood("bug1362");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1390() {
|
||||
expectGood("bug1390");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1442() {
|
||||
expectGood("bug1442");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1511() {
|
||||
expectGood("bug1511");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1512() {
|
||||
expectGood("bug1512");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1514a() {
|
||||
expectGood("bug1514a");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1514b() {
|
||||
expectGood("bug1514b");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1515() {
|
||||
expectGood("bug1515");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1516() {
|
||||
expectGood("bug1516");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1517() {
|
||||
expectGood("bug1517");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1518a() {
|
||||
expectGood("bug1518a");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1518b() {
|
||||
expectGood("bug1518b");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1525() {
|
||||
expectGood("bug1525");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1532() {
|
||||
expectRecognitionException("bug1532", 50);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1534() {
|
||||
expectGood("bug1534");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug1936() {
|
||||
expectGood("bug1936");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug315g() {
|
||||
expectGood("bug315g");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug400g() {
|
||||
expectGood("bug400g", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void bug427g() {
|
||||
expectGood("bug427g");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void color() {
|
||||
expectGood("color", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotations() {
|
||||
expectGood("annotations", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void generics() {
|
||||
expectGood("generics", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lambda() {
|
||||
expectGood("lambdaexample", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void specialMethods() {
|
||||
expectGood("speicalmethods", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void specialMethodsPrivate() {
|
||||
expectGood("specialmethodsprivate", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void classInStatic() {
|
||||
expectGood("classinstatic", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void fullscreen() {
|
||||
expectGood("fullscreen", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void customMain() {
|
||||
expectGood("custommain", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void charSpecial() {
|
||||
expectGood("charspecial", true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void typeInference() {
|
||||
expectGood("typeinference");
|
||||
}
|
||||
|
||||
private static boolean compile(String id, String program) {
|
||||
// Create compilable AST to get syntax problems
|
||||
CompilationUnit compilableCU = JdtCompilerUtil.makeAST(
|
||||
ASTParser.newParser(AST.JLS8),
|
||||
program.toCharArray(),
|
||||
JdtCompilerUtil.COMPILER_OPTIONS
|
||||
);
|
||||
|
||||
// Get syntax problems from compilable AST
|
||||
Optional<IProblem> problem = Arrays.stream(compilableCU.getProblems())
|
||||
.filter(IProblem::isError)
|
||||
.findFirst();
|
||||
|
||||
if (problem.isPresent()) {
|
||||
IProblem problemFound = problem.get();
|
||||
|
||||
System.err.println("Compilation issue: "
|
||||
+ problemFound.getMessage()
|
||||
+ "(" + problemFound.getSourceLineNumber() + ")"
|
||||
);
|
||||
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user