Merge branch 'master' into issue1422

22 files changed, 434 insertions, 240 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
index 41d981016..e5be2b80a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
@@ -71,8 +71,8 @@ public class ParserConfiguration {
         JAVA_8(new Java8Validator(), null),
         /** Java 9 */
         JAVA_9(new Java9Validator(), null),
-        /** Java 10 (work in progress) */
-        JAVA_10_PREVIEW(new Java10Validator(), new Java10PostProcessor()),
+        /** Java 10 */
+        JAVA_10(new Java10Validator(), new Java10PostProcessor()),
         /** Java 11 (work in progress) */
         JAVA_11_PREVIEW(new Java11Validator(), new Java11PostProcessor());
 
@@ -200,7 +200,7 @@ public class ParserConfiguration {
     public ParserConfiguration setValidator(Validator validator) {
         // This whole method is a backwards compatability hack.
         if (validator instanceof Java10Validator) {
-            setLanguageLevel(JAVA_10_PREVIEW);
+            setLanguageLevel(JAVA_10);
         } else if (validator instanceof Java9Validator) {
             setLanguageLevel(JAVA_9);
         } else if (validator instanceof Java8Validator) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
index b182e8db5..c7fda2f46 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
@@ -1,15 +1,14 @@
 package com.github.javaparser.ast.validator;
 
 import com.github.javaparser.ast.type.VarType;
+import com.github.javaparser.ast.validator.chunks.VarValidator;
 
 /**
  * This validator validates according to Java 10 syntax rules.
  */
 public class Java10Validator extends Java9Validator {
 
-    protected final Validator varOnlyOnLocalVariableDefinitionAndFor = new SingleNodeTypeValidator<>(VarType.class, (n, reporter) -> {
-        // TODO issue 1407
-    });
+    protected final Validator varOnlyOnLocalVariableDefinitionAndFor = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false));
 
     public Java10Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java11Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java11Validator.java
index d80577268..0eb879aa0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java11Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java11Validator.java
@@ -1,10 +1,16 @@
 package com.github.javaparser.ast.validator;
 
+import com.github.javaparser.ast.type.VarType;
+import com.github.javaparser.ast.validator.chunks.VarValidator;
+
 /**
  * This validator validates according to Java 11 syntax rules.
  */
 public class Java11Validator extends Java10Validator {
+    protected final Validator varAlsoInLambdaParameters = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(true));
+
     public Java11Validator() {
         super();
+        replace(varOnlyOnLocalVariableDefinitionAndFor, varAlsoInLambdaParameters);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/chunks/VarValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/chunks/VarValidator.java
new file mode 100644
index 000000000..19357e83c
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/chunks/VarValidator.java
@@ -0,0 +1,93 @@
+package com.github.javaparser.ast.validator.chunks;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.expr.ArrayCreationExpr;
+import com.github.javaparser.ast.expr.LambdaExpr;
+import com.github.javaparser.ast.expr.NullLiteralExpr;
+import com.github.javaparser.ast.expr.VariableDeclarationExpr;
+import com.github.javaparser.ast.stmt.ExpressionStmt;
+import com.github.javaparser.ast.stmt.ForStmt;
+import com.github.javaparser.ast.stmt.ForeachStmt;
+import com.github.javaparser.ast.type.VarType;
+import com.github.javaparser.ast.validator.ProblemReporter;
+import com.github.javaparser.ast.validator.TypedValidator;
+
+import java.util.Optional;
+
+public class VarValidator implements TypedValidator<VarType> {
+    private boolean varAllowedInLambdaParameters;
+
+    public VarValidator(boolean varAllowedInLambdaParameters) {
+        this.varAllowedInLambdaParameters = varAllowedInLambdaParameters;
+    }
+
+    @Override
+    public void accept(VarType node, ProblemReporter reporter) {
+        // All allowed locations are within a VariableDeclaration inside a VariableDeclarationExpr inside something else.
+        Optional<VariableDeclarator> variableDeclarator = node.findParent(VariableDeclarator.class);
+        if (!variableDeclarator.isPresent()) {
+            // Java 11's var in lambda's
+            if (varAllowedInLambdaParameters) {
+                boolean valid = node
+                        .findParent(Parameter.class)
+                        .flatMap(Node::getParentNode)
+                        .map((Node p) -> p instanceof LambdaExpr).orElse(false);
+                if (valid) {
+                    return;
+                }
+            }
+            reportIllegalPosition(node, reporter);
+            return;
+        }
+        variableDeclarator.ifPresent(vd -> {
+            Optional<Node> variableDeclarationExpr = vd.getParentNode();
+            if (!variableDeclarationExpr.isPresent()) {
+                reportIllegalPosition(node, reporter);
+                return;
+            }
+            variableDeclarationExpr.ifPresent(vdeNode -> {
+                if (!(vdeNode instanceof VariableDeclarationExpr)) {
+                    reportIllegalPosition(node, reporter);
+                    return;
+                }
+                VariableDeclarationExpr vde = (VariableDeclarationExpr) vdeNode;
+                if (vde.getVariables().size() > 1) {
+                    reporter.report(vde, "\"var\" only takes a single variable.");
+                }
+                Optional<Node> container = vdeNode.getParentNode();
+                if (!container.isPresent()) {
+                    reportIllegalPosition(node, reporter);
+                    return;
+                }
+                container.ifPresent(c -> {
+                    boolean positionIsFine = c instanceof ForStmt || c instanceof ForeachStmt || c instanceof ExpressionStmt;
+                    if (!positionIsFine) {
+                        reportIllegalPosition(node, reporter);
+                    }
+                    // A local variable declaration ends up inside an ExpressionStmt.
+                    if (c instanceof ExpressionStmt) {
+                        if (!vd.getInitializer().isPresent()) {
+                            reporter.report(node, "\"var\" needs an initializer.");
+                        }
+                        vd.getInitializer().ifPresent(initializer -> {
+                            if (initializer instanceof NullLiteralExpr) {
+                                reporter.report(node, "\"var\" cannot infer type from just null.");
+                            }
+                            if (initializer instanceof ArrayCreationExpr) {
+                                reporter.report(node, "\"var\" cannot infer array types.");
+                            }
+                        });
+
+                    }
+                });
+            });
+        });
+
+    }
+
+    private void reportIllegalPosition(VarType n, ProblemReporter reporter) {
+        reporter.report(n, "\"var\" is not allowed here.");
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
index 3444ba2b1..d8d0eafe0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
@@ -14,19 +14,19 @@ import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclara
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 import org.junit.Test;
 
-import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10_PREVIEW;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
 import static com.github.javaparser.Providers.provider;
 import static org.junit.Assert.assertEquals;
 
 public class VarTypeTest {
     private final TypeSolver typeSolver = new ReflectionTypeSolver();
     private final JavaParser javaParser = new JavaParser(new ParserConfiguration()
-            .setLanguageLevel(JAVA_10_PREVIEW)
+            .setLanguageLevel(JAVA_10)
             .setSymbolResolver(new JavaSymbolSolver(typeSolver)));
 
     @Test
     public void resolveAPrimitive() {
-        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{var abc = 1;}")).getResult().get();
+        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{void x(){var abc = 1;}}")).getResult().get();
         VarType varType = ast.findFirst(VarType.class).get();
 
         ResolvedType resolvedType = varType.resolve();
@@ -36,7 +36,7 @@ public class VarTypeTest {
 
     @Test
     public void resolveAReferenceType() {
-        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{var abc = \"\";}")).getResult().get();
+        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{void x(){var abc = \"\";}}")).getResult().get();
         VarType varType = ast.findFirst(VarType.class).get();
 
         ResolvedType resolvedType = varType.resolve();
@@ -46,7 +46,7 @@ public class VarTypeTest {
 
     @Test(expected = IllegalStateException.class)
     public void failResolveNoInitializer() {
-        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{var abc;}")).getResult().get();
+        CompilationUnit ast = javaParser.parse(ParseStart.COMPILATION_UNIT, provider("class X{void x(){var abc;}}")).getResult().get();
         VarType varType = ast.findFirst(VarType.class).get();
 
         varType.resolve();
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java
index 34484e1a4..1a63b21f7 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java
@@ -10,6 +10,7 @@ import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.ast.validator.Java9Validator;
 import org.junit.Test;
 
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertInstanceOf;
 import static org.junit.Assert.assertTrue;
@@ -72,7 +73,7 @@ public class TryStmtTest {
     }
 
     private <T> T parse9(String code) {
-        JavaParser parser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator()));
+        JavaParser parser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9));
         ParseResult<Statement> result = parser.parse(ParseStart.STATEMENT, provider(code));
         assertTrue(result.toString(), result.isSuccessful());
         return (T) result.getResult().get();
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java10ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java10ValidatorTest.java
new file mode 100644
index 000000000..8c2b93568
--- /dev/null
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java10ValidatorTest.java
@@ -0,0 +1,108 @@
+package com.github.javaparser.ast.validator;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.ast.body.BodyDeclaration;
+import com.github.javaparser.ast.stmt.Statement;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static com.github.javaparser.ParseStart.CLASS_BODY;
+import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
+import static com.github.javaparser.Providers.provider;
+import static com.github.javaparser.utils.TestUtils.assertNoProblems;
+import static com.github.javaparser.utils.TestUtils.assertProblems;
+
+public class Java10ValidatorTest {
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_10));
+
+    @Test
+    public void varAllowedInLocalVariableDeclaration() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a = 5;"));
+        assertNoProblems(result);
+    }
+
+    @Test
+    public void varAllowedInForEach() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("for(var a : as){}"));
+        assertNoProblems(result);
+    }
+
+    @Test
+    public void varAllowedInOldFor() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("for(var a = 5;a<9;a++){}"));
+        assertNoProblems(result);
+    }
+
+    @Test
+    public void varNotAllowedInCast() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("int a = (var)20;"));
+        assertNoProblems(result);
+    }
+
+    @Test
+    public void varNotAllowedInTryWithResources() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("try(var f = new FileReader(\"\")){ }catch (Exception e){ }"));
+        assertProblems(result, "(line 1,col 5) \"var\" is not allowed here.");
+    }
+
+    @Test
+    public void varNotAllowedInField() {
+        ParseResult<BodyDeclaration<?>> result = javaParser.parse(CLASS_BODY, provider("var a = 20;"));
+        assertProblems(result, "(line 1,col 1) \"var\" is not allowed here.");
+    }
+
+    @Test
+    public void varNotAllowedInTypeArguments() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("new X<var>();"));
+        assertProblems(result, "(line 1,col 7) \"var\" is not allowed here.");
+    }
+
+    @Test
+    public void varNotAllowedInLambdaParameters() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("x((var x) -> null);"));
+        assertProblems(result, "(line 1,col 4) \"var\" is not allowed here.");
+    }
+
+    @Test
+    public void emptyInitializerNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a;"));
+        assertProblems(result, "(line 1,col 1) \"var\" needs an initializer.");
+    }
+
+    @Test
+    public void multipleVariablesNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a=1, b=2;"));
+        assertProblems(result, "(line 1,col 1) \"var\" only takes a single variable.");
+    }
+
+    @Test
+    public void nullVariablesNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a=null;"));
+        assertProblems(result, "(line 1,col 1) \"var\" cannot infer type from just null.");
+    }
+
+    @Test
+    public void arrayDimensionBracketsNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a=new String[]{};"));
+        assertProblems(result, "(line 1,col 1) \"var\" cannot infer array types.");
+    }
+
+    // This is pretty hard to impossible to implement correctly with just the AST.
+    @Ignore
+    @Test
+    public void selfReferenceNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a=a;"));
+        assertProblems(result, "");
+    }
+
+    // Can be implemented once https://github.com/javaparser/javaparser/issues/1434 is implemented.
+    @Ignore
+    @Test
+    public void polyExpressionAsInitializerNotAllowed() {
+        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a=new ArrayList<>();"));
+        assertProblems(result, "");
+    }
+}
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/version/Java11PostProcessorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java11ValidatorTest.java
index 30115c87c..1e1f8c0f8 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/version/Java11PostProcessorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java11ValidatorTest.java
@@ -1,4 +1,4 @@
-package com.github.javaparser.version;
+package com.github.javaparser.ast.validator;
 
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseResult;
@@ -11,7 +11,7 @@ import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_11_PR
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 
-public class Java11PostProcessorTest {
+public class Java11ValidatorTest {
     public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_11_PREVIEW));
 
     @Test
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java
index 6606d2ec6..7160bcfb9 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java
@@ -15,13 +15,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.github.javaparser.ParseStart.*;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 import static org.junit.Assert.assertEquals;
 
 public class Java1_0ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_0Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_0));
 
     @Test
     public void tryWithoutResources() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java
