Johannes/java-commons
Johannes
/
java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make DObject.get null-safe
ci/woodpecker/manual/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-06-29 15:40:45 +02:00
parent 7b6c0fb93f
commit 9fdcd3dfd1
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/DObject.java
View File

@ -3,13 +3,15 @@ package io.gitlab.jfronny.muscript.data.dynamic;
import io.gitlab.jfronny.muscript.ast.DynamicExpr;
import io.gitlab.jfronny.muscript.ast.dynamic.ObjectLiteral;
import io.gitlab.jfronny.muscript.compiler.CodeLocation;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Map;
import java.util.stream.Collectors;
public non-sealed interface DObject extends Dynamic<Map<String, Dynamic<?>>> {
default Dynamic<?> get(String key) {
return getValue().get(key);
default @NotNull Dynamic<?> get(String key) {
return Dynamic.fromNullable(getValue().get(key));
}
default boolean has(String key) {

6
muscript/src/main/java/io/gitlab/jfronny/muscript/data/dynamic/Dynamic.java
View File

@ -7,6 +7,8 @@ import io.gitlab.jfronny.muscript.ast.Expr;
import io.gitlab.jfronny.muscript.compiler.ExprWriter;
import io.gitlab.jfronny.muscript.compiler.Parser;
import io.gitlab.jfronny.muscript.data.dynamic.additional.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@ -40,6 +42,10 @@ public sealed interface Dynamic<T> permits DBool, DNumber, DString, DObject, DLi
return dynamic == null || dynamic instanceof DNull;
}
static @NotNull Dynamic<?> fromNullable(@Nullable Dynamic<?> dynamic) {
return dynamic == null ? new DNull() : dynamic;
}
default void serialize(ExprWriter writer) throws IOException {
toExpr().decompile(writer);
}