@@ -46,12 +46,12 @@ struct JNIOptionalTests {
4646 * public func optionalSugar(_ arg: Int64?) -> Int32?
4747 * }
4848 */
49- public static OptionalInt optionalSugar(OptionalLong arg) {
50- long combined$ = SwiftModule.$optionalSugar((byte) (arg.isPresent() ? 1 : 0), arg.orElse(0L));
51- byte discriminator$ = (byte) (combined$ & 0xFF);
52- int value$ = (int) (combined$ >> 32);
53- return discriminator$ == 1 ? OptionalInt.of(value$) : OptionalInt.empty();
54- }
49+ public static OptionalInt optionalSugar(OptionalLong arg) {
50+ long combined$ = SwiftModule.$optionalSugar((byte) (arg.isPresent() ? 1 : 0), arg.orElse(0L));
51+ byte discriminator$ = (byte) (combined$ & 0xFF);
52+ int value$ = (int) (combined$ >> 32);
53+ return discriminator$ == 1 ? OptionalInt.of(value$) : OptionalInt.empty();
54+ }
5555 """ ,
5656 """
5757 private static native long $optionalSugar(byte arg_discriminator, long arg_value);
@@ -92,16 +92,16 @@ struct JNIOptionalTests {
9292 expectedChunks: [
9393 """
9494 /**
95- * Downcall to Swift:
96- * {@snippet lang=swift :
97- * public func optionalExplicit(_ arg: Optional<String>) -> Optional<String>
98- * }
99- */
100- public static Optional<String> optionalExplicit(Optional<String> arg) {
101- byte[] result_discriminator$ = new byte[1];
102- java.lang.String result$ = SwiftModule.$optionalExplicit((byte) (arg.isPresent() ? 1 : 0), arg.orElse(null), result_discriminator$);
103- return (result_discriminator$[0] == 1) ? Optional.of(result$) : Optional.empty();
104- }
95+ * Downcall to Swift:
96+ * {@snippet lang=swift :
97+ * public func optionalExplicit(_ arg: Optional<String>) -> Optional<String>
98+ * }
99+ */
100+ public static Optional<String> optionalExplicit(Optional<String> arg) {
101+ byte[] result_discriminator$ = new byte[1];
102+ java.lang.String result$ = SwiftModule.$optionalExplicit((byte) (arg.isPresent() ? 1 : 0), arg.orElse(null), result_discriminator$);
103+ return (result_discriminator$[0] == 1) ? Optional.of(result$) : Optional.empty();
104+ }
105105 """ ,
106106 """
107107 private static native java.lang.String $optionalExplicit(byte arg_discriminator, java.lang.String arg_value, byte[] result_discriminator$);
@@ -150,16 +150,16 @@ struct JNIOptionalTests {
150150 expectedChunks: [
151151 """
152152 /**
153- * Downcall to Swift:
154- * {@snippet lang=swift :
155- * public func optionalClass(_ arg: MyClass?) -> MyClass?
156- * }
157- */
158- public static Optional<MyClass> optionalClass(Optional<MyClass> arg, SwiftArena swiftArena$) {
159- byte[] result_discriminator$ = new byte[1];
160- long result$ = SwiftModule.$optionalClass(arg.map(MyClass::$memoryAddress).orElse(0L), result_discriminator$);
161- return (result_discriminator$[0] == 1) ? Optional.of(new MyClass(result$, swiftArena$)) : Optional.empty();
162- }
153+ * Downcall to Swift:
154+ * {@snippet lang=swift :
155+ * public func optionalClass(_ arg: MyClass?) -> MyClass?
156+ * }
157+ */
158+ public static Optional<MyClass> optionalClass(Optional<MyClass> arg, SwiftArena swiftArena$) {
159+ byte[] result_discriminator$ = new byte[1];
160+ long result$ = SwiftModule.$optionalClass(arg.map(MyClass::$memoryAddress).orElse(0L), result_discriminator$);
161+ return (result_discriminator$[0] == 1) ? Optional.of(new MyClass(result$, swiftArena$)) : Optional.empty();
162+ }
163163 """ ,
164164 """
165165 private static native long $optionalClass(long arg, byte[] result_discriminator$);
@@ -213,14 +213,14 @@ struct JNIOptionalTests {
213213 expectedChunks: [
214214 """
215215 /**
216- * Downcall to Swift:
217- * {@snippet lang=swift :
218- * public func optionalJavaKitClass(_ arg: JavaLong?)
219- * }
220- */
221- public static void optionalJavaKitClass(Optional<java.lang.Long> arg) {
222- SwiftModule.$optionalJavaKitClass(arg.orElse(null));
223- }
216+ * Downcall to Swift:
217+ * {@snippet lang=swift :
218+ * public func optionalJavaKitClass(_ arg: JavaLong?)
219+ * }
220+ */
221+ public static void optionalJavaKitClass(Optional<java.lang.Long> arg) {
222+ SwiftModule.$optionalJavaKitClass(arg.orElse(null));
223+ }
224224 """ ,
225225 """
226226 private static native void $optionalJavaKitClass(java.lang.Long arg);
0 commit comments