index 6aa1b8c02..6331d9ab1 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java
@@ -11,12 +11,13 @@ import org.junit.Test;
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
 import static com.github.javaparser.ParseStart.EXPRESSION;
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java1_1ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_1Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_1));
 
     public static final String allModifiers = "public protected private abstract static final transient volatile synchronized native strictfp transitive default ";
 
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java
index cd7a71d39..3ae7018fe 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java
@@ -10,11 +10,12 @@ import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java1_2ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_2Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_2));
 
     private final String allModifiers = "public protected private abstract static final transient volatile synchronized native strictfp transitive default ";
 
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java
index 90e7ed3ce..b10114abf 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java
@@ -7,11 +7,12 @@ import com.github.javaparser.ast.stmt.Statement;
 import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java1_3ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_3Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_3));
 
     @Test
     public void noAssert() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java
index 60f62a5fb..ed0be99fe 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java
@@ -9,12 +9,13 @@ import com.github.javaparser.ast.stmt.Statement;
 import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.*;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java1_4ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_4Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_4));
 
     @Test
     public void yesAssert() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java
index d212ab037..315167fda 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java
@@ -11,13 +11,14 @@ import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.*;
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java5ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java5Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_5));
 
     @Test
     public void genericsWithoutDiamond() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java
index 276e17cd9..d066abe07 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java
@@ -9,11 +9,12 @@ import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.EXPRESSION;
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java6ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java6Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_6));
 
     @Test
     public void noStringsInSwitch() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java
index 7c50fa31d..216fb5b13 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java
@@ -9,13 +9,14 @@ import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java8ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java8Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_8));
 
     @Test
     public void localInterface() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java
