simplify union interface

yinwang0 · Apr 30, 2022 · 301d518 · 301d518
1 parent 4cb9d6b
commit 301d518
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/org/yinwang/pysonar/types/UnionType.java b/src/main/java/org/yinwang/pysonar/types/UnionType.java
@@ -3,12 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class UnionType extends Type {
@@ -112,7 +107,7 @@ public static Type union(@NotNull Type u, @NotNull Type v) {
 
     @NotNull
     public static Type union(@NotNull TupleType u, @NotNull TupleType v) {
-        List<Type> types = new ArrayList<Type>();
+        List<Type> types = new ArrayList<>();
         for (int i = 0; i < u.size(); i++) {
             types.add(union(u.get(i), v.get(i)));
         }
@@ -127,6 +122,10 @@ public static Type union(Collection<Type> types) {
         return result;
     }
 
+    public static Type union(Type... types) {
+        return union(Arrays.asList(types));
+    }
+
     @Nullable
     public Type firstUseful() {
         for (Type type : types) {

diff --git a/src/main/java/org/yinwang/pysonar/visitor/TypeInferencer.java b/src/main/java/org/yinwang/pysonar/visitor/TypeInferencer.java
@@ -501,7 +501,7 @@ public Type visit(For node, State s)
             s.merge(s2);
         }
 
-        return UnionType.union(UnionType.union(t1, t2), t3);
+        return UnionType.union(t1, t2, t3);
     }
 
     @NotNull
@@ -1129,7 +1129,7 @@ public Type visit(While node, State s)
             s.merge(s2);
         }
 
-        return UnionType.union(UnionType.union(t1, t2), t3);
+        return UnionType.union(t1, t2, t3);
     }
 
     @NotNull