Improve generic support in the interpreter

1 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/org/zwobble/couscous/util/ExtraMaps.java b/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
index 55829cf..f25f06f 100644
--- a/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
+++ b/src/main/java/org/zwobble/couscous/util/ExtraMaps.java
@@ -28,6 +28,16 @@ public class ExtraMaps {
         return Optional.ofNullable(map.get(key));
     }
 
+    public static <T, K, V> Map<K, V> toMap(Iterable<K> keys, Iterable<V> values) {
+        return toMap(ExtraIterables.map(keys, values, ExtraMaps::entry));
+    }
+
+    public static <T, K, V> Map<K, V> toMap(Iterable<Map.Entry<K, V>> entries) {
+        ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
+        entries.forEach(builder::put);
+        return builder.build();
+    }
+
     public static <T, K, V> Map<K, V> toMap(Iterable<T> iterable, Function<T, Map.Entry<K, V>> function) {
         ImmutableMap.Builder<K, V> builder = ImmutableMap.builder();
 
@@ -39,6 +49,10 @@ public class ExtraMaps {
     }
 
     public static <T, K> Map<K, T> toMapWithKeys(Iterable<T> iterable, Function<T, K> function) {
-        return toMap(iterable, value -> new AbstractMap.SimpleImmutableEntry<K, T>(function.apply(value), value));
+        return toMap(iterable, value -> entry(function.apply(value), value));
+    }
+
+    public static <K, V> Map.Entry<K, V> entry(K key, V value) {
+        return new AbstractMap.SimpleImmutableEntry<>(key, value);
     }
 }