index 3e979d31a..911f6a984 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java
@@ -9,13 +9,14 @@ import org.junit.Test;
 
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
 import static com.github.javaparser.ParseStart.STATEMENT;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers;
 import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static com.github.javaparser.utils.TestUtils.assertProblems;
 
 public class Java9ValidatorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9));
 
     @Test
     public void underscoreIdentifiers() {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java b/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java
index a72f394ce..b09651f7d 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java
@@ -2,7 +2,6 @@ package com.github.javaparser.manual;
 
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.Problem;
-import com.github.javaparser.ast.validator.Java9Validator;
 import com.github.javaparser.utils.CodeGenerationUtils;
 import com.github.javaparser.utils.Log;
 import com.github.javaparser.utils.SourceRoot;
@@ -19,6 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9;
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.SourceRoot.Callback.Result.DONT_SAVE;
 import static com.github.javaparser.utils.TestUtils.download;
@@ -46,15 +47,15 @@ public class BulkParseTest {
             Log.info("Downloading JDK langtools");
             /* Found by choosing a tag here: http://hg.openjdk.java.net/jdk9/jdk9/langtools/tags
              then copying the "zip" link to the line below: */ 
-            download(new URL("http://hg.openjdk.java.net/jdk9/jdk9/langtools/archive/5ecbed313125.zip"), openJdkZipPath);
+            download(new URL("http://hg.openjdk.java.net/jdk10/jdk10/langtools/archive/19293ea3999f.zip"), openJdkZipPath);
         }
-        bulkTest(new SourceZip(openJdkZipPath), "openjdk_src_repo_test_results.txt", new ParserConfiguration().setValidator(new Java9Validator()));
+        bulkTest(new SourceZip(openJdkZipPath), "openjdk_src_repo_test_results.txt", new ParserConfiguration().setLanguageLevel(JAVA_10));
     }
 
     private void parseJdkSrcZip() throws IOException {
         // This is where Ubuntu stores the contents of package openjdk-8-src
         Path path = Paths.get("/usr/lib/jvm/openjdk-9/src.zip");
-        bulkTest(new SourceZip(path), "openjdk_src_zip_test_results.txt", new ParserConfiguration().setValidator(new Java9Validator()));
+        bulkTest(new SourceZip(path), "openjdk_src_zip_test_results.txt", new ParserConfiguration().setLanguageLevel(JAVA_9));
     }
 
     @Test
@@ -62,7 +63,7 @@ public class BulkParseTest {
         bulkTest(
                 new SourceRoot(CodeGenerationUtils.mavenModuleRoot(BulkParseTest.class).resolve("..")), 
                 "javaparser_test_results.txt", 
-                new ParserConfiguration().setValidator(new Java9Validator()));
+                new ParserConfiguration().setLanguageLevel(JAVA_9));
     }
 
     public void bulkTest(SourceRoot sourceRoot, String testResultsFileName, ParserConfiguration configuration) throws IOException {
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java
index 619b27cff..80ebe557e 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java
@@ -11,20 +11,20 @@ import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
 import com.github.javaparser.ast.modules.*;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.validator.Java9Validator;
 import com.github.javaparser.printer.ConcreteSyntaxModel;
 import org.junit.Test;
 
 import static com.github.javaparser.GeneratedJavaParserConstants.IDENTIFIER;
 import static com.github.javaparser.JavaParser.parseClassOrInterfaceType;
 import static com.github.javaparser.JavaParser.parseName;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.Utils.EOL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class ModuleDeclarationTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator()));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9));
 
     private final CompilationUnit parse(String code) {
         return javaParser.parse(ParseStart.COMPILATION_UNIT, provider(code)).getResult().get();
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java b/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java
index 0213c1191..24f17670a 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java
@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.*;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.EOL;
@@ -140,7 +141,7 @@ public class TestUtils {
     }
 
     public static void assertExpressionValid(String expression) {
-        JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator()));
+        JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9));
         ParseResult<Expression> result = javaParser.parse(ParseStart.EXPRESSION, provider(expression));
         assertEquals(true, result.isSuccessful(), result.getProblems().toString());
     }
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java
index 87f7990a1..4f9af2748 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java
@@ -10,13 +10,12 @@ import org.junit.Test;
 import java.util.List;
 
 import static com.github.javaparser.ParseStart.STATEMENT;
-import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10_PREVIEW;
+import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10;
 import static com.github.javaparser.Providers.provider;
-import static com.github.javaparser.utils.TestUtils.assertNoProblems;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Java10PostProcessorTest {
-    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_10_PREVIEW));
+    public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_10));
 
     @Test
     public void varIsAType() {
@@ -26,22 +25,4 @@ public class Java10PostProcessorTest {
 
         assertEquals(1, allVarTypes.size());
     }
-
-    @Test
-    public void varAllowedInLocalVariableDeclaration() {
-        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("var a = 5;"));
-        assertNoProblems(result);
-    }
-
-    @Test
-    public void varAllowedInForEach() {
-        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("for(var a : as){}"));
-        assertNoProblems(result);
-    }
-
-    @Test
-    public void varAllowedInOldFor() {
-        ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("for(var a = 5;a<9;a++){}"));
-        assertNoProblems(result);
-    }
 }
diff --git a/javaparser-testing/src/test/resources/com/github/javaparser/bulk_test_results/openjdk_src_repo_test_results.txt b/javaparser-testing/src/test/resources/com/github/javaparser/bulk_test_results/openjdk_src_repo_test_results.txt
index 0a8df7aa6..b3d4e574e 100644
--- a/javaparser-testing/src/test/resources/com/github/javaparser/bulk_test_results/openjdk_src_repo_test_results.txt
+++ b/javaparser-testing/src/test/resources/com/github/javaparser/bulk_test_results/openjdk_src_repo_test_results.txt
@@ -1,49 +1,34 @@
-langtools-5ecbed313125/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
+langtools-19293ea3999f/test/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java
 (line 68,col 16) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java
+langtools-19293ea3999f/test/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java
 Lexical error at line 33, column 2.  Encountered: "t" (116), after : "\\"
 
-langtools-5ecbed313125/test/com/sun/javadoc/testSourceTab/SingleTab/C.java
+langtools-19293ea3999f/test/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java
 Lexical error at line 33, column 2.  Encountered: "t" (116), after : "\\"
 
-langtools-5ecbed313125/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java
-(line 56,col 34) Parse error. Found "this", expected one of  "..." "@" "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
-
-langtools-5ecbed313125/test/com/sun/javadoc/testUnnamedPackage/BadSource.java
-Parse error. Found  "Just" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
-
-langtools-5ecbed313125/test/jdk/javadoc/doclet/testAnchorNames/pkg1/RegClass.java
-(line 68,col 16) '_' is a reserved keyword.
-
-langtools-5ecbed313125/test/jdk/javadoc/doclet/testSourceTab/DoubleTab/C.java
-Lexical error at line 33, column 2.  Encountered: "t" (116), after : "\\"
-
-langtools-5ecbed313125/test/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java
-Lexical error at line 33, column 2.  Encountered: "t" (116), after : "\\"
-
-langtools-5ecbed313125/test/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java
+langtools-19293ea3999f/test/jdk/javadoc/doclet/testUnnamedPackage/BadSource.java
 Parse error. Found  "Just" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/jdk/javadoc/tool/6964914/Error.java
+langtools-19293ea3999f/test/jdk/javadoc/tool/6964914/Error.java
 (line 25,col 12) Parse error. Found "}", expected "("
 
