diff --git a/muscript/src/main/java/io/gitlab/jfronny/muscript/data/Scope.java b/muscript/src/main/java/io/gitlab/jfronny/muscript/data/Scope.java index fbba659..07510e7 100644 --- a/muscript/src/main/java/io/gitlab/jfronny/muscript/data/Scope.java +++ b/muscript/src/main/java/io/gitlab/jfronny/muscript/data/Scope.java @@ -75,15 +75,15 @@ public class Scope implements DObject { return set(key, DFinal.of(value)); } - public Scope set(String key, Map> value) { + public Scope set(String key, Map> value) { return set(key, DFinal.of(value)); } - public Scope set(String key, List> value) { + public Scope set(String key, List> value) { return set(key, DFinal.of(value)); } - public Scope set(String key, Function> value) { + public Scope set(String key, Function> value) { return set(key, DFinal.of(value, () -> key)); } diff --git a/muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/additional/DFinal.java b/muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/additional/DFinal.java index 1c1d6a6..c51018e 100644 --- a/muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/additional/DFinal.java +++ b/muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/additional/DFinal.java @@ -25,7 +25,7 @@ public class DFinal { return new FString(b); } - public static DObject of(Map> b) { + public static DObject of(Map> b) { return new FObject(Map.copyOf(b)); } @@ -33,12 +33,12 @@ public class DFinal { return new FList(List.of(b)); } - public static DList of(List> b) { - return new FList(ImmCollection.of(b)); + public static DList of(List> b) { + return new FList(ImmCollection.of((List>) b)); } - public static DCallable of(Function> b, Supplier serialized) { - return new FCallable(b, new LazySupplier<>(serialized)); + public static DCallable of(Function> b, Supplier serialized) { + return new FCallable((Function>) b, new LazySupplier<>(serialized)); } /**