wip

Author: ktoso

SwiftKitCore/build.gradle

@@ -25,15 +25,24 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(1))
     }
     // Support Android 6+ (Java 7)
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+}
+
+testing {
+    suites {
+        test {
+            useJUnitJupiter('5.10.3')
+        }
+    }
 }
 
 tasks.test {

SwiftKitCore/src/main/java/org/swift/swiftkit/core/primitives/UnsignedByte.java

@@ -0,0 +1,19 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package org.swift.swiftkit.core.primitives;
+
+public class UnsignedByte {
+
+}

SwiftKitCore/src/main/java/org/swift/swiftkit/core/primitives/UnsignedInteger.java

@@ -0,0 +1,95 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package org.swift.swiftkit.core.primitives;
+
+import java.math.BigInteger;
+import java.util.Objects;
+
+public final class UnsignedInteger extends Number implements Comparable<UnsignedInteger> {
+
+    public final static UnsignedInteger ZERO = representedByBitsOf(0);
+    public final static UnsignedInteger MAX_VALUE = representedByBitsOf(-1);
+    public final static long MASK = 0xffffffffL;
+
+    final int value;
+
+    private UnsignedInteger(int bits) {
+        this.value = bits;
+    }
+
+    /**
+     * Accept a signed Java @{code int} value, and interpret it as-if it was an unsigned value.
+     * In other words, do not interpret the negative bit as "negative", but as part of the unsigned integers value.
+     *
+     * @param value bit value to store in this unsigned integer
+     * @return unsigned integer representation of the passed in value
+     */
+    public static UnsignedInteger representedByBitsOf(int value) {
+        return new UnsignedInteger(value);
+    }
+
+    public static UnsignedInteger valueOf(long value) throws UnsignedOverflowException {
+        if ((value & UnsignedInteger.MASK) != value) {
+            throw new UnsignedOverflowException(String.valueOf(value), UnsignedInteger.class);
+        }
+        return representedByBitsOf((int) value);
+    }
+
+    @Override
+    public int compareTo(UnsignedInteger o) {
+        Objects.requireNonNull(o);
+        return Long.compare(this.value + Long.MIN_VALUE, o.value + Long.MIN_VALUE);
+    }
+
+    /**
+     * Warning, this value is based on the exact bytes interpreted as a signed integer.
+     */
+    @Override
+    public int intValue() {
+        return value;
+    }
+
+    @Override
+    public long longValue() {
+        return 0;
+    }
+
+    @Override
+    public float floatValue() {
+        return longValue(); // rely on standard decimal -> floating point conversion
+    }
+
+    @Override
+    public double doubleValue() {
+        return longValue(); // rely on standard decimal -> floating point conversion
+    }
+
+    public BigInteger bigIntegerValue() {
+        return BigInteger.valueOf(value);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        UnsignedInteger that = (UnsignedInteger) o;
+        return value == that.value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value;
+    }
+}

SwiftKitCore/src/main/java/org/swift/swiftkit/core/primitives/UnsignedNumber.java

@@ -0,0 +1,23 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package org.swift.swiftkit.core.primitives;
+
+import org.swift.swiftkit.core.SwiftValue;
+
+/**
+ * The abstract base class for all unsigned numeric wrapper types offered by SwiftKit.
+ */
+public abstract class UnsignedNumber extends Number {
+}

SwiftKitCore/src/main/java/org/swift/swiftkit/core/primitives/UnsignedOverflowException.java

@@ -0,0 +1,7 @@
+package org.swift.swiftkit.core.primitives;
+
+public class UnsignedOverflowException extends RuntimeException {
+    public UnsignedOverflowException(String value, Class<?> clazz) {
+        super(String.format("Value '%s' cannot be represented as %s as it would overflow!", value, clazz.getName()));
+    }
+}

SwiftKitCore/src/test/java/org/swift/swiftkit/core/primitives/UnsignedIntegerTest.java

@@ -0,0 +1,45 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package org.swift.swiftkit.core.primitives;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UnsignedIntegerTest {
+    @Test
+    public void simpleIntegerValues() {
+        assertEquals(UnsignedInteger.representedByBitsOf(12).intValue(), 12);
+        // signed "max" easily fits in an unsigned integer
+        assertEquals(UnsignedInteger.representedByBitsOf(Integer.MAX_VALUE).intValue(), Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void maxUnsignedIntegerValue() {
+        assertEquals(UnsignedInteger.representedByBitsOf(Integer.MAX_VALUE).intValue(), Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void outOfRangeLongValue() {
+        var exception = assertThrows(Exception.class, () -> UnsignedInteger.valueOf(2^42).intValue());
+        assertTrue(exception.getMessage() instanceof UnsignedOverflowException);
+    }
+
+    @Test
+    public void valueRoundTrip() {
+        int input = 129;
+        assertEquals(UnsignedInteger.representedByBitsOf(input).intValue(), input);
+    }
+}