-langtools-5ecbed313125/test/jdk/javadoc/tool/6964914/JavacWarning.java
+langtools-19293ea3999f/test/jdk/javadoc/tool/6964914/JavacWarning.java
 (line 25,col 12) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java
+langtools-19293ea3999f/test/jdk/javadoc/tool/enum/docComments/pkg1/Operation.java
 (line 33,col 1) 'abstract' is not allowed here.
 
-langtools-5ecbed313125/test/jdk/javadoc/tool/T4994049/FileWithTabs.java
+langtools-19293ea3999f/test/jdk/javadoc/tool/T4994049/FileWithTabs.java
 Lexical error at line 25, column 2.  Encountered: "t" (116), after : "\\"
 
-langtools-5ecbed313125/test/tools/javac/6302184/T6302184.java
+langtools-19293ea3999f/test/tools/javac/6302184/T6302184.java
 Lexical error at line 28, column 9.  Encountered: "\ufffd" (65533), after : ""
 
-langtools-5ecbed313125/test/tools/javac/6440583/A.java
+langtools-19293ea3999f/test/tools/javac/6440583/A.java
 (line 25,col 28) Parse error. Found  "1" <INTEGER_LITERAL>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/annotations/AnnotationTypeElementModifiers.java
+langtools-19293ea3999f/test/tools/javac/annotations/AnnotationTypeElementModifiers.java
 (line 17,col 5) 'private' is not allowed here.
 (line 18,col 5) 'private' is not allowed here.
 (line 20,col 5) 'protected' is not allowed here.
@@ -65,388 +50,392 @@ langtools-5ecbed313125/test/tools/javac/annotations/AnnotationTypeElementModifie
 (line 44,col 5) 'default' is not allowed here.
 (line 45,col 5) 'default' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/annotations/FinalReceiverTest.java
+langtools-19293ea3999f/test/tools/javac/annotations/FinalReceiverTest.java
 (line 11,col 43) Parse error. Found ".", expected one of  ")" "," "@" "["
 (line 14,col 2) Parse error. Found <EOF>, expected "}"
 (line 14,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/AnnComma.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/AnnComma.java
 (line 12,col 35) Parse error. Found ")", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/NoDefault.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/NoDefault.java
 (line 8,col 19) Parse error. Found "{", expected one of  ";" "default"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/NoDefaultAbstract.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/NoDefaultAbstract.java
 (line 8,col 5) 'default' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/NoStatic.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/NoStatic.java
 (line 9,col 18) Parse error. Found "{", expected one of  ";" "default"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/NoStaticAbstract.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/NoStaticAbstract.java
 (line 9,col 5) 'static' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Syntax1.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Syntax1.java
 (line 17,col 21) Parse error. Found ",", expected one of  "!=" "%" "&" "&&" "(" ")" "*" "+" "-" "/" "<" "<=" "==" ">" ">=" "?" "^" "instanceof" "|" "||"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z12.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z12.java
 (line 10,col 15) Parse error. Found "void", expected one of  ";" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "volatile" "with" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z13.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z13.java
 (line 11,col 11) Parse error. Found "throws", expected one of  ";" "default"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z14.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z14.java
 (line 10,col 12) Parse error. Found "<", expected "{"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z2.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z2.java
 (line 13,col 17) Parse error. Found "default", expected one of  ";" "@" "[" "throws" "{"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z3.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z3.java
 (line 13,col 17) Parse error. Found "default", expected one of  ";" "@" "[" "throws" "{"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z5.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z5.java
 (line 12,col 12) Parse error. Found "extends", expected "{"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z8.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z8.java
 (line 11,col 10) Parse error. Found "int", expected ")"
 
-langtools-5ecbed313125/test/tools/javac/annotations/neg/Z9.java
+langtools-19293ea3999f/test/tools/javac/annotations/neg/Z9.java
 (line 10,col 15) Parse error. Found "<", expected one of  ";" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "volatile" "with" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/6967002/T6967002.java
 (line 33,col 16) Parse error. Found "...", expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" ")" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedClassExpr.java
 (line 12,col 15) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 13,col 8) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 17,col 8) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 18,col 8) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/AnnotatedMethodSelectorTest.java
 (line 12,col 14) Parse error. Found ".", expected one of  "%=" "&=" "(" "*=" "++" "+=" "--" "-=" "/=" ";" "<<=" "=" ">>=" ">>>=" "^=" "|="
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/BadCast.java
 (line 12,col 16) Parse error. Found "@", expected one of  "!" "(" ")" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/IncompleteArray.java
 (line 11,col 11) Parse error. Found "@", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/IndexArray.java
 (line 12,col 11) Parse error. Found "@", expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/OldArray.java
 (line 12,col 10) Parse error. Found "@", expected one of  "]"
 
-langtools-5ecbed313125/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java
+langtools-19293ea3999f/test/tools/javac/annotations/typeAnnotations/failures/StaticFields.java
 (line 13,col 10) Parse error. Found "@", expected one of  "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 17,col 9) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/api/T6265137a.java
+langtools-19293ea3999f/test/tools/javac/api/T6265137a.java
 (line 24,col 1) Parse error. Found <EOF>, expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/BadAnnotation.java
+langtools-19293ea3999f/test/tools/javac/BadAnnotation.java
 (line 11,col 21) Parse error. Found "int", expected ")"
 
-langtools-5ecbed313125/test/tools/javac/BadHexConstant.java
+langtools-19293ea3999f/test/tools/javac/BadHexConstant.java
 (line 12,col 14) Parse error. Found  "xL" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/declaration/method/MethodVoidParameter.java
+langtools-19293ea3999f/test/tools/javac/declaration/method/MethodVoidParameter.java
 (line 7,col 16) Parse error. Found "void", expected one of  ")" "@" "abstract" "boolean" "byte" "char" "default" "double" "enum" "exports" "final" "float" "int" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "volatile" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/defaultMethods/private/Private02.java
+langtools-19293ea3999f/test/tools/javac/defaultMethods/private/Private02.java
 (line 13,col 9) Cannot be 'abstract' and also 'private'.
 
-langtools-5ecbed313125/test/tools/javac/defaultMethods/private/Private07.java
+langtools-19293ea3999f/test/tools/javac/defaultMethods/private/Private07.java
 (line 9,col 5) 'private' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/defaultMethods/private/Private08.java
+langtools-19293ea3999f/test/tools/javac/defaultMethods/private/Private08.java
 (line 13,col 9) Can have only one of 'public', 'private'.
 (line 14,col 9) Cannot be 'abstract' and also 'private'.
 
-langtools-5ecbed313125/test/tools/javac/defaultMethods/private/Private09.java
+langtools-19293ea3999f/test/tools/javac/defaultMethods/private/Private09.java
 (line 9,col 17) Duplicated modifier
 
-langtools-5ecbed313125/test/tools/javac/defaultMethods/private/Private10.java
+langtools-19293ea3999f/test/tools/javac/defaultMethods/private/Private10.java
 (line 11,col 9) Cannot be 'abstract' and also 'private'.
 (line 14,col 9) Cannot be 'abstract' and also 'private'.
 
