From 2ab48129b347b7aab81257689c55325bf7096dc9 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 29 Dec 2025 02:12:12 +0200 Subject: [PATCH] "null" is now a valid assignment/argument type --- .../gui/util/script/interpreter/ScriptDocument.java | 9 +++++++-- .../script/interpreter/expression/ExpressionNode.java | 4 +++- .../interpreter/expression/ExpressionTypeResolver.java | 4 ++-- .../util/script/interpreter/expression/TypeRules.java | 9 +++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java index 5a135bf6a..82dc31500 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java @@ -2277,7 +2277,7 @@ public class ScriptDocument { // Null literal if (expr.equals("null")) { - return null; // null is compatible with any reference type + return TypeInfo.unresolved("null", ""); // null is compatible with any reference type } // Numeric literals with precision checking @@ -2687,6 +2687,11 @@ public class ScriptDocument { ExpressionTypeResolver resolver = new ExpressionTypeResolver(context); TypeInfo result = resolver.resolve(expr); + // Special case: null literal type is "unresolved" but valid + if (result != null && "".equals(result.getFullName())) { + return result; + } + // If the expression resolver couldn't resolve it, fall back to simple resolution if (result == null || !result.isResolved()) { // Try the simple path in case the operator detection was a false positive @@ -2712,7 +2717,7 @@ public class ScriptDocument { return TypeInfo.fromPrimitive("boolean"); } if ("null".equals(name)) { - return null; + return TypeInfo.unresolved("null", ""); } // Try to resolve as a variable diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionNode.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionNode.java index beb0397c0..85bcf1f30 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionNode.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionNode.java @@ -59,7 +59,9 @@ public abstract class ExpressionNode { public static class NullLiteralNode extends ExpressionNode { public NullLiteralNode(int start, int end) { super(start, end); } - public TypeInfo resolveType(TypeResolverContext resolver) { return null; } + public TypeInfo resolveType(TypeResolverContext resolver) { + return TypeInfo.unresolved("null", ""); + } } public static class IdentifierNode extends ExpressionNode { diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionTypeResolver.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionTypeResolver.java index c07ffefcf..2a1e2bcf4 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionTypeResolver.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/ExpressionTypeResolver.java @@ -51,7 +51,7 @@ public class ExpressionTypeResolver { if (node instanceof ExpressionNode.BooleanLiteralNode) return TypeInfo.fromPrimitive("boolean"); if (node instanceof ExpressionNode.CharLiteralNode) return TypeInfo.fromPrimitive("char"); if (node instanceof ExpressionNode.StringLiteralNode) return TypeInfo.fromClass(String.class); - if (node instanceof ExpressionNode.NullLiteralNode) return null; + if (node instanceof ExpressionNode.NullLiteralNode) return TypeInfo.unresolved("null", ""); if (node instanceof ExpressionNode.IdentifierNode) { return context.resolveIdentifier(((ExpressionNode.IdentifierNode) node).getName()); @@ -132,7 +132,7 @@ public class ExpressionTypeResolver { return new ExpressionNode.TypeResolverContext() { public TypeInfo resolveIdentifier(String name) { if ("true".equals(name) || "false".equals(name)) return TypeInfo.fromPrimitive("boolean"); - if ("null".equals(name)) return null; + if ("null".equals(name)) return TypeInfo.unresolved("null", ""); return null; } public TypeInfo resolveMemberAccess(TypeInfo targetType, String memberName) { return null; } diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/TypeRules.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/TypeRules.java index 8b3fa8b17..2e6e71503 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/TypeRules.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/TypeRules.java @@ -144,6 +144,15 @@ public class TypeRules { if (thenType == null && elseType == null) return null; if (thenType == null) return elseType; if (elseType == null) return thenType; + + // Handle null literal type + boolean thenIsNull = "".equals(thenType.getFullName()); + boolean elseIsNull = "".equals(elseType.getFullName()); + + if (thenIsNull && elseIsNull) return thenType; // both null -> null + if (thenIsNull) return elseType; // null : T -> T + if (elseIsNull) return thenType; // T : null -> T + if (!thenType.isResolved()) return elseType.isResolved() ? elseType : null; if (!elseType.isResolved()) return thenType;