mod#148 Support multiple export modules TOs

aalmiray · Sep 1, 2021 · 55630ba · 55630ba
1 parent 62b4613
commit 55630ba
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/moditect/model/PackageNamePattern.java b/core/src/main/java/org/moditect/model/PackageNamePattern.java
@@ -29,9 +29,9 @@ public static enum Kind {
         EXCLUSIVE;
     }
 
-    // TODO multiple TOs
     private static final Pattern INCLUSIVE_PATTERN = Pattern.compile( "(.*?)((\\s*to\\s)(.*))?" );
     private static final Pattern EXCLUSIVE_PATTERN = Pattern.compile( "(!)(.*?)" );
+    private static final Pattern MODULES_PATTERN = Pattern.compile( "\\s*,\\s*" );
 
     private final Kind kind;
     private final Pattern pattern;
@@ -65,11 +65,15 @@ public static PackageNamePattern parsePattern(String pattern) {
                 throw new IllegalArgumentException( "Invalid inclusive pattern: " + pattern );
             }
             else {
-                return inclusive( matcher.group( 1 ), matcher.group( 2 ) != null ? Arrays.asList( matcher.group( 4 ) ) : Collections.emptyList() );
+                return inclusive( matcher.group( 1 ), matcher.group( 2 ) != null ? modules(matcher.group( 4 )) : Collections.emptyList() );
             }
         }
     }
 
+    private static List<String> modules(String modules) {
+        return Arrays.asList(MODULES_PATTERN.split(modules));
+    }
+
     private static PackageNamePattern inclusive(String pattern, List<String> targetModules) {
         return new PackageNamePattern( Kind.INCLUSIVE, pattern, targetModules );
     }