-langtools-5ecbed313125/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java
+langtools-19293ea3999f/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java
 Lexical error at line 68, column 0.  Encountered: <EOF> after : ""
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java
 (line 32,col 15) Parse error. Found ",", expected one of  "!=" "%" "&" "&&" ")" "*" "+" "-" "/" "<" "<=" "==" ">" ">=" "?" "^" "instanceof" "|" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ArrayAndReceiver.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ArrayAndReceiver.java
 (line 27,col 29) Parse error. Found "[", expected one of  ")" ","
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/AssertAsIdentifier2.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/AssertAsIdentifier2.java
 (line 27,col 5) Parse error. Found "assert", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/CallMustBeFirst.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/CallMustBeFirst.java
 (line 28,col 18) Parse error. Found "super", expected "}"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/CantAssignToThis.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/CantAssignToThis.java
 (line 28,col 9) Illegal left hand side of an assignment.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/CantExtendIntfAnno.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/CantExtendIntfAnno.java
 (line 28,col 12) Parse error. Found "extends", expected "{"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/CatchWithoutTry.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/CatchWithoutTry.java
 (line 27,col 14) Parse error. Found "catch", expected "}"
 (line 30,col 5) Parse error. Found "}", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java
 (line 27,col 18) Parse error. Found "default", expected one of  ";" "@" "[" "throws" "{"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/DotClassExpected.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/DotClassExpected.java
 (line 27,col 11) Parse error. Found "int", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ElseWithoutIf.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ElseWithoutIf.java
 (line 27,col 14) Parse error. Found "else", expected "}"
 (line 30,col 5) Parse error. Found "}", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/EmptyCharLiteral.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/EmptyCharLiteral.java
 Lexical error at line 27, column 15.  Encountered: "\'" (39), after : "\'"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/EnumAsIdentifier2.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/EnumAsIdentifier2.java
 (line 27,col 9) 'enum' cannot be used as an identifier as it is a keyword.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/Expected2.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/Expected2.java
 (line 30,col 13) Parse error. Found ";", expected one of  "(" "@" "["
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/Expected3.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/Expected3.java
 Parse error. Found "int", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ExpectedModule.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ExpectedModule.java
 (line 26,col 1) Parse error. Found "class", expected "module"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/FinallyWithoutTry.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/FinallyWithoutTry.java
 (line 27,col 14) Parse error. Found "finally", expected "}"
 (line 30,col 5) Parse error. Found "}", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ForeachBadInitialization.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ForeachBadInitialization.java
 (line 29,col 14) Parse error. Found ":", expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 31,col 2) Parse error. Found <EOF>, expected "}"
 (line 31,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IdentifierExpected.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IdentifierExpected.java
 (line 30,col 1) Parse error. Found "{", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalChar.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalAnnotationDeclaration.java
+(line 27,col 5) Parse error. Found "@", expected "}"
+(line 29,col 5) Parse error. Found "}", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
+
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalChar.java
 Lexical error at line 27, column 13.  Encountered: "`" (96), after : ""
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalComboModifiers.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalComboModifiers.java
 (line 27,col 5) Can have only one of 'public', 'private'.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalDot.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalDot.java
 (line 27,col 12) Parse error. Found ".", expected one of  "..." "@" "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalEscapeChar.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalEscapeChar.java
 Lexical error at line 27, column 18.  Encountered: "!" (33), after : "\"\\"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java
 Lexical error at line 27, column 15.  Encountered: "\n" (10), after : "\'"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java
 (line 27,col 13) Parse error. Found  "\\u0660" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalStartOfExpr.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalStartOfExpr.java
 (line 27,col 11) Parse error. Found "=", expected one of  "!" "(" "+" "++" "-" "--" "@" "boolean" "byte" "char" "double" "enum" "exports" "false" "float" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "short" "strictfp" "super" "this" "to" "transitive" "true" "uses" "void" "with" "{" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalStartOfStmt.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalStartOfStmt.java
 (line 29,col 17) Parse error. Found "}", expected one of  "(" "++" "--" ";" "@" "assert" "boolean" "break" "byte" "char" "continue" "do" "double" "enum" "exports" "false" "float" "for" "if" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "return" "short" "strictfp" "super" "switch" "synchronized" "this" "throw" "to" "transitive" "true" "try" "uses" "void" "while" "with" "{" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 31,col 2) Parse error. Found <EOF>, expected one of  "else" "}"
 (line 31,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalStartOfType.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalStartOfType.java
 (line 27,col 27) Parse error. Found ")", expected one of  "boolean" "byte" "char" "double" "float" "int" "long" "short"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalUnderscore.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalUnderscore.java
 (line 27,col 13) Parse error. Found  "_" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IllegalUnicodeEscape.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IllegalUnicodeEscape.java
 Lexical error at line 27, column 15.  Encountered: ";" (59), after : "\\u"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/InitializerNotAllowed.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/InitializerNotAllowed.java
 (line 27,col 5) An interface cannot have initializers.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/InterfaceNotAllowed.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/InterfaceNotAllowed.java
 (line 28,col 9) There is no such thing as a local interface.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java
 (line 26,col 12) Parse error. Found "<", expected "{"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java
 (line 27,col 17) Parse error. Found "int", expected ")"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java
 (line 26,col 14) Parse error. Found "<", expected one of  ";" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "volatile" "with" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/InvalidBinaryNumber.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/InvalidBinaryNumber.java
 (line 27,col 13) Parse error. Found  "b201000010" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/InvalidHexNumber.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/InvalidHexNumber.java
 (line 28,col 13) Parse error. Found  "xz1357abc" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/InvalidModuleDirective/module-info.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/InvalidModuleDirective/module-info.java
 (line 27,col 21) Parse error. Found  "resuires" <IDENTIFIER>, expected one of  "exports" "opens" "provides" "requires" "uses" "}"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/LocalEnum.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/LocalEnum.java
 (line 28,col 14) Parse error. Found "{", expected one of  "," ";" "=" "@" "["
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/MalformedFpLit.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/MalformedFpLit.java
 (line 28,col 15) Parse error. Found  "e" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ModifierNotAllowed.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ModifierNotAllowed.java
 (line 26,col 1) 'synchronized' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/NoAnnotationsOnDotClass.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/NoAnnotationsOnDotClass.java
 (line 30,col 14) Parse error. Found "@", expected one of  "!" "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/NotAllowedClass.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/NotAllowedClass.java
 (line 28,col 17) Parse error. Found "class", expected one of  "(" "++" "--" ";" "@" "assert" "boolean" "break" "byte" "char" "continue" "do" "double" "enum" "exports" "false" "float" "for" "if" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "return" "short" "strictfp" "super" "switch" "synchronized" "this" "throw" "to" "transitive" "true" "try" "uses" "void" "while" "with" "{" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 31,col 2) Parse error. Found <EOF>, expected one of  "else" "}"
 (line 31,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/NotAllowedVariable.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/NotAllowedVariable.java
 (line 28,col 17) Parse error. Found "int", expected one of  "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/NotAStatement.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/NotAStatement.java
 (line 27,col 14) Parse error. Found  "x" <IDENTIFIER>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/Orphaned.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/Orphaned.java
 (line 27,col 14) Parse error. Found "case", expected "}"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/PrematureEOF.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/PrematureEOF.java
 (line 26,col 20) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java
 Parse error. Found  "clas" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/RepeatedModifier.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/RepeatedModifier.java
 (line 27,col 12) Duplicated modifier
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ThisAsIdentifier.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ThisAsIdentifier.java
 (line 27,col 5) Parse error. Found "this", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java
 (line 27,col 18) Parse error. Found "throws", expected one of  ";" "default"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java
 (line 29,col 9) Try has no finally, no catch, and no resources.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java
 (line 28,col 9) Try has no finally, no catch, and no resources.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/TypeReqClassArray.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/TypeReqClassArray.java
 (line 30,col 34) Parse error. Found ")", expected "["
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnclosedCharLiteral.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnclosedCharLiteral.java
 Lexical error at line 27, column 16.  Encountered: ";" (59), after : "\'a"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnclosedComment.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnclosedComment.java
 Lexical error at line 31, column 0.  Encountered: <EOF> after : ""
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnclosedStringLiteral.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnclosedStringLiteral.java
 Lexical error at line 27, column 21.  Encountered: "\n" (10), after : "\"abc;"
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnderscoreAsIdentifierError.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnderscoreAsIdentifierError.java
 (line 27,col 12) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnderscoreAsIdentifierWarning.java
 (line 28,col 12) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnderscoreInLambdaExpression.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnderscoreInLambdaExpression.java
 (line 26,col 52) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/UnexpectedTokenInModuleInfo/module-info.java
 Parse error. Found  "weak" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/diags/examples/VarargsAndReceiver.java
+langtools-19293ea3999f/test/tools/javac/diags/examples/VarargsAndReceiver.java
 (line 27,col 30) Parse error. Found "this", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/Digits.java
+langtools-19293ea3999f/test/tools/javac/Digits.java
 (line 11,col 40) Parse error. Found  "\\u0663" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/enum/EnumAsIdentifier.java
+langtools-19293ea3999f/test/tools/javac/enum/EnumAsIdentifier.java
 (line 11,col 9) 'enum' cannot be used as an identifier as it is a keyword.
 
-langtools-5ecbed313125/test/tools/javac/enum/EnumMembersOrder.java
+langtools-19293ea3999f/test/tools/javac/enum/EnumMembersOrder.java
 (line 11,col 10) Parse error. Found  "d" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" ")" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/enum/ExplicitlyAbstractEnum1.java
