Fix parsing of module-info require directives that are both `stat…

…ic` and `transitive` PiperOrigin-RevId: 673075838
google · Sep 10, 2024 · e1ea3c5 · e1ea3c5
1 parent 5bd2dfa
commit e1ea3c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/java/com/google/turbine/parse/Parser.java b/java/com/google/turbine/parse/Parser.java
@@ -464,12 +464,12 @@ private ModRequires moduleRequires() {
       if (token == Token.IDENT && lexer.stringValue().equals("transitive")) {
         next();
         access.add(TurbineModifier.TRANSITIVE);
-        break;
+        continue;
       }
       if (token == Token.STATIC) {
         next();
         access.add(TurbineModifier.STATIC);
-        break;
+        continue;
       }
       break;
     }

diff --git a/javatests/com/google/turbine/lower/ModuleIntegrationTest.java b/javatests/com/google/turbine/lower/ModuleIntegrationTest.java
@@ -48,6 +48,8 @@ public static Iterable<Object[]> parameters() {
       "classpath.test",
       "multimodule.test",
       "module-info-open.test",
+      "module-requires-static-transitive.test",
+      "module-requires-transitive-static.test",
     };
     return ImmutableList.copyOf(testCases).stream().map(x -> new Object[] {x}).collect(toList());
   }

diff --git a/javatests/com/google/turbine/lower/moduletestdata/module-requires-static-transitive.test b/javatests/com/google/turbine/lower/moduletestdata/module-requires-static-transitive.test
@@ -0,0 +1,5 @@
+=== module-info.java ===
+
+module foo {
+  requires static transitive java.base;
+}
diff --git a/javatests/com/google/turbine/lower/moduletestdata/module-requires-transitive-static.test b/javatests/com/google/turbine/lower/moduletestdata/module-requires-transitive-static.test
@@ -0,0 +1,5 @@
+=== module-info.java ===
+
+module foo {
+  requires transitive static java.base;
+}