Fix parsing of open module ... {} module declarations

Prompted by google/error-prone#4311 PiperOrigin-RevId: 614012108
google · Mar 8, 2024 · 1f0a128 · 1f0a128
1 parent 0664571
commit 1f0a128
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/java/com/google/turbine/parse/Parser.java b/java/com/google/turbine/parse/Parser.java
@@ -210,7 +210,11 @@ public CompUnit compilationUnit() {
                 && (ident.value().equals("module") || ident.value().equals("open"))) {
               boolean open = false;
               if (ident.value().equals("open")) {
-                ident = eatIdent();
+                next();
+                if (token != IDENT) {
+                  throw error(token);
+                }
+                ident = ident();
                 open = true;
               }
               if (!ident.value().equals("module")) {

diff --git a/javatests/com/google/turbine/lower/ModuleIntegrationTest.java b/javatests/com/google/turbine/lower/ModuleIntegrationTest.java
@@ -47,6 +47,7 @@ public static Iterable<Object[]> parameters() {
       "module-info.test", //
       "classpath.test",
       "multimodule.test",
+      "module-info-open.test",
     };
     return ImmutableList.copyOf(testCases).stream().map(x -> new Object[] {x}).collect(toList());
   }
@@ -61,7 +62,7 @@ public ModuleIntegrationTest(String test) {
 
   @Test
   public void test() throws Exception {
-    if (Double.parseDouble(JAVA_CLASS_VERSION.value()) < 53) {
+    if (Runtime.version().feature() < 9) {
       // only run on JDK 9 and later
       return;
     }

diff --git a/javatests/com/google/turbine/lower/moduletestdata/module-info-open.test b/javatests/com/google/turbine/lower/moduletestdata/module-info-open.test
@@ -0,0 +1,5 @@
+=== module-info.java ===
+open module com.google.foop.annotation {
+  requires java.base;
+  requires java.compiler;
+}
diff --git a/javatests/com/google/turbine/parse/ParseErrorTest.java b/javatests/com/google/turbine/parse/ParseErrorTest.java
@@ -475,6 +475,22 @@ public void typeAnnotationBeforeParam() {
                 "                ^"));
   }
 
+  @Test
+  public void moduleInfoOpen() {
+    String input =
+        lines(
+            "open {", //
+            "}");
+    TurbineError e = assertThrows(TurbineError.class, () -> Parser.parse(input));
+    assertThat(e)
+        .hasMessageThat()
+        .isEqualTo(
+            lines(
+                "<>:1: error: unexpected token: {", //
+                "open {",
+                "     ^"));
+  }
+
   private static String lines(String... lines) {
     return Joiner.on(System.lineSeparator()).join(lines);
   }