+langtools-19293ea3999f/test/tools/javac/enum/ExplicitlyAbstractEnum1.java
 (line 9,col 1) 'abstract' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/enum/ExplicitlyAbstractEnum2.java
+langtools-19293ea3999f/test/tools/javac/enum/ExplicitlyAbstractEnum2.java
 (line 9,col 1) 'abstract' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/enum/ExplicitlyFinalEnum1.java
+langtools-19293ea3999f/test/tools/javac/enum/ExplicitlyFinalEnum1.java
 (line 9,col 1) 'final' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/enum/ExplicitlyFinalEnum2.java
+langtools-19293ea3999f/test/tools/javac/enum/ExplicitlyFinalEnum2.java
 (line 9,col 1) 'final' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/enum/LocalEnum.java
+langtools-19293ea3999f/test/tools/javac/enum/LocalEnum.java
 (line 11,col 14) Parse error. Found "{", expected one of  "," ";" "=" "@" "["
 (line 13,col 2) Parse error. Found <EOF>, expected "}"
 (line 13,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/EOI.java
+langtools-19293ea3999f/test/tools/javac/EOI.java
 (line 10,col 16) Parse error. Found  "foobar\u001a" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/ExtendArray.java
+langtools-19293ea3999f/test/tools/javac/ExtendArray.java
 (line 11,col 34) Parse error. Found "[", expected one of  "," "implements" "{"
 
-langtools-5ecbed313125/test/tools/javac/ExtraneousEquals.java
+langtools-19293ea3999f/test/tools/javac/ExtraneousEquals.java
 (line 10,col 22) Parse error. Found "=", expected one of  "!" "(" "+" "++" "-" "--" "@" "]" "boolean" "byte" "char" "double" "enum" "exports" "false" "float" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "short" "strictfp" "super" "this" "to" "transitive" "true" "uses" "void" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/failover/FailOver01.java
+langtools-19293ea3999f/test/tools/javac/failover/FailOver01.java
 (line 10,col 20) Parse error. Found "}", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 10,col 26) Parse error. Found <EOF>, expected "}"
 (line 10,col 26) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/failover/FailOver15.java
+langtools-19293ea3999f/test/tools/javac/failover/FailOver15.java
 (line 17,col 9) Parse error. Found "}", expected one of  "%=" "&=" "*=" "++" "+=" "--" "-=" "/=" ";" "<<=" "=" ">>=" ">>>=" "^=" "|="
 (line 19,col 2) Parse error. Found <EOF>, expected "}"
 (line 19,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java
+langtools-19293ea3999f/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java
 (line 12,col 5) 'strictfp' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/generics/typevars/5060485/Compatibility02.java
+langtools-19293ea3999f/test/tools/javac/generics/typevars/5060485/Compatibility02.java
 (line 36,col 9) 'static' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/generics/typevars/6680106/T6680106.java
+langtools-19293ea3999f/test/tools/javac/generics/typevars/6680106/T6680106.java
 (line 11,col 24) Parse error. Found "[", expected one of  "&" "," ">"
 
-langtools-5ecbed313125/test/tools/javac/IllegalAnnotation.java
+langtools-19293ea3999f/test/tools/javac/IllegalAnnotation.java
 (line 9,col 5) Parse error. Found "@", expected "}"
 (line 11,col 5) Parse error. Found "}", expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/incompleteStatements/T8000484.java
+langtools-19293ea3999f/test/tools/javac/incompleteStatements/T8000484.java
 (line 9,col 14) Parse error. Found "catch", expected "}"
 (line 10,col 29) Parse error. Found "else", expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/LabeledDeclaration.java
+langtools-19293ea3999f/test/tools/javac/LabeledDeclaration.java
 (line 12,col 8) Parse error. Found "int", expected one of  "(" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/lambda/8131742/T8131742.java
+langtools-19293ea3999f/test/tools/javac/lambda/8131742/T8131742.java
 (line 8,col 32) Parse error. Found ".", expected one of  ")" "," "@" "["
 
-langtools-5ecbed313125/test/tools/javac/lambda/BadLambdaPos.java
+langtools-19293ea3999f/test/tools/javac/lambda/BadLambdaPos.java
 (line 18,col 26) Parse error. Found "+", expected one of  ")" ","
 (line 19,col 26) Parse error. Found "instanceof", expected one of  ")" ","
 (line 23,col 30) Parse error. Found "+", expected one of  "," ";"
 (line 24,col 33) Parse error. Found "instanceof", expected one of  "," ";"
 
-langtools-5ecbed313125/test/tools/javac/lambda/BadStatementInLambda.java
+langtools-19293ea3999f/test/tools/javac/lambda/BadStatementInLambda.java
 (line 18,col 19) Parse error. Found  "1" <INTEGER_LITERAL>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java
+langtools-19293ea3999f/test/tools/javac/lambda/funcInterfaces/LambdaTest1_neg1.java
 (line 13,col 64) Parse error. Found "}", expected one of  "," ";"
 (line 15,col 2) Parse error. Found <EOF>, expected "}"
 (line 15,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/lambda/IdentifierTest.java
+langtools-19293ea3999f/test/tools/javac/lambda/IdentifierTest.java
 (line 41,col 11) '_' is a reserved keyword.
 (line 44,col 16) '_' is a reserved keyword.
 (line 45,col 20) '_' is a reserved keyword.
@@ -492,13 +481,13 @@ langtools-5ecbed313125/test/tools/javac/lambda/IdentifierTest.java
 (line 174,col 19) '_' is a reserved keyword.
 (line 180,col 11) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.java
+langtools-19293ea3999f/test/tools/javac/lambda/lambdaExpression/InvalidExpression1.java
 (line 15,col 66) Parse error. Found "}", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 16,col 5) Parse error. Found "}", expected one of  "," ";"
 (line 17,col 2) Parse error. Found <EOF>, expected "}"
 (line 17,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/lambda/UnderscoreAsIdent.java
+langtools-19293ea3999f/test/tools/javac/lambda/UnderscoreAsIdent.java
 (line 30,col 9) '_' is a reserved keyword.
 (line 30,col 9) '_' is a reserved keyword.
 (line 32,col 8) '_' is a reserved keyword.
@@ -517,114 +506,120 @@ langtools-5ecbed313125/test/tools/javac/lambda/UnderscoreAsIdent.java
 (line 51,col 9) '_' is a reserved keyword.
 (line 53,col 22) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javac/lambda/VoidLambdaParameter.java
+langtools-19293ea3999f/test/tools/javac/lambda/VoidLambdaParameter.java
 (line 7,col 18) Parse error. Found "void", expected one of  "!" "(" ")" "enum" "exports" "false" "module" "new" "null" "open" "opens" "provides" "requires" "strictfp" "super" "this" "to" "transitive" "true" "uses" "with" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/literals/BadBinaryLiterals.java
+langtools-19293ea3999f/test/tools/javac/literals/BadBinaryLiterals.java
 (line 11,col 20) Parse error. Found  "2" <INTEGER_LITERAL>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/literals/BadUnderscoreLiterals.java
+langtools-19293ea3999f/test/tools/javac/literals/BadUnderscoreLiterals.java
 (line 15,col 14) Parse error. Found  "_" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/literals/T6891079.java
+langtools-19293ea3999f/test/tools/javac/literals/T6891079.java
 (line 8,col 14) Parse error. Found  "B" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/modules/InvalidModuleDirective/module-info.java
+langtools-19293ea3999f/test/tools/javac/modules/InvalidModuleDirective/module-info.java
 (line 9,col 21) Parse error. Found  "resuires" <IDENTIFIER>, expected one of  "exports" "opens" "provides" "requires" "uses" "}"
 
-langtools-5ecbed313125/test/tools/javac/overrridecrash/A.java
+langtools-19293ea3999f/test/tools/javac/overrridecrash/A.java
 (line 25,col 5) Can have only one of 'protected', 'private'.
 
-langtools-5ecbed313125/test/tools/javac/overrridecrash/B.java
+langtools-19293ea3999f/test/tools/javac/overrridecrash/B.java
 (line 12,col 5) Can have only one of 'protected', 'private'.
 
-langtools-5ecbed313125/test/tools/javac/Parens3.java
+langtools-19293ea3999f/test/tools/javac/Parens3.java
 (line 12,col 9) Parse error. Found ":", expected one of  "%=" "&=" "*=" "++" "+=" "--" "-=" "/=" ";" "<<=" "=" ">>=" ">>>=" "^=" "|="
 
-langtools-5ecbed313125/test/tools/javac/ParseConditional.java
+langtools-19293ea3999f/test/tools/javac/ParseConditional.java
 (line 23,col 13) Illegal left hand side of an assignment.
 
-langtools-5ecbed313125/test/tools/javac/parser/7157165/T7157165.java
+langtools-19293ea3999f/test/tools/javac/parser/7157165/T7157165.java
 (line 11,col 19) Parse error. Found "|", expected one of  "," ">"
 
-langtools-5ecbed313125/test/tools/javac/parser/8081769/T8081769.java
+langtools-19293ea3999f/test/tools/javac/parser/8081769/T8081769.java
 (line 9,col 20) Parse error. Found ".", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 10,col 20) Parse error. Found ".", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 11,col 20) Parse error. Found ".", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 12,col 20) Parse error. Found ".", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 14,col 31) Parse error. Found ".", expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/parser/ErroneousParameters.java
+langtools-19293ea3999f/test/tools/javac/parser/ErroneousParameters.java
 (line 11,col 34) Parse error. Found "...", expected one of  ")" "," "@" "["
 
-langtools-5ecbed313125/test/tools/javac/parser/MissingClosingBrace.java
+langtools-19293ea3999f/test/tools/javac/parser/MissingClosingBrace.java
 (line 13,col 1) Parse error. Found <EOF>, expected one of  "else" "}"
 (line 13,col 2) Parse error. Found <EOF>, expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/parser/SingleCommaAnnotationValueFail.java
+langtools-19293ea3999f/test/tools/javac/parser/SingleCommaAnnotationValueFail.java
 (line 34,col 11) Parse error. Found  "0" <INTEGER_LITERAL>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/parser/T4881269.java
+langtools-19293ea3999f/test/tools/javac/parser/T4881269.java
 (line 32,col 10) Parse error. Found ".", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/policy/test3/A.java
+langtools-19293ea3999f/test/tools/javac/policy/test3/A.java
 (line 5,col 36) Parse error. Found  "0" <INTEGER_LITERAL>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/processing/6994946/SyntaxErrorTest.java
+langtools-19293ea3999f/test/tools/javac/processing/6994946/SyntaxErrorTest.java
 (line 14,col 9) Parse error. Found "}", expected "("
 
-langtools-5ecbed313125/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java
+langtools-19293ea3999f/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java
 (line 37,col 36) Parse error. Found ",", expected one of  "..." "@" "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/quid/T6999438.java
+langtools-19293ea3999f/test/tools/javac/quid/T6999438.java
 Lexical error at line 8, column 9.  Encountered: "#" (35), after : ""
 
-langtools-5ecbed313125/test/tools/javac/rawDiags/Error.java
+langtools-19293ea3999f/test/tools/javac/rawDiags/Error.java
 (line 9,col 17) Parse error. Found <EOF>, expected "("
 
-langtools-5ecbed313125/test/tools/javac/StoreClass.java
+langtools-19293ea3999f/test/tools/javac/StoreClass.java
 (line 12,col 9) Illegal left hand side of an assignment.
 (line 13,col 9) Illegal left hand side of an assignment.
 
-langtools-5ecbed313125/test/tools/javac/SynchronizedClass.java
+langtools-19293ea3999f/test/tools/javac/SynchronizedClass.java
 (line 9,col 1) 'synchronized' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javac/T4994049/T4994049.java
+langtools-19293ea3999f/test/tools/javac/T4994049/T4994049.java
 (line 11,col 5) Parse error. Found  "BAR" <IDENTIFIER>, expected one of  "," ";" "}"
 
-langtools-5ecbed313125/test/tools/javac/T6882235.java
+langtools-19293ea3999f/test/tools/javac/T6882235.java
 (line 10,col 11) Parse error. Found ";", expected one of  "!" "(" "+" "++" "-" "--" "@" "boolean" "byte" "char" "double" "enum" "exports" "false" "float" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "short" "strictfp" "super" "this" "to" "transitive" "true" "uses" "void" "with" "{" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 
-langtools-5ecbed313125/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
+langtools-19293ea3999f/test/tools/javac/T8026963/TypeAnnotationsCrashWithErroneousTreeTest.java
 (line 9,col 19) Parse error. Found "this", expected one of  ")" "@" "abstract" "boolean" "byte" "char" "default" "double" "enum" "exports" "final" "float" "int" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "volatile" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java
+langtools-19293ea3999f/test/tools/javac/T8171325/NPEClearingLocalClassNameIndexesTest.java
 (line 19,col 42) Type arguments may not be primitive.
 
-langtools-5ecbed313125/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java
+langtools-19293ea3999f/test/tools/javac/T8175198/AnnotationsAndFormalParamsTest.java
 (line 9,col 14) Parse error. Found "int", expected ")"
 
-langtools-5ecbed313125/test/tools/javac/TryWithResources/BadTwrSyntax.java
+langtools-19293ea3999f/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest1.java
+(line 10,col 15) Parse error. Found "->", expected one of  "!=" "%" "&" "&&" "(" ")" "*" "+" "," "-" "/" "<" "<=" "==" ">" ">=" "?" "^" "instanceof" "|" "||"
+
+langtools-19293ea3999f/test/tools/javac/T8181464/LambdaInAnnotationsCausesNPETest2.java
+(line 10,col 24) Parse error. Found "->", expected one of  "!=" "%" "&" "&&" ")" "*" "+" "," "-" "/" "<" "<=" "==" ">" ">=" "?" "^" "instanceof" "|" "||"
+
+langtools-19293ea3999f/test/tools/javac/TryWithResources/BadTwrSyntax.java
 (line 14,col 42) Parse error. Found ";", expected ")"
 (line 14,col 43) Parse error. Found ")", expected "}"
 (line 16,col 9) Parse error. Found "try", expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/TryWithResources/PlainTry.java
+langtools-19293ea3999f/test/tools/javac/TryWithResources/PlainTry.java
 (line 11,col 9) Try has no finally, no catch, and no resources.
 
-langtools-5ecbed313125/test/tools/javac/TryWithResources/ResDeclOutsideTry.java
+langtools-19293ea3999f/test/tools/javac/TryWithResources/ResDeclOutsideTry.java
 (line 14,col 14) Parse error. Found "=", expected one of  "(" ")"
 (line 14,col 48) Parse error. Found ")", expected "}"
 (line 15,col 9) Parse error. Found "return", expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/TryWithResources/TwrForVariable2.java
+langtools-19293ea3999f/test/tools/javac/TryWithResources/TwrForVariable2.java
 (line 13,col 13) Parse error. Found "final", expected one of  "(" "@" "boolean" "byte" "char" "double" "enum" "exports" "false" "float" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "short" "strictfp" "super" "this" "to" "transitive" "true" "uses" "void" "with" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 15,col 9) Parse error. Found "try", expected one of  ";" "<" "@" "abstract" "boolean" "byte" "char" "class" "default" "double" "enum" "exports" "final" "float" "int" "interface" "long" "module" "native" "open" "opens" "private" "protected" "provides" "public" "requires" "short" "static" "strictfp" "synchronized" "to" "transient" "transitive" "uses" "void" "volatile" "with" "{" "}" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javac/unicode/FirstChar2.java
+langtools-19293ea3999f/test/tools/javac/unicode/FirstChar2.java
 Parse error. Found  "\\u0070ublic" <IDENTIFIER>, expected one of  ";" "@" "\u001a" "abstract" "class" "default" "enum" "final" "import" "interface" "module" "native" "open" "private" "protected" "public" "static" "strictfp" "synchronized" "transient" "transitive" "volatile" <EOF>
 
-langtools-5ecbed313125/test/tools/javac/unicode/NonasciiDigit.java
+langtools-19293ea3999f/test/tools/javac/unicode/NonasciiDigit.java
 (line 13,col 18) Parse error. Found  "\\uff11" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 16,col 21) Parse error. Found  ".0" <FLOATING_POINT_LITERAL>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 (line 17,col 21) Parse error. Found  "\\uff11" <IDENTIFIER>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
@@ -633,28 +628,28 @@ langtools-5ecbed313125/test/tools/javac/unicode/NonasciiDigit.java
 (line 20,col 19) Parse error. Found ".", expected one of  "!" "(" "+" "++" "-" "--" "@" "boolean" "byte" "char" "double" "enum" "exports" "false" "float" "int" "long" "module" "new" "null" "open" "opens" "provides" "requires" "short" "strictfp" "super" "this" "to" "transitive" "true" "uses" "void" "with" "{" "~" <CHARACTER_LITERAL> <FLOATING_POINT_LITERAL> <IDENTIFIER> <INTEGER_LITERAL> <LONG_LITERAL> <STRING_LITERAL>
 (line 21,col 21) Parse error. Found  ".0" <FLOATING_POINT_LITERAL>, expected one of  "!=" "%" "%=" "&" "&&" "&=" "(" "*" "*=" "+" "+=" "," "-" "-=" "->" "/" "/=" "::" ";" "<" "<<=" "<=" "=" "==" ">" ">=" ">>=" ">>>=" "?" "^" "^=" "instanceof" "|" "|=" "||"
 
-langtools-5ecbed313125/test/tools/javac/unicode/TripleQuote.java
+langtools-19293ea3999f/test/tools/javac/unicode/TripleQuote.java
 Lexical error at line 13, column 15.  Encountered: "\'" (39), after : "\'"
 
-langtools-5ecbed313125/test/tools/javac/unicode/UnicodeAtEOL.java
+langtools-19293ea3999f/test/tools/javac/unicode/UnicodeAtEOL.java
 (line 33,col 13) Parse error. Found  "\\u000D" <IDENTIFIER>, expected "}"
 
-langtools-5ecbed313125/test/tools/javac/unicode/UnicodeCommentDelimiter.java
+langtools-19293ea3999f/test/tools/javac/unicode/UnicodeCommentDelimiter.java
 (line 44,col 22) Parse error. Found  "plugh" <IDENTIFIER>, expected one of  "," ";" "=" "@" "["
 
-langtools-5ecbed313125/test/tools/javac/VoidArray.java
+langtools-19293ea3999f/test/tools/javac/VoidArray.java
 (line 12,col 5) Parse error. Found "[", expected one of  "enum" "exports" "module" "open" "opens" "provides" "requires" "strictfp" "to" "transitive" "uses" "with" <IDENTIFIER>
 
-langtools-5ecbed313125/test/tools/javadoc/6964914/Error.java
+langtools-19293ea3999f/test/tools/javadoc/6964914/Error.java
 (line 25,col 12) Parse error. Found "}", expected "("
 
-langtools-5ecbed313125/test/tools/javadoc/6964914/JavacWarning.java
+langtools-19293ea3999f/test/tools/javadoc/6964914/JavacWarning.java
 (line 25,col 12) '_' is a reserved keyword.
 
-langtools-5ecbed313125/test/tools/javadoc/enum/docComments/pkg1/Operation.java
+langtools-19293ea3999f/test/tools/javadoc/enum/docComments/pkg1/Operation.java
 (line 33,col 1) 'abstract' is not allowed here.
 
-langtools-5ecbed313125/test/tools/javadoc/T4994049/FileWithTabs.java
+langtools-19293ea3999f/test/tools/javadoc/T4994049/FileWithTabs.java
 Lexical error at line 25, column 2.  Encountered: "t" (116), after : "\\"
 
-305 problems in 177 files
\ No newline at end of file
+304 problems in 175 files
\ No newline at end of file