From 4dcd6f4217523a94f26c33047b4f3b2eee7e50c6 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Thu, 27 Nov 2025 15:08:51 +1100 Subject: [PATCH 1/3] [ffigen] Remove NativeExternalBindings.wrapperName --- .../lib/src/code_generator/library.dart | 2 - .../objc_built_in_functions.dart | 28 +++- .../lib/src/code_generator/objc_protocol.dart | 4 +- .../lib/src/config_provider/config.dart | 18 +- .../lib/src/config_provider/yaml_config.dart | 6 +- pkgs/ffigen/lib/src/context.dart | 1 - .../code_generator_test.dart | 15 -- .../decl_decl_collision_test.dart | 1 - .../decl_symbol_address_collision_test.dart | 1 - .../function_n_struct_test.dart | 1 - .../header_parser_tests/globals_test.dart | 1 - .../test/header_parser_tests/macros_test.dart | 1 - .../nested_parsing_test.dart | 1 - .../unnamed_enums_test.dart | 1 - .../ffigen/test/rename_tests/rename_test.dart | 1 - .../lib/src/c_bindings_generated.dart | 154 +++++++----------- .../lib/src/runtime_bindings_generated.dart | 148 ++++++----------- 17 files changed, 133 insertions(+), 251 deletions(-) diff --git a/pkgs/ffigen/lib/src/code_generator/library.dart b/pkgs/ffigen/lib/src/code_generator/library.dart index 02be9daef..f9e314235 100644 --- a/pkgs/ffigen/lib/src/code_generator/library.dart +++ b/pkgs/ffigen/lib/src/code_generator/library.dart @@ -27,7 +27,6 @@ class Library { required List bindings, required Context context, }) => Library( - name: context.config.wrapperName, description: context.config.wrapperDocComment, bindings: bindings, header: context.config.preamble, @@ -43,7 +42,6 @@ class Library { ); factory Library({ - required String name, String? description, required List bindings, String? header, diff --git a/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart b/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart index e2faa7511..2b0d7f724 100644 --- a/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart +++ b/pkgs/ffigen/lib/src/code_generator/objc_built_in_functions.dart @@ -2,7 +2,10 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'package:path/path.dart' as path; + import '../code_generator.dart'; +import '../config_provider.dart'; import '../context.dart'; import '../visitor/ast.dart'; @@ -14,15 +17,12 @@ import 'writer.dart'; /// Built in functions used by the Objective C bindings. class ObjCBuiltInFunctions { - ObjCBuiltInFunctions( - this.context, - this.wrapperName, - this.generateForPackageObjectiveC, - ); + ObjCBuiltInFunctions(this.context, this.generateForPackageObjectiveC) + : libraryId = _libraryIdFromConfigHash(context.config); final Context context; - final String wrapperName; final bool generateForPackageObjectiveC; + final String libraryId; static const registerName = ObjCImport('registerName'); static const getClass = ObjCImport('getClass'); @@ -149,9 +149,9 @@ class ObjCBuiltInFunctions { ObjCBlockWrapperFuncs? getBlockTrampolines(ObjCBlock block) { final (id, idHash) = _methodSigId(block.returnType, block.params); return _blockTrampolines[id] ??= ObjCBlockWrapperFuncs( - _blockTrampolineFunc('_${wrapperName}_wrapListenerBlock_$idHash'), + _blockTrampolineFunc('_${libraryId}_wrapListenerBlock_$idHash'), _blockTrampolineFunc( - '_${wrapperName}_wrapBlockingBlock_$idHash', + '_${libraryId}_wrapBlockingBlock_$idHash', blocking: true, ), ); @@ -191,7 +191,7 @@ class ObjCBuiltInFunctions { final (id, idHash) = _methodSigId(block.returnType, block.params); return _protocolTrampolines[id] ??= ObjCProtocolMethodTrampoline( Func( - name: '_${wrapperName}_protocolTrampoline_$idHash', + name: '_${libraryId}_protocolTrampoline_$idHash', returnType: block.returnType, parameters: [ Parameter( @@ -215,6 +215,16 @@ class ObjCBuiltInFunctions { final baseType = type.typealiasType; return baseType is ObjCNullable && baseType.child is ObjCInstanceType; } + + // A unique (but not human readable) ID for the generated library based on + // a hash of parts of the config. + static String _libraryIdFromConfigHash(Config config) => fnvHash32( + [ + ...config.entryPoints, + config.output, + config.outputObjC, + ].map((uri) => path.basename(uri.toFilePath())).join('\n'), + ).toRadixString(36); } /// A native trampoline function for a listener block. diff --git a/pkgs/ffigen/lib/src/code_generator/objc_protocol.dart b/pkgs/ffigen/lib/src/code_generator/objc_protocol.dart index dd4cef3fb..66f9d1c39 100644 --- a/pkgs/ffigen/lib/src/code_generator/objc_protocol.dart +++ b/pkgs/ffigen/lib/src/code_generator/objc_protocol.dart @@ -329,11 +329,11 @@ ${generateInstanceMethodBindings(w, this)} BindingString? toObjCBindingString(Writer w) { if (generateAsStub) return null; - final wrapName = context.objCBuiltInFunctions.wrapperName; + final libraryId = context.objCBuiltInFunctions.libraryId; final mainString = ''' -Protocol* _${wrapName}_$originalName(void) { return @protocol($originalName); } +Protocol* _${libraryId}_$originalName(void) { return @protocol($originalName); } '''; return BindingString( diff --git a/pkgs/ffigen/lib/src/config_provider/config.dart b/pkgs/ffigen/lib/src/config_provider/config.dart index 11e713613..a57f9344f 100644 --- a/pkgs/ffigen/lib/src/config_provider/config.dart +++ b/pkgs/ffigen/lib/src/config_provider/config.dart @@ -709,16 +709,7 @@ final class NativeExternalBindings implements BindingStyle { /// If omitted, it will not be generated. final String? assetId; - /// The prefix for the generated Objective-C functions. - // TODO(https://github.com/dart-lang/native/issues/2580): Remove this. - @Deprecated('Will be replaced by a hash.') - final String wrapperName; - - const NativeExternalBindings({ - this.assetId, - @Deprecated('Will be replaced by a hash.') - this.wrapperName = 'NativeLibrary', - }); + const NativeExternalBindings({this.assetId}); } /// Generate bindings which take a [DynamicLibrary] or [DynamicLibrary.lookup] @@ -764,11 +755,8 @@ extension type Config(FfiGenerator ffiGen) implements FfiGenerator { bool get useDartHandle => ffiGen.useDartHandle; // ignore: deprecated_member_use_from_same_package Map get importedTypesByUsr => ffiGen.importedTypesByUsr; - String get wrapperName => switch (ffiGen.output.style) { - final DynamicLibraryBindings e => e.wrapperName, - // ignore: deprecated_member_use_from_same_package - final NativeExternalBindings e => e.wrapperName, - }; + String get wrapperName => + (ffiGen.output.style as DynamicLibraryBindings).wrapperName; String? get wrapperDocComment => switch (ffiGen.output.style) { final DynamicLibraryBindings e => e.wrapperDocComment, diff --git a/pkgs/ffigen/lib/src/config_provider/yaml_config.dart b/pkgs/ffigen/lib/src/config_provider/yaml_config.dart index b61249b82..a5a023617 100644 --- a/pkgs/ffigen/lib/src/config_provider/yaml_config.dart +++ b/pkgs/ffigen/lib/src/config_provider/yaml_config.dart @@ -1252,11 +1252,7 @@ final class YamlConfig { preamble: preamble, format: formatOutput, style: ffiNativeConfig.enabled - ? NativeExternalBindings( - assetId: ffiNativeConfig.assetId, - // ignore: deprecated_member_use_from_same_package - wrapperName: wrapperName, - ) + ? NativeExternalBindings(assetId: ffiNativeConfig.assetId) : DynamicLibraryBindings( wrapperName: wrapperName, wrapperDocComment: wrapperDocComment, diff --git a/pkgs/ffigen/lib/src/context.dart b/pkgs/ffigen/lib/src/context.dart index 4ca5e1e06..22d996f82 100644 --- a/pkgs/ffigen/lib/src/context.dart +++ b/pkgs/ffigen/lib/src/context.dart @@ -36,7 +36,6 @@ class Context { cursorIndex = CursorIndex(logger) { objCBuiltInFunctions = ObjCBuiltInFunctions( this, - config.wrapperName, // ignore: deprecated_member_use_from_same_package generator.objectiveC?.generateForPackageObjectiveC ?? false, ); diff --git a/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart b/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart index 2d27b7149..2a993d1e2 100644 --- a/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart +++ b/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart @@ -59,7 +59,6 @@ void main() { ); final library = Library( context: nativeContext, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ Func( @@ -131,7 +130,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ Struct( @@ -218,7 +216,6 @@ void main() { ); final library = Library( context: context, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ structSome, @@ -259,7 +256,6 @@ void main() { final library = Library( context: nativeContext, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ Global( @@ -304,7 +300,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', bindings: transformBindings([ MacroConstant(name: 'test1', rawType: 'int', rawValue: '20'), @@ -318,7 +313,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', bindings: transformBindings([ EnumClass( @@ -339,7 +333,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', bindings: transformBindings([ EnumClass( @@ -392,7 +385,6 @@ void main() { ); final library = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', silenceEnumWarning: true, bindings: transformBindings([ @@ -477,7 +469,6 @@ void main() { ); final lib = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', silenceEnumWarning: true, bindings: transformBindings([ @@ -502,7 +493,6 @@ void main() { ); final library = Library( context: context, - name: 'init_dylib', header: '$licenseHeader\n// ignore_for_file: unused_element\n', bindings: transformBindings([ Func( @@ -558,7 +548,6 @@ void main() { ); final library = Library( context: context, - name: 'init_dylib', header: '$licenseHeader\n', bindings: transformBindings([ Func( @@ -583,7 +572,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ Func( @@ -612,7 +600,6 @@ void main() { final context = makeContext(); final library = Library( context: context, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ Struct( @@ -700,7 +687,6 @@ void main() { ); final library = Library( context: context, - name: 'Bindings', header: licenseHeader, bindings: transformBindings([ struct1, @@ -766,7 +752,6 @@ void main() { final struct3Typealias = Typealias(name: 'Struct3Typealias', type: struct3); final library = Library( context: context, - name: 'Bindings', header: '$licenseHeader\n', bindings: transformBindings([ Typealias( diff --git a/pkgs/ffigen/test/collision_tests/decl_decl_collision_test.dart b/pkgs/ffigen/test/collision_tests/decl_decl_collision_test.dart index e7d32ada6..12404a295 100644 --- a/pkgs/ffigen/test/collision_tests/decl_decl_collision_test.dart +++ b/pkgs/ffigen/test/collision_tests/decl_decl_collision_test.dart @@ -27,7 +27,6 @@ void main() { ); final library = Library( context: context, - name: 'Bindings', bindings: transformBindings([ Struct(context: context, name: 'TestStruct'), Struct(context: context, name: 'TestStruct'), diff --git a/pkgs/ffigen/test/collision_tests/decl_symbol_address_collision_test.dart b/pkgs/ffigen/test/collision_tests/decl_symbol_address_collision_test.dart index 28bf8f90e..40fd09797 100644 --- a/pkgs/ffigen/test/collision_tests/decl_symbol_address_collision_test.dart +++ b/pkgs/ffigen/test/collision_tests/decl_symbol_address_collision_test.dart @@ -29,7 +29,6 @@ void main() { ); actual = Library( context: context, - name: 'Bindings', header: '// ignore_for_file: unused_element\n', bindings: transformBindings([ Struct(context: context, name: 'addresses'), diff --git a/pkgs/ffigen/test/header_parser_tests/function_n_struct_test.dart b/pkgs/ffigen/test/header_parser_tests/function_n_struct_test.dart index e1401eacf..5ec728234 100644 --- a/pkgs/ffigen/test/header_parser_tests/function_n_struct_test.dart +++ b/pkgs/ffigen/test/header_parser_tests/function_n_struct_test.dart @@ -109,7 +109,6 @@ Library expectedLibrary() { final struct3 = Struct(context: context, name: 'Struct3'); return Library( context: context, - name: 'Bindings', bindings: parser.transformBindings([ struct1, struct2, diff --git a/pkgs/ffigen/test/header_parser_tests/globals_test.dart b/pkgs/ffigen/test/header_parser_tests/globals_test.dart index ee5d0160c..df8a61b0b 100644 --- a/pkgs/ffigen/test/header_parser_tests/globals_test.dart +++ b/pkgs/ffigen/test/header_parser_tests/globals_test.dart @@ -112,7 +112,6 @@ Library expectedLibrary() { ); return Library( context: context, - name: 'Bindings', bindings: parser.transformBindings([ Global(type: BooleanType(), name: 'coolGlobal'), Global( diff --git a/pkgs/ffigen/test/header_parser_tests/macros_test.dart b/pkgs/ffigen/test/header_parser_tests/macros_test.dart index 9640ff4de..4aab708d8 100644 --- a/pkgs/ffigen/test/header_parser_tests/macros_test.dart +++ b/pkgs/ffigen/test/header_parser_tests/macros_test.dart @@ -147,7 +147,6 @@ void main() { Library expectedLibrary() { return Library( context: testContext(), - name: 'NativeLibrary', bindings: [ Constant(name: 'TEST1', rawType: 'double', rawValue: '1.1'), Constant(name: 'TEST2', rawType: 'int', rawValue: '10'), diff --git a/pkgs/ffigen/test/header_parser_tests/nested_parsing_test.dart b/pkgs/ffigen/test/header_parser_tests/nested_parsing_test.dart index 560978f0c..9d5ab30b7 100644 --- a/pkgs/ffigen/test/header_parser_tests/nested_parsing_test.dart +++ b/pkgs/ffigen/test/header_parser_tests/nested_parsing_test.dart @@ -109,7 +109,6 @@ Library expectedLibrary() { ); return Library( context: context, - name: 'Bindings', bindings: [ unnamedInternalStruct, unnamedUnion1, diff --git a/pkgs/ffigen/test/header_parser_tests/unnamed_enums_test.dart b/pkgs/ffigen/test/header_parser_tests/unnamed_enums_test.dart index 623a45c97..7cdba854b 100644 --- a/pkgs/ffigen/test/header_parser_tests/unnamed_enums_test.dart +++ b/pkgs/ffigen/test/header_parser_tests/unnamed_enums_test.dart @@ -64,7 +64,6 @@ ${strings.unnamedEnums}: Library expectedLibrary() { return Library( context: testContext(), - name: 'Bindings', bindings: [ Constant(name: 'A', rawType: 'int', rawValue: '1'), Constant(name: 'C', rawType: 'int', rawValue: '3'), diff --git a/pkgs/ffigen/test/rename_tests/rename_test.dart b/pkgs/ffigen/test/rename_tests/rename_test.dart index 372ccc96c..e23ec4bcd 100644 --- a/pkgs/ffigen/test/rename_tests/rename_test.dart +++ b/pkgs/ffigen/test/rename_tests/rename_test.dart @@ -209,7 +209,6 @@ Library expectedLibrary() { ); return Library( context: context, - name: 'Bindings', bindings: [ Func( name: '${functionPrefix}func1', diff --git a/pkgs/objective_c/lib/src/c_bindings_generated.dart b/pkgs/objective_c/lib/src/c_bindings_generated.dart index 1e4dabcc1..940c9e887 100644 --- a/pkgs/objective_c/lib/src/c_bindings_generated.dart +++ b/pkgs/objective_c/lib/src/c_bindings_generated.dart @@ -8,151 +8,106 @@ // coverage:ignore-file // AUTO GENERATED FILE, DO NOT EDIT. -// +// // Generated by `package:ffigen`. // ignore_for_file: type=lint, unused_import @ffi.DefaultAsset('package:objective_c/objective_c.dylib') library; import 'dart:ffi' as ffi; +@ffi.Native )>(symbol: 'DOBJC_awaitWaiter') +external void awaitWaiter(ffi.Pointer waiter, +); + +@ffi.Native(symbol: 'DOBJC_deleteFinalizableHandle') +external void deleteFinalizableHandle(Dart_FinalizableHandle handle, +Object owner, +); -@ffi.Native)>( - symbol: 'DOBJC_awaitWaiter', -) -external void awaitWaiter(ffi.Pointer waiter); - -@ffi.Native( - symbol: 'DOBJC_deleteFinalizableHandle', -) -external void deleteFinalizableHandle( - Dart_FinalizableHandle handle, - Object owner, +@ffi.Native )>(symbol: 'DOBJC_disposeObjCBlockWithClosure') +external void disposeObjCBlockWithClosure(ffi.Pointer block, ); -@ffi.Native)>( - symbol: 'DOBJC_disposeObjCBlockWithClosure', -) -external void disposeObjCBlockWithClosure(ffi.Pointer block); - -@ffi.Native Function(ffi.Pointer)>( - symbol: 'DOBJC_fillContext', - isLeaf: true, -) -external ffi.Pointer fillContext( - ffi.Pointer context, +@ffi.Native Function(ffi.Pointer )>(symbol: 'DOBJC_fillContext', isLeaf: true) +external ffi.Pointer fillContext(ffi.Pointer context, ); /// Returns the MacOS/iOS version we're running on. @ffi.Native<_Version Function()>(symbol: 'DOBJC_getOsVesion', isLeaf: true) external _Version getOsVesion(); -@ffi.Native)>( - symbol: 'DOBJC_initializeApi', - isLeaf: true, -) -external int initializeApi(ffi.Pointer data); - -@ffi.Native)>( - symbol: 'DOBJC_isValidBlock', - isLeaf: true, -) -external bool isValidBlock(ffi.Pointer block); - -@ffi.Native Function(ffi.Handle)>( - symbol: 'DOBJC_newFinalizableBool', -) -external ffi.Pointer newFinalizableBool(Object owner); - -@ffi.Native< - Dart_FinalizableHandle Function(ffi.Handle, ffi.Pointer) ->(symbol: 'DOBJC_newFinalizableHandle') -external Dart_FinalizableHandle newFinalizableHandle( - Object owner, - ffi.Pointer object, +@ffi.Native )>(symbol: 'DOBJC_initializeApi', isLeaf: true) +external int initializeApi(ffi.Pointer data, +); + +@ffi.Native )>(symbol: 'DOBJC_isValidBlock', isLeaf: true) +external bool isValidBlock(ffi.Pointer block, +); + +@ffi.Native Function(ffi.Handle )>(symbol: 'DOBJC_newFinalizableBool') +external ffi.Pointer newFinalizableBool(Object owner, +); + +@ffi.Native )>(symbol: 'DOBJC_newFinalizableHandle') +external Dart_FinalizableHandle newFinalizableHandle(Object owner, +ffi.Pointer object, ); -@ffi.Native Function()>( - symbol: 'DOBJC_newWaiter', - isLeaf: true, -) +@ffi.Native Function()>(symbol: 'DOBJC_newWaiter', isLeaf: true) external ffi.Pointer newWaiter(); -@ffi.Native< - ffi.Void Function( - ffi.Pointer)>>, - ffi.Pointer, - ) ->(symbol: 'DOBJC_runOnMainThread', isLeaf: true) -external void runOnMainThread( - ffi.Pointer)>> fn, - ffi.Pointer arg, +@ffi.Native )>> , ffi.Pointer )>(symbol: 'DOBJC_runOnMainThread', isLeaf: true) +external void runOnMainThread(ffi.Pointer )>> fn, +ffi.Pointer arg, ); -@ffi.Native)>( - symbol: 'DOBJC_signalWaiter', - isLeaf: true, -) -external void signalWaiter(ffi.Pointer waiter); +@ffi.Native )>(symbol: 'DOBJC_signalWaiter', isLeaf: true) +external void signalWaiter(ffi.Pointer waiter, +); -final class DOBJC_Context extends ffi.Struct { +final class DOBJC_Context extends ffi.Struct{ @ffi.Int64() external int version; - external ffi.Pointer Function()>> - newWaiter$1; + external ffi.Pointer Function()>> newWaiter$1; - external ffi.Pointer< - ffi.NativeFunction)> - > - awaitWaiter$1; + external ffi.Pointer )>> awaitWaiter$1; - external ffi.Pointer< - ffi.NativeFunction Function()> - > - currentIsolate; + external ffi.Pointer Function()>> currentIsolate; - external ffi.Pointer< - ffi.NativeFunction)> - > - enterIsolate; + external ffi.Pointer )>> enterIsolate; external ffi.Pointer> exitIsolate; external ffi.Pointer> getMainPortId; - external ffi.Pointer> - getCurrentThreadOwnsIsolate; + external ffi.Pointer> getCurrentThreadOwnsIsolate; + } typedef Dart_FinalizableHandle = ffi.Pointer; +final class Dart_FinalizableHandle_ extends ffi.Opaque{ +} -final class Dart_FinalizableHandle_ extends ffi.Opaque {} const int ILLEGAL_PORT = 0; -final class ObjCBlockDesc extends ffi.Struct { +final class ObjCBlockDesc extends ffi.Struct{ @ffi.UnsignedLong() external int reserved; @ffi.UnsignedLong() external int size; - external ffi.Pointer< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer dst, ffi.Pointer src) - > - > - copy_helper; + external ffi.Pointer dst, ffi.Pointer src)>> copy_helper; - external ffi.Pointer< - ffi.NativeFunction src)> - > - dispose_helper; + external ffi.Pointer src)>> dispose_helper; external ffi.Pointer signature; + } -final class ObjCBlockImpl extends ffi.Struct { +final class ObjCBlockImpl extends ffi.Struct{ external ffi.Pointer isa; @ffi.Int() @@ -169,13 +124,16 @@ final class ObjCBlockImpl extends ffi.Struct { @ffi.Int64() external int dispose_port; + } -final class ObjCObjectImpl extends ffi.Opaque {} +final class ObjCObjectImpl extends ffi.Opaque{ +} -final class _Dart_Isolate extends ffi.Opaque {} +final class _Dart_Isolate extends ffi.Opaque{ +} -final class _Version extends ffi.Struct { +final class _Version extends ffi.Struct{ @ffi.Int() external int major; @@ -184,4 +142,6 @@ final class _Version extends ffi.Struct { @ffi.Int() external int patch; + } + diff --git a/pkgs/objective_c/lib/src/runtime_bindings_generated.dart b/pkgs/objective_c/lib/src/runtime_bindings_generated.dart index 67cdf86eb..ffdb9dea8 100644 --- a/pkgs/objective_c/lib/src/runtime_bindings_generated.dart +++ b/pkgs/objective_c/lib/src/runtime_bindings_generated.dart @@ -12,19 +12,16 @@ // coverage:ignore-file // AUTO GENERATED FILE, DO NOT EDIT. -// +// // Generated by `package:ffigen`. // ignore_for_file: type=lint, unused_import import 'dart:ffi' as ffi; - @ffi.Array.multi([32]) @ffi.Native>>(symbol: '_NSConcreteAutoBlock') external ffi.Array> NSConcreteAutoBlock; @ffi.Array.multi([32]) -@ffi.Native>>( - symbol: '_NSConcreteFinalizingBlock', -) +@ffi.Native>>(symbol: '_NSConcreteFinalizingBlock') external ffi.Array> NSConcreteFinalizingBlock; @ffi.Array.multi([32]) @@ -57,82 +54,46 @@ external ffi.Pointer NSKeyValueChangeOldKey; @ffi.Native>() external ffi.Pointer NSLocalizedDescriptionKey; -@ffi.Native)>( - symbol: 'objc_autoreleasePoolPop', - isLeaf: true, -) -external void autoreleasePoolPop(ffi.Pointer pool); +@ffi.Native )>(symbol: 'objc_autoreleasePoolPop', isLeaf: true) +external void autoreleasePoolPop(ffi.Pointer pool, +); -@ffi.Native Function()>( - symbol: 'objc_autoreleasePoolPush', - isLeaf: true, -) +@ffi.Native Function()>(symbol: 'objc_autoreleasePoolPush', isLeaf: true) external ffi.Pointer autoreleasePoolPush(); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'objc_retainBlock', - isLeaf: true, -) -external ffi.Pointer blockRetain( - ffi.Pointer object, +@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_retainBlock', isLeaf: true) +external ffi.Pointer blockRetain(ffi.Pointer object, +); + +@ffi.Native> Function(ffi.Pointer )>(symbol: 'objc_copyClassList', isLeaf: true) +external ffi.Pointer> copyClassList(ffi.Pointer count, +); + +@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_getClass', isLeaf: true) +external ffi.Pointer getClass(ffi.Pointer name, +); + +@ffi.Native , ffi.Pointer , ffi.Bool , ffi.Bool )>(symbol: 'protocol_getMethodDescription', isLeaf: true) +external ObjCMethodDesc getMethodDescription(ffi.Pointer protocol, +ffi.Pointer sel, +bool isRequiredMethod, +bool isInstanceMethod, ); -@ffi.Native< - ffi.Pointer> Function( - ffi.Pointer, - ) ->(symbol: 'objc_copyClassList', isLeaf: true) -external ffi.Pointer> copyClassList( - ffi.Pointer count, +@ffi.Native Function(ffi.Pointer )>(symbol: 'sel_getName', isLeaf: true) +external ffi.Pointer getName(ffi.Pointer sel, ); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'objc_getClass', - isLeaf: true, -) -external ffi.Pointer getClass(ffi.Pointer name); - -@ffi.Native< - ObjCMethodDesc Function( - ffi.Pointer, - ffi.Pointer, - ffi.Bool, - ffi.Bool, - ) ->(symbol: 'protocol_getMethodDescription', isLeaf: true) -external ObjCMethodDesc getMethodDescription( - ffi.Pointer protocol, - ffi.Pointer sel, - bool isRequiredMethod, - bool isInstanceMethod, +@ffi.Native Function(ffi.Pointer )>(symbol: 'object_getClass', isLeaf: true) +external ffi.Pointer getObjectClass(ffi.Pointer object, ); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'sel_getName', - isLeaf: true, -) -external ffi.Pointer getName(ffi.Pointer sel); - -@ffi.Native Function(ffi.Pointer)>( - symbol: 'object_getClass', - isLeaf: true, -) -external ffi.Pointer getObjectClass( - ffi.Pointer object, +@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_getProtocol', isLeaf: true) +external ffi.Pointer getProtocol(ffi.Pointer name, ); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'objc_getProtocol', - isLeaf: true, -) -external ffi.Pointer getProtocol(ffi.Pointer name); - -@ffi.Native Function(ffi.Pointer)>( - symbol: 'protocol_getName', - isLeaf: true, -) -external ffi.Pointer getProtocolName( - ffi.Pointer proto, +@ffi.Native Function(ffi.Pointer )>(symbol: 'protocol_getName', isLeaf: true) +external ffi.Pointer getProtocolName(ffi.Pointer proto, ); @ffi.Native(symbol: 'objc_msgSend') @@ -144,42 +105,35 @@ external void msgSendFpret(); @ffi.Native(symbol: 'objc_msgSend_stret') external void msgSendStret(); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'objc_autorelease', - isLeaf: true, -) -external ffi.Pointer objectAutorelease( - ffi.Pointer object, +@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_autorelease', isLeaf: true) +external ffi.Pointer objectAutorelease(ffi.Pointer object, ); -@ffi.Native)>( - symbol: 'objc_release', - isLeaf: true, -) -external void objectRelease(ffi.Pointer object); - -@ffi.Native Function(ffi.Pointer)>( - symbol: 'objc_retain', - isLeaf: true, -) -external ffi.Pointer objectRetain( - ffi.Pointer object, +@ffi.Native )>(symbol: 'objc_release', isLeaf: true) +external void objectRelease(ffi.Pointer object, ); -@ffi.Native Function(ffi.Pointer)>( - symbol: 'sel_registerName', - isLeaf: true, -) -external ffi.Pointer registerName(ffi.Pointer name); +@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_retain', isLeaf: true) +external ffi.Pointer objectRetain(ffi.Pointer object, +); + +@ffi.Native Function(ffi.Pointer )>(symbol: 'sel_registerName', isLeaf: true) +external ffi.Pointer registerName(ffi.Pointer name, +); -final class ObjCMethodDesc extends ffi.Struct { +final class ObjCMethodDesc extends ffi.Struct{ external ffi.Pointer name; external ffi.Pointer types; + } -final class ObjCObjectImpl extends ffi.Opaque {} +final class ObjCObjectImpl extends ffi.Opaque{ +} + +final class ObjCProtocolImpl extends ffi.Opaque{ +} -final class ObjCProtocolImpl extends ffi.Opaque {} +final class ObjCSelector extends ffi.Opaque{ +} -final class ObjCSelector extends ffi.Opaque {} From 85a9eb55e423dae7d777ef236822914fbb31d403 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Thu, 27 Nov 2025 15:16:02 +1100 Subject: [PATCH 2/3] Fix objc and swiftgen --- .../lib/src/c_bindings_generated.dart | 154 +++++---- .../src/objective_c_bindings_generated.dart | 312 ++++++++---------- .../lib/src/runtime_bindings_generated.dart | 148 ++++++--- .../src/objective_c_bindings_generated.m | 130 ++++---- pkgs/swiftgen/lib/src/generator.dart | 6 +- 5 files changed, 395 insertions(+), 355 deletions(-) diff --git a/pkgs/objective_c/lib/src/c_bindings_generated.dart b/pkgs/objective_c/lib/src/c_bindings_generated.dart index 940c9e887..1e4dabcc1 100644 --- a/pkgs/objective_c/lib/src/c_bindings_generated.dart +++ b/pkgs/objective_c/lib/src/c_bindings_generated.dart @@ -8,106 +8,151 @@ // coverage:ignore-file // AUTO GENERATED FILE, DO NOT EDIT. -// +// // Generated by `package:ffigen`. // ignore_for_file: type=lint, unused_import @ffi.DefaultAsset('package:objective_c/objective_c.dylib') library; import 'dart:ffi' as ffi; -@ffi.Native )>(symbol: 'DOBJC_awaitWaiter') -external void awaitWaiter(ffi.Pointer waiter, -); - -@ffi.Native(symbol: 'DOBJC_deleteFinalizableHandle') -external void deleteFinalizableHandle(Dart_FinalizableHandle handle, -Object owner, -); -@ffi.Native )>(symbol: 'DOBJC_disposeObjCBlockWithClosure') -external void disposeObjCBlockWithClosure(ffi.Pointer block, +@ffi.Native)>( + symbol: 'DOBJC_awaitWaiter', +) +external void awaitWaiter(ffi.Pointer waiter); + +@ffi.Native( + symbol: 'DOBJC_deleteFinalizableHandle', +) +external void deleteFinalizableHandle( + Dart_FinalizableHandle handle, + Object owner, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'DOBJC_fillContext', isLeaf: true) -external ffi.Pointer fillContext(ffi.Pointer context, +@ffi.Native)>( + symbol: 'DOBJC_disposeObjCBlockWithClosure', +) +external void disposeObjCBlockWithClosure(ffi.Pointer block); + +@ffi.Native Function(ffi.Pointer)>( + symbol: 'DOBJC_fillContext', + isLeaf: true, +) +external ffi.Pointer fillContext( + ffi.Pointer context, ); /// Returns the MacOS/iOS version we're running on. @ffi.Native<_Version Function()>(symbol: 'DOBJC_getOsVesion', isLeaf: true) external _Version getOsVesion(); -@ffi.Native )>(symbol: 'DOBJC_initializeApi', isLeaf: true) -external int initializeApi(ffi.Pointer data, -); - -@ffi.Native )>(symbol: 'DOBJC_isValidBlock', isLeaf: true) -external bool isValidBlock(ffi.Pointer block, -); - -@ffi.Native Function(ffi.Handle )>(symbol: 'DOBJC_newFinalizableBool') -external ffi.Pointer newFinalizableBool(Object owner, -); - -@ffi.Native )>(symbol: 'DOBJC_newFinalizableHandle') -external Dart_FinalizableHandle newFinalizableHandle(Object owner, -ffi.Pointer object, +@ffi.Native)>( + symbol: 'DOBJC_initializeApi', + isLeaf: true, +) +external int initializeApi(ffi.Pointer data); + +@ffi.Native)>( + symbol: 'DOBJC_isValidBlock', + isLeaf: true, +) +external bool isValidBlock(ffi.Pointer block); + +@ffi.Native Function(ffi.Handle)>( + symbol: 'DOBJC_newFinalizableBool', +) +external ffi.Pointer newFinalizableBool(Object owner); + +@ffi.Native< + Dart_FinalizableHandle Function(ffi.Handle, ffi.Pointer) +>(symbol: 'DOBJC_newFinalizableHandle') +external Dart_FinalizableHandle newFinalizableHandle( + Object owner, + ffi.Pointer object, ); -@ffi.Native Function()>(symbol: 'DOBJC_newWaiter', isLeaf: true) +@ffi.Native Function()>( + symbol: 'DOBJC_newWaiter', + isLeaf: true, +) external ffi.Pointer newWaiter(); -@ffi.Native )>> , ffi.Pointer )>(symbol: 'DOBJC_runOnMainThread', isLeaf: true) -external void runOnMainThread(ffi.Pointer )>> fn, -ffi.Pointer arg, +@ffi.Native< + ffi.Void Function( + ffi.Pointer)>>, + ffi.Pointer, + ) +>(symbol: 'DOBJC_runOnMainThread', isLeaf: true) +external void runOnMainThread( + ffi.Pointer)>> fn, + ffi.Pointer arg, ); -@ffi.Native )>(symbol: 'DOBJC_signalWaiter', isLeaf: true) -external void signalWaiter(ffi.Pointer waiter, -); +@ffi.Native)>( + symbol: 'DOBJC_signalWaiter', + isLeaf: true, +) +external void signalWaiter(ffi.Pointer waiter); -final class DOBJC_Context extends ffi.Struct{ +final class DOBJC_Context extends ffi.Struct { @ffi.Int64() external int version; - external ffi.Pointer Function()>> newWaiter$1; + external ffi.Pointer Function()>> + newWaiter$1; - external ffi.Pointer )>> awaitWaiter$1; + external ffi.Pointer< + ffi.NativeFunction)> + > + awaitWaiter$1; - external ffi.Pointer Function()>> currentIsolate; + external ffi.Pointer< + ffi.NativeFunction Function()> + > + currentIsolate; - external ffi.Pointer )>> enterIsolate; + external ffi.Pointer< + ffi.NativeFunction)> + > + enterIsolate; external ffi.Pointer> exitIsolate; external ffi.Pointer> getMainPortId; - external ffi.Pointer> getCurrentThreadOwnsIsolate; - + external ffi.Pointer> + getCurrentThreadOwnsIsolate; } typedef Dart_FinalizableHandle = ffi.Pointer; -final class Dart_FinalizableHandle_ extends ffi.Opaque{ -} +final class Dart_FinalizableHandle_ extends ffi.Opaque {} const int ILLEGAL_PORT = 0; -final class ObjCBlockDesc extends ffi.Struct{ +final class ObjCBlockDesc extends ffi.Struct { @ffi.UnsignedLong() external int reserved; @ffi.UnsignedLong() external int size; - external ffi.Pointer dst, ffi.Pointer src)>> copy_helper; + external ffi.Pointer< + ffi.NativeFunction< + ffi.Void Function(ffi.Pointer dst, ffi.Pointer src) + > + > + copy_helper; - external ffi.Pointer src)>> dispose_helper; + external ffi.Pointer< + ffi.NativeFunction src)> + > + dispose_helper; external ffi.Pointer signature; - } -final class ObjCBlockImpl extends ffi.Struct{ +final class ObjCBlockImpl extends ffi.Struct { external ffi.Pointer isa; @ffi.Int() @@ -124,16 +169,13 @@ final class ObjCBlockImpl extends ffi.Struct{ @ffi.Int64() external int dispose_port; - } -final class ObjCObjectImpl extends ffi.Opaque{ -} +final class ObjCObjectImpl extends ffi.Opaque {} -final class _Dart_Isolate extends ffi.Opaque{ -} +final class _Dart_Isolate extends ffi.Opaque {} -final class _Version extends ffi.Struct{ +final class _Version extends ffi.Struct { @ffi.Int() external int major; @@ -142,6 +184,4 @@ final class _Version extends ffi.Struct{ @ffi.Int() external int patch; - } - diff --git a/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart b/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart index 24f36708b..37d56e5a3 100644 --- a/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart +++ b/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart @@ -27,7 +27,7 @@ import 'package:ffi/ffi.dart' as pkg_ffi; ffi.UnsignedLong, ) >() -external int _ObjectiveCBindings_protocolTrampoline_17ap02x( +external int _1wx624s_protocolTrampoline_17ap02x( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -42,8 +42,7 @@ external int _ObjectiveCBindings_protocolTrampoline_17ap02x( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_18nsem0( +external ffi.Pointer _1wx624s_protocolTrampoline_18nsem0( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -56,7 +55,7 @@ _ObjectiveCBindings_protocolTrampoline_18nsem0( ffi.Pointer, ) >() -external void _ObjectiveCBindings_protocolTrampoline_18v1jvf( +external void _1wx624s_protocolTrampoline_18v1jvf( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -68,7 +67,7 @@ external void _ObjectiveCBindings_protocolTrampoline_18v1jvf( ffi.Pointer, ) >() -external ffi.Pointer _ObjectiveCBindings_protocolTrampoline_1a8cl66( +external ffi.Pointer _1wx624s_protocolTrampoline_1a8cl66( ffi.Pointer target, ffi.Pointer arg0, ); @@ -79,7 +78,7 @@ external ffi.Pointer _ObjectiveCBindings_protocolTrampoline_1a8cl66( ffi.Pointer, ) >() -external int _ObjectiveCBindings_protocolTrampoline_1ckyi24( +external int _1wx624s_protocolTrampoline_1ckyi24( ffi.Pointer target, ffi.Pointer arg0, ); @@ -91,7 +90,7 @@ external int _ObjectiveCBindings_protocolTrampoline_1ckyi24( ffi.Pointer, ) >() -external int _ObjectiveCBindings_protocolTrampoline_1ldqghh( +external int _1wx624s_protocolTrampoline_1ldqghh( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -103,8 +102,7 @@ external int _ObjectiveCBindings_protocolTrampoline_1ldqghh( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_1mbt9g9( +external ffi.Pointer _1wx624s_protocolTrampoline_1mbt9g9( ffi.Pointer target, ffi.Pointer arg0, ); @@ -117,8 +115,7 @@ _ObjectiveCBindings_protocolTrampoline_1mbt9g9( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_1mllhpc( +external ffi.Pointer _1wx624s_protocolTrampoline_1mllhpc( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -133,8 +130,7 @@ _ObjectiveCBindings_protocolTrampoline_1mllhpc( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_1q0i84( +external ffi.Pointer _1wx624s_protocolTrampoline_1q0i84( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -151,7 +147,7 @@ _ObjectiveCBindings_protocolTrampoline_1q0i84( ffi.Pointer, ) >() -external void _ObjectiveCBindings_protocolTrampoline_1sr3ozv( +external void _1wx624s_protocolTrampoline_1sr3ozv( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -167,7 +163,7 @@ external void _ObjectiveCBindings_protocolTrampoline_1sr3ozv( ffi.Pointer, ) >() -external bool _ObjectiveCBindings_protocolTrampoline_3su7tt( +external bool _1wx624s_protocolTrampoline_3su7tt( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -180,8 +176,7 @@ external bool _ObjectiveCBindings_protocolTrampoline_3su7tt( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_50as9u( +external ffi.Pointer _1wx624s_protocolTrampoline_50as9u( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -196,8 +191,7 @@ _ObjectiveCBindings_protocolTrampoline_50as9u( ffi.Pointer, ) >() -external ffi.Pointer -_ObjectiveCBindings_protocolTrampoline_c7gk2u( +external ffi.Pointer _1wx624s_protocolTrampoline_c7gk2u( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -208,7 +202,7 @@ _ObjectiveCBindings_protocolTrampoline_c7gk2u( @ffi.Native< ffi.Bool Function(ffi.Pointer, ffi.Pointer) >() -external bool _ObjectiveCBindings_protocolTrampoline_e3qsqz( +external bool _1wx624s_protocolTrampoline_e3qsqz( ffi.Pointer target, ffi.Pointer arg0, ); @@ -221,7 +215,7 @@ external bool _ObjectiveCBindings_protocolTrampoline_e3qsqz( ffi.UnsignedLong, ) >() -external void _ObjectiveCBindings_protocolTrampoline_hoampi( +external void _1wx624s_protocolTrampoline_hoampi( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -231,7 +225,7 @@ external void _ObjectiveCBindings_protocolTrampoline_hoampi( @ffi.Native< ffi.Void Function(ffi.Pointer, ffi.Pointer) >() -external void _ObjectiveCBindings_protocolTrampoline_ovsamd( +external void _1wx624s_protocolTrampoline_ovsamd( ffi.Pointer target, ffi.Pointer arg0, ); @@ -243,7 +237,7 @@ external void _ObjectiveCBindings_protocolTrampoline_ovsamd( ffi.Pointer, ) >() -external bool _ObjectiveCBindings_protocolTrampoline_w1e3k0( +external bool _1wx624s_protocolTrampoline_w1e3k0( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -256,7 +250,7 @@ external bool _ObjectiveCBindings_protocolTrampoline_w1e3k0( ffi.Pointer, ) >() -external instancetype _ObjectiveCBindings_protocolTrampoline_xr62hr( +external instancetype _1wx624s_protocolTrampoline_xr62hr( ffi.Pointer target, ffi.Pointer arg0, ffi.Pointer arg1, @@ -269,8 +263,7 @@ external instancetype _ObjectiveCBindings_protocolTrampoline_xr62hr( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_18v1jvf( +external ffi.Pointer _1wx624s_wrapBlockingBlock_18v1jvf( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -283,8 +276,7 @@ _ObjectiveCBindings_wrapBlockingBlock_18v1jvf( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1b3bb6a( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1b3bb6a( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -297,8 +289,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1b3bb6a( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1o83rbn( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1o83rbn( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -311,8 +302,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1o83rbn( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1p9ui4q( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1p9ui4q( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -325,8 +315,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1p9ui4q( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1pl9qdv( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1pl9qdv( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -339,8 +328,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1pl9qdv( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1q8ia8l( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1q8ia8l( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -353,8 +341,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1q8ia8l( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_1sr3ozv( +external ffi.Pointer _1wx624s_wrapBlockingBlock_1sr3ozv( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -367,8 +354,7 @@ _ObjectiveCBindings_wrapBlockingBlock_1sr3ozv( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_hoampi( +external ffi.Pointer _1wx624s_wrapBlockingBlock_hoampi( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -381,8 +367,7 @@ _ObjectiveCBindings_wrapBlockingBlock_hoampi( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_lmc3p5( +external ffi.Pointer _1wx624s_wrapBlockingBlock_lmc3p5( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -395,8 +380,7 @@ _ObjectiveCBindings_wrapBlockingBlock_lmc3p5( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_ovsamd( +external ffi.Pointer _1wx624s_wrapBlockingBlock_ovsamd( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -409,8 +393,7 @@ _ObjectiveCBindings_wrapBlockingBlock_ovsamd( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_pfv6jd( +external ffi.Pointer _1wx624s_wrapBlockingBlock_pfv6jd( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -423,8 +406,7 @@ _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_q5jeyk( +external ffi.Pointer _1wx624s_wrapBlockingBlock_q5jeyk( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -437,8 +419,7 @@ _ObjectiveCBindings_wrapBlockingBlock_q5jeyk( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_rnu2c5( +external ffi.Pointer _1wx624s_wrapBlockingBlock_rnu2c5( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -451,8 +432,7 @@ _ObjectiveCBindings_wrapBlockingBlock_rnu2c5( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_t8l8el( +external ffi.Pointer _1wx624s_wrapBlockingBlock_t8l8el( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -465,8 +445,7 @@ _ObjectiveCBindings_wrapBlockingBlock_t8l8el( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_vhbh5h( +external ffi.Pointer _1wx624s_wrapBlockingBlock_vhbh5h( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -479,8 +458,7 @@ _ObjectiveCBindings_wrapBlockingBlock_vhbh5h( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_xtuoz7( +external ffi.Pointer _1wx624s_wrapBlockingBlock_xtuoz7( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -493,8 +471,7 @@ _ObjectiveCBindings_wrapBlockingBlock_xtuoz7( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_zkjmn1( +external ffi.Pointer _1wx624s_wrapBlockingBlock_zkjmn1( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -507,8 +484,7 @@ _ObjectiveCBindings_wrapBlockingBlock_zkjmn1( ffi.Pointer, ) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapBlockingBlock_zuf90e( +external ffi.Pointer _1wx624s_wrapBlockingBlock_zuf90e( ffi.Pointer block, ffi.Pointer listnerBlock, ffi.Pointer context, @@ -517,144 +493,126 @@ _ObjectiveCBindings_wrapBlockingBlock_zuf90e( @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_18v1jvf( +external ffi.Pointer _1wx624s_wrapListenerBlock_18v1jvf( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1b3bb6a( +external ffi.Pointer _1wx624s_wrapListenerBlock_1b3bb6a( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1o83rbn( +external ffi.Pointer _1wx624s_wrapListenerBlock_1o83rbn( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1p9ui4q( +external ffi.Pointer _1wx624s_wrapListenerBlock_1p9ui4q( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1pl9qdv( +external ffi.Pointer _1wx624s_wrapListenerBlock_1pl9qdv( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1q8ia8l( +external ffi.Pointer _1wx624s_wrapListenerBlock_1q8ia8l( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_1sr3ozv( +external ffi.Pointer _1wx624s_wrapListenerBlock_1sr3ozv( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_hoampi( +external ffi.Pointer _1wx624s_wrapListenerBlock_hoampi( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_lmc3p5( +external ffi.Pointer _1wx624s_wrapListenerBlock_lmc3p5( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_ovsamd( +external ffi.Pointer _1wx624s_wrapListenerBlock_ovsamd( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_pfv6jd( +external ffi.Pointer _1wx624s_wrapListenerBlock_pfv6jd( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_q5jeyk( +external ffi.Pointer _1wx624s_wrapListenerBlock_q5jeyk( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_rnu2c5( +external ffi.Pointer _1wx624s_wrapListenerBlock_rnu2c5( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_t8l8el( +external ffi.Pointer _1wx624s_wrapListenerBlock_t8l8el( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_vhbh5h( +external ffi.Pointer _1wx624s_wrapListenerBlock_vhbh5h( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_xtuoz7( +external ffi.Pointer _1wx624s_wrapListenerBlock_xtuoz7( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_zkjmn1( +external ffi.Pointer _1wx624s_wrapListenerBlock_zkjmn1( ffi.Pointer block, ); @ffi.Native< ffi.Pointer Function(ffi.Pointer) >(isLeaf: true) -external ffi.Pointer -_ObjectiveCBindings_wrapListenerBlock_zuf90e( +external ffi.Pointer _1wx624s_wrapListenerBlock_zuf90e( ffi.Pointer block, ); @@ -3876,7 +3834,7 @@ interface class NSCoding$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_18v1jvf) + >(_1wx624s_protocolTrampoline_18v1jvf) .cast(), objc.getProtocolMethodSignature( _protocol_NSCoding, @@ -3911,7 +3869,7 @@ interface class NSCoding$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_xr62hr) + >(_1wx624s_protocolTrampoline_xr62hr) .cast(), objc.getProtocolMethodSignature( _protocol_NSCoding, @@ -4041,7 +3999,7 @@ interface class NSCopying$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_18nsem0) + >(_1wx624s_protocolTrampoline_18nsem0) .cast(), objc.getProtocolMethodSignature( _protocol_NSCopying, @@ -8376,7 +8334,7 @@ interface class NSFastEnumeration$Builder { ffi.UnsignedLong, ) > - >(_ObjectiveCBindings_protocolTrampoline_17ap02x) + >(_1wx624s_protocolTrampoline_17ap02x) .cast(), objc.getProtocolMethodSignature( _protocol_NSFastEnumeration, @@ -10016,7 +9974,7 @@ interface class NSItemProviderWriting$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1ldqghh) + >(_1wx624s_protocolTrampoline_1ldqghh) .cast(), objc.getProtocolMethodSignature( _protocol_NSItemProviderWriting, @@ -10049,7 +10007,7 @@ interface class NSItemProviderWriting$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1q0i84) + >(_1wx624s_protocolTrampoline_1q0i84) .cast(), objc.getProtocolMethodSignature( _protocol_NSItemProviderWriting, @@ -10085,7 +10043,7 @@ interface class NSItemProviderWriting$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSItemProviderWriting, @@ -10780,7 +10738,7 @@ interface class NSMutableCopying$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_18nsem0) + >(_1wx624s_protocolTrampoline_18nsem0) .cast(), objc.getProtocolMethodSignature( _protocol_NSMutableCopying, @@ -15167,7 +15125,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15192,7 +15150,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15219,7 +15177,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_3su7tt) + >(_1wx624s_protocolTrampoline_3su7tt) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15244,7 +15202,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15268,7 +15226,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15292,7 +15250,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1ckyi24) + >(_1wx624s_protocolTrampoline_1ckyi24) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15318,7 +15276,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_3su7tt) + >(_1wx624s_protocolTrampoline_3su7tt) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15345,7 +15303,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_3su7tt) + >(_1wx624s_protocolTrampoline_3su7tt) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15372,7 +15330,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_3su7tt) + >(_1wx624s_protocolTrampoline_3su7tt) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15397,7 +15355,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_e3qsqz) + >(_1wx624s_protocolTrampoline_e3qsqz) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15425,7 +15383,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_50as9u) + >(_1wx624s_protocolTrampoline_50as9u) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15459,7 +15417,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mllhpc) + >(_1wx624s_protocolTrampoline_1mllhpc) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15504,7 +15462,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_c7gk2u) + >(_1wx624s_protocolTrampoline_c7gk2u) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15541,7 +15499,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_ovsamd) + >(_1wx624s_protocolTrampoline_ovsamd) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15571,7 +15529,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_w1e3k0) + >(_1wx624s_protocolTrampoline_w1e3k0) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15597,7 +15555,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15622,7 +15580,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1ckyi24) + >(_1wx624s_protocolTrampoline_1ckyi24) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15646,7 +15604,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15671,7 +15629,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1mbt9g9) + >(_1wx624s_protocolTrampoline_1mbt9g9) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -15696,7 +15654,7 @@ interface class NSObjectProtocol$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1a8cl66) + >(_1wx624s_protocolTrampoline_1a8cl66) .cast(), objc.getProtocolMethodSignature( _protocol_NSObject, @@ -17330,7 +17288,7 @@ interface class NSPortDelegate$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_18v1jvf) + >(_1wx624s_protocolTrampoline_18v1jvf) .cast(), objc.getProtocolMethodSignature( _protocol_NSPortDelegate, @@ -18685,7 +18643,7 @@ interface class NSSecureCoding$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_18v1jvf) + >(_1wx624s_protocolTrampoline_18v1jvf) .cast(), objc.getProtocolMethodSignature( _protocol_NSSecureCoding, @@ -18720,7 +18678,7 @@ interface class NSSecureCoding$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_xr62hr) + >(_1wx624s_protocolTrampoline_xr62hr) .cast(), objc.getProtocolMethodSignature( _protocol_NSSecureCoding, @@ -19315,7 +19273,7 @@ interface class NSStreamDelegate$Builder { ffi.UnsignedLong, ) > - >(_ObjectiveCBindings_protocolTrampoline_hoampi) + >(_1wx624s_protocolTrampoline_hoampi) .cast(), objc.getProtocolMethodSignature( _protocol_NSStreamDelegate, @@ -26114,7 +26072,7 @@ abstract final class ObjCBlock_ffiVoid { () => fn(), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1pl9qdv(raw); + final wrapper = _1wx624s_wrapListenerBlock_1pl9qdv(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock( wrapper, @@ -26147,7 +26105,7 @@ abstract final class ObjCBlock_ffiVoid { () => fn(), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1pl9qdv( + final wrapper = _1wx624s_wrapBlockingBlock_1pl9qdv( raw, rawListener, objc.objCContext, @@ -26376,7 +26334,7 @@ abstract final class ObjCBlock_ffiVoid_KeyType_ObjectType_bool { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1o83rbn(raw); + final wrapper = _1wx624s_wrapListenerBlock_1o83rbn(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function( @@ -26434,7 +26392,7 @@ abstract final class ObjCBlock_ffiVoid_KeyType_ObjectType_bool { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1o83rbn( + final wrapper = _1wx624s_wrapBlockingBlock_1o83rbn( raw, rawListener, objc.objCContext, @@ -26729,7 +26687,7 @@ abstract final class ObjCBlock_ffiVoid_NSData_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_pfv6jd(raw); + final wrapper = _1wx624s_wrapListenerBlock_pfv6jd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock( wrapper, @@ -26782,7 +26740,7 @@ abstract final class ObjCBlock_ffiVoid_NSData_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( + final wrapper = _1wx624s_wrapBlockingBlock_pfv6jd( raw, rawListener, objc.objCContext, @@ -27127,7 +27085,7 @@ abstract final class ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCO ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1b3bb6a(raw); + final wrapper = _1wx624s_wrapListenerBlock_1b3bb6a(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function( @@ -27204,7 +27162,7 @@ abstract final class ObjCBlock_ffiVoid_NSItemProviderCompletionHandler_objcObjCO ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1b3bb6a( + final wrapper = _1wx624s_wrapBlockingBlock_1b3bb6a( raw, rawListener, objc.objCContext, @@ -27486,7 +27444,7 @@ abstract final class ObjCBlock_ffiVoid_NSRange_bool { (NSRange arg0, ffi.Pointer arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_zkjmn1(raw); + final wrapper = _1wx624s_wrapListenerBlock_zkjmn1(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock)>( wrapper, @@ -27520,7 +27478,7 @@ abstract final class ObjCBlock_ffiVoid_NSRange_bool { (NSRange arg0, ffi.Pointer arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_zkjmn1( + final wrapper = _1wx624s_wrapBlockingBlock_zkjmn1( raw, rawListener, objc.objCContext, @@ -27788,7 +27746,7 @@ abstract final class ObjCBlock_ffiVoid_NSString_NSRange_NSRange_bool { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_lmc3p5(raw); + final wrapper = _1wx624s_wrapListenerBlock_lmc3p5(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(NSString?, NSRange, NSRange, ffi.Pointer) @@ -27846,7 +27804,7 @@ abstract final class ObjCBlock_ffiVoid_NSString_NSRange_NSRange_bool { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_lmc3p5( + final wrapper = _1wx624s_wrapBlockingBlock_lmc3p5( raw, rawListener, objc.objCContext, @@ -28138,7 +28096,7 @@ abstract final class ObjCBlock_ffiVoid_NSString_bool { fn(NSString.fromPointer(arg0, retain: false, release: true), arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_t8l8el(raw); + final wrapper = _1wx624s_wrapListenerBlock_t8l8el(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock)>( wrapper, @@ -28174,7 +28132,7 @@ abstract final class ObjCBlock_ffiVoid_NSString_bool { fn(NSString.fromPointer(arg0, retain: false, release: true), arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_t8l8el( + final wrapper = _1wx624s_wrapBlockingBlock_t8l8el( raw, rawListener, objc.objCContext, @@ -28412,7 +28370,7 @@ abstract final class ObjCBlock_ffiVoid_NSTimer { fn(NSTimer.fromPointer(arg0, retain: false, release: true)), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_xtuoz7(raw); + final wrapper = _1wx624s_wrapListenerBlock_xtuoz7(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock( wrapper, @@ -28447,7 +28405,7 @@ abstract final class ObjCBlock_ffiVoid_NSTimer { fn(NSTimer.fromPointer(arg0, retain: false, release: true)), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_xtuoz7( + final wrapper = _1wx624s_wrapBlockingBlock_xtuoz7( raw, rawListener, objc.objCContext, @@ -28672,7 +28630,7 @@ abstract final class ObjCBlock_ffiVoid_NSUInteger_bool { (int arg0, ffi.Pointer arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_q5jeyk(raw); + final wrapper = _1wx624s_wrapListenerBlock_q5jeyk(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.UnsignedLong, ffi.Pointer) @@ -28706,7 +28664,7 @@ abstract final class ObjCBlock_ffiVoid_NSUInteger_bool { (int arg0, ffi.Pointer arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_q5jeyk( + final wrapper = _1wx624s_wrapBlockingBlock_q5jeyk( raw, rawListener, objc.objCContext, @@ -28955,7 +28913,7 @@ abstract final class ObjCBlock_ffiVoid_NSURL_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_pfv6jd(raw); + final wrapper = _1wx624s_wrapListenerBlock_pfv6jd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock( wrapper, @@ -29008,7 +28966,7 @@ abstract final class ObjCBlock_ffiVoid_NSURL_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( + final wrapper = _1wx624s_wrapBlockingBlock_pfv6jd( raw, rawListener, objc.objCContext, @@ -29283,7 +29241,7 @@ abstract final class ObjCBlock_ffiVoid_NSURL_bool_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_rnu2c5(raw); + final wrapper = _1wx624s_wrapListenerBlock_rnu2c5(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock( wrapper, @@ -29340,7 +29298,7 @@ abstract final class ObjCBlock_ffiVoid_NSURL_bool_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_rnu2c5( + final wrapper = _1wx624s_wrapBlockingBlock_rnu2c5( raw, rawListener, objc.objCContext, @@ -29665,7 +29623,7 @@ abstract final class ObjCBlock_ffiVoid_ObjectType_NSUInteger_bool { ) => fn(objc.ObjCObject(arg0, retain: false, release: true), arg1, arg2), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1p9ui4q(raw); + final wrapper = _1wx624s_wrapListenerBlock_1p9ui4q(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function( @@ -29715,7 +29673,7 @@ abstract final class ObjCBlock_ffiVoid_ObjectType_NSUInteger_bool { ) => fn(objc.ObjCObject(arg0, retain: false, release: true), arg1, arg2), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1p9ui4q( + final wrapper = _1wx624s_wrapBlockingBlock_1p9ui4q( raw, rawListener, objc.objCContext, @@ -30016,7 +29974,7 @@ abstract final class ObjCBlock_ffiVoid_ObjectType_bool { fn(objc.ObjCObject(arg0, retain: false, release: true), arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_t8l8el(raw); + final wrapper = _1wx624s_wrapListenerBlock_t8l8el(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, ffi.Pointer) @@ -30052,7 +30010,7 @@ abstract final class ObjCBlock_ffiVoid_ObjectType_bool { fn(objc.ObjCObject(arg0, retain: false, release: true), arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_t8l8el( + final wrapper = _1wx624s_wrapBlockingBlock_t8l8el( raw, rawListener, objc.objCContext, @@ -30294,7 +30252,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid { (ffi.Pointer arg0) => fn(arg0), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_ovsamd(raw); + final wrapper = _1wx624s_wrapListenerBlock_ovsamd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock)>( wrapper, @@ -30327,7 +30285,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid { (ffi.Pointer arg0) => fn(arg0), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_ovsamd( + final wrapper = _1wx624s_wrapBlockingBlock_ovsamd( raw, rawListener, objc.objCContext, @@ -30534,7 +30492,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSCoder { fn(arg0, NSCoder.fromPointer(arg1, retain: false, release: true)), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_18v1jvf(raw); + final wrapper = _1wx624s_wrapListenerBlock_18v1jvf(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock, NSCoder)>( wrapper, @@ -30570,7 +30528,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSCoder { fn(arg0, NSCoder.fromPointer(arg1, retain: false, release: true)), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_18v1jvf( + final wrapper = _1wx624s_wrapBlockingBlock_18v1jvf( raw, rawListener, objc.objCContext, @@ -30819,7 +30777,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSPortMessage { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_18v1jvf(raw); + final wrapper = _1wx624s_wrapListenerBlock_18v1jvf(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, NSPortMessage) @@ -30857,7 +30815,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSPortMessage { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_18v1jvf( + final wrapper = _1wx624s_wrapBlockingBlock_18v1jvf( raw, rawListener, objc.objCContext, @@ -31120,7 +31078,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSRange_bool { fn(arg0, arg1, arg2), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1q8ia8l(raw); + final wrapper = _1wx624s_wrapListenerBlock_1q8ia8l(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, NSRange, ffi.Pointer) @@ -31156,7 +31114,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSRange_bool { fn(arg0, arg1, arg2), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1q8ia8l( + final wrapper = _1wx624s_wrapBlockingBlock_1q8ia8l( raw, rawListener, objc.objCContext, @@ -31456,7 +31414,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_hoampi(raw); + final wrapper = _1wx624s_wrapListenerBlock_hoampi(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, NSStream, ffi.UnsignedLong) @@ -31506,7 +31464,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSStream_NSStreamEvent { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_hoampi( + final wrapper = _1wx624s_wrapBlockingBlock_hoampi( raw, rawListener, objc.objCContext, @@ -31871,7 +31829,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSString_objcObjCObjectImpl_NSDic ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_1sr3ozv(raw); + final wrapper = _1wx624s_wrapListenerBlock_1sr3ozv(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function( @@ -31948,7 +31906,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSString_objcObjCObjectImpl_NSDic ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_1sr3ozv( + final wrapper = _1wx624s_wrapBlockingBlock_1sr3ozv( raw, rawListener, objc.objCContext, @@ -32288,7 +32246,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSUInteger { (ffi.Pointer arg0, int arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_zuf90e(raw); + final wrapper = _1wx624s_wrapListenerBlock_zuf90e(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, ffi.UnsignedLong) @@ -32322,7 +32280,7 @@ abstract final class ObjCBlock_ffiVoid_ffiVoid_NSUInteger { (ffi.Pointer arg0, int arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_zuf90e( + final wrapper = _1wx624s_wrapBlockingBlock_zuf90e( raw, rawListener, objc.objCContext, @@ -32595,7 +32553,7 @@ abstract final class ObjCBlock_ffiVoid_idNSItemProviderReading_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_pfv6jd(raw); + final wrapper = _1wx624s_wrapListenerBlock_pfv6jd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer?, NSError?) @@ -32657,7 +32615,7 @@ abstract final class ObjCBlock_ffiVoid_idNSItemProviderReading_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( + final wrapper = _1wx624s_wrapBlockingBlock_pfv6jd( raw, rawListener, objc.objCContext, @@ -32950,7 +32908,7 @@ abstract final class ObjCBlock_ffiVoid_idNSItemProviderWriting_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_pfv6jd(raw); + final wrapper = _1wx624s_wrapListenerBlock_pfv6jd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer?, NSError?) @@ -33012,7 +32970,7 @@ abstract final class ObjCBlock_ffiVoid_idNSItemProviderWriting_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( + final wrapper = _1wx624s_wrapBlockingBlock_pfv6jd( raw, rawListener, objc.objCContext, @@ -33293,7 +33251,7 @@ abstract final class ObjCBlock_ffiVoid_idNSSecureCoding_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_pfv6jd(raw); + final wrapper = _1wx624s_wrapListenerBlock_pfv6jd(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer?, NSError) @@ -33343,7 +33301,7 @@ abstract final class ObjCBlock_ffiVoid_idNSSecureCoding_NSError { ), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( + final wrapper = _1wx624s_wrapBlockingBlock_pfv6jd( raw, rawListener, objc.objCContext, @@ -33603,7 +33561,7 @@ abstract final class ObjCBlock_ffiVoid_unichar_NSUInteger { (ffi.Pointer arg0, int arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapListenerBlock_vhbh5h(raw); + final wrapper = _1wx624s_wrapListenerBlock_vhbh5h(raw); objc.objectRelease(raw.cast()); return objc.ObjCBlock< ffi.Void Function(ffi.Pointer, ffi.UnsignedLong) @@ -33637,7 +33595,7 @@ abstract final class ObjCBlock_ffiVoid_unichar_NSUInteger { (ffi.Pointer arg0, int arg1) => fn(arg0, arg1), keepIsolateAlive, ); - final wrapper = _ObjectiveCBindings_wrapBlockingBlock_vhbh5h( + final wrapper = _1wx624s_wrapBlockingBlock_vhbh5h( raw, rawListener, objc.objCContext, @@ -35288,7 +35246,7 @@ interface class Observer$Builder { ffi.Pointer, ) > - >(_ObjectiveCBindings_protocolTrampoline_1sr3ozv) + >(_1wx624s_protocolTrampoline_1sr3ozv) .cast(), objc.getProtocolMethodSignature( _protocol_Observer, diff --git a/pkgs/objective_c/lib/src/runtime_bindings_generated.dart b/pkgs/objective_c/lib/src/runtime_bindings_generated.dart index ffdb9dea8..67cdf86eb 100644 --- a/pkgs/objective_c/lib/src/runtime_bindings_generated.dart +++ b/pkgs/objective_c/lib/src/runtime_bindings_generated.dart @@ -12,16 +12,19 @@ // coverage:ignore-file // AUTO GENERATED FILE, DO NOT EDIT. -// +// // Generated by `package:ffigen`. // ignore_for_file: type=lint, unused_import import 'dart:ffi' as ffi; + @ffi.Array.multi([32]) @ffi.Native>>(symbol: '_NSConcreteAutoBlock') external ffi.Array> NSConcreteAutoBlock; @ffi.Array.multi([32]) -@ffi.Native>>(symbol: '_NSConcreteFinalizingBlock') +@ffi.Native>>( + symbol: '_NSConcreteFinalizingBlock', +) external ffi.Array> NSConcreteFinalizingBlock; @ffi.Array.multi([32]) @@ -54,46 +57,82 @@ external ffi.Pointer NSKeyValueChangeOldKey; @ffi.Native>() external ffi.Pointer NSLocalizedDescriptionKey; -@ffi.Native )>(symbol: 'objc_autoreleasePoolPop', isLeaf: true) -external void autoreleasePoolPop(ffi.Pointer pool, -); +@ffi.Native)>( + symbol: 'objc_autoreleasePoolPop', + isLeaf: true, +) +external void autoreleasePoolPop(ffi.Pointer pool); -@ffi.Native Function()>(symbol: 'objc_autoreleasePoolPush', isLeaf: true) +@ffi.Native Function()>( + symbol: 'objc_autoreleasePoolPush', + isLeaf: true, +) external ffi.Pointer autoreleasePoolPush(); -@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_retainBlock', isLeaf: true) -external ffi.Pointer blockRetain(ffi.Pointer object, -); - -@ffi.Native> Function(ffi.Pointer )>(symbol: 'objc_copyClassList', isLeaf: true) -external ffi.Pointer> copyClassList(ffi.Pointer count, -); - -@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_getClass', isLeaf: true) -external ffi.Pointer getClass(ffi.Pointer name, -); - -@ffi.Native , ffi.Pointer , ffi.Bool , ffi.Bool )>(symbol: 'protocol_getMethodDescription', isLeaf: true) -external ObjCMethodDesc getMethodDescription(ffi.Pointer protocol, -ffi.Pointer sel, -bool isRequiredMethod, -bool isInstanceMethod, +@ffi.Native Function(ffi.Pointer)>( + symbol: 'objc_retainBlock', + isLeaf: true, +) +external ffi.Pointer blockRetain( + ffi.Pointer object, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'sel_getName', isLeaf: true) -external ffi.Pointer getName(ffi.Pointer sel, +@ffi.Native< + ffi.Pointer> Function( + ffi.Pointer, + ) +>(symbol: 'objc_copyClassList', isLeaf: true) +external ffi.Pointer> copyClassList( + ffi.Pointer count, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'object_getClass', isLeaf: true) -external ffi.Pointer getObjectClass(ffi.Pointer object, +@ffi.Native Function(ffi.Pointer)>( + symbol: 'objc_getClass', + isLeaf: true, +) +external ffi.Pointer getClass(ffi.Pointer name); + +@ffi.Native< + ObjCMethodDesc Function( + ffi.Pointer, + ffi.Pointer, + ffi.Bool, + ffi.Bool, + ) +>(symbol: 'protocol_getMethodDescription', isLeaf: true) +external ObjCMethodDesc getMethodDescription( + ffi.Pointer protocol, + ffi.Pointer sel, + bool isRequiredMethod, + bool isInstanceMethod, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_getProtocol', isLeaf: true) -external ffi.Pointer getProtocol(ffi.Pointer name, +@ffi.Native Function(ffi.Pointer)>( + symbol: 'sel_getName', + isLeaf: true, +) +external ffi.Pointer getName(ffi.Pointer sel); + +@ffi.Native Function(ffi.Pointer)>( + symbol: 'object_getClass', + isLeaf: true, +) +external ffi.Pointer getObjectClass( + ffi.Pointer object, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'protocol_getName', isLeaf: true) -external ffi.Pointer getProtocolName(ffi.Pointer proto, +@ffi.Native Function(ffi.Pointer)>( + symbol: 'objc_getProtocol', + isLeaf: true, +) +external ffi.Pointer getProtocol(ffi.Pointer name); + +@ffi.Native Function(ffi.Pointer)>( + symbol: 'protocol_getName', + isLeaf: true, +) +external ffi.Pointer getProtocolName( + ffi.Pointer proto, ); @ffi.Native(symbol: 'objc_msgSend') @@ -105,35 +144,42 @@ external void msgSendFpret(); @ffi.Native(symbol: 'objc_msgSend_stret') external void msgSendStret(); -@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_autorelease', isLeaf: true) -external ffi.Pointer objectAutorelease(ffi.Pointer object, +@ffi.Native Function(ffi.Pointer)>( + symbol: 'objc_autorelease', + isLeaf: true, +) +external ffi.Pointer objectAutorelease( + ffi.Pointer object, ); -@ffi.Native )>(symbol: 'objc_release', isLeaf: true) -external void objectRelease(ffi.Pointer object, +@ffi.Native)>( + symbol: 'objc_release', + isLeaf: true, +) +external void objectRelease(ffi.Pointer object); + +@ffi.Native Function(ffi.Pointer)>( + symbol: 'objc_retain', + isLeaf: true, +) +external ffi.Pointer objectRetain( + ffi.Pointer object, ); -@ffi.Native Function(ffi.Pointer )>(symbol: 'objc_retain', isLeaf: true) -external ffi.Pointer objectRetain(ffi.Pointer object, -); - -@ffi.Native Function(ffi.Pointer )>(symbol: 'sel_registerName', isLeaf: true) -external ffi.Pointer registerName(ffi.Pointer name, -); +@ffi.Native Function(ffi.Pointer)>( + symbol: 'sel_registerName', + isLeaf: true, +) +external ffi.Pointer registerName(ffi.Pointer name); -final class ObjCMethodDesc extends ffi.Struct{ +final class ObjCMethodDesc extends ffi.Struct { external ffi.Pointer name; external ffi.Pointer types; - } -final class ObjCObjectImpl extends ffi.Opaque{ -} - -final class ObjCProtocolImpl extends ffi.Opaque{ -} +final class ObjCObjectImpl extends ffi.Opaque {} -final class ObjCSelector extends ffi.Opaque{ -} +final class ObjCProtocolImpl extends ffi.Opaque {} +final class ObjCSelector extends ffi.Opaque {} diff --git a/pkgs/objective_c/src/objective_c_bindings_generated.m b/pkgs/objective_c/src/objective_c_bindings_generated.m index 29ec18075..79a58835c 100644 --- a/pkgs/objective_c/src/objective_c_bindings_generated.m +++ b/pkgs/objective_c/src/objective_c_bindings_generated.m @@ -53,83 +53,83 @@ }; -Protocol* _ObjectiveCBindings_NSCoding(void) { return @protocol(NSCoding); } +Protocol* _1wx624s_NSCoding(void) { return @protocol(NSCoding); } -Protocol* _ObjectiveCBindings_NSCopying(void) { return @protocol(NSCopying); } +Protocol* _1wx624s_NSCopying(void) { return @protocol(NSCopying); } -Protocol* _ObjectiveCBindings_NSFastEnumeration(void) { return @protocol(NSFastEnumeration); } +Protocol* _1wx624s_NSFastEnumeration(void) { return @protocol(NSFastEnumeration); } -Protocol* _ObjectiveCBindings_NSItemProviderReading(void) { return @protocol(NSItemProviderReading); } +Protocol* _1wx624s_NSItemProviderReading(void) { return @protocol(NSItemProviderReading); } -Protocol* _ObjectiveCBindings_NSItemProviderWriting(void) { return @protocol(NSItemProviderWriting); } +Protocol* _1wx624s_NSItemProviderWriting(void) { return @protocol(NSItemProviderWriting); } -Protocol* _ObjectiveCBindings_NSMutableCopying(void) { return @protocol(NSMutableCopying); } +Protocol* _1wx624s_NSMutableCopying(void) { return @protocol(NSMutableCopying); } -Protocol* _ObjectiveCBindings_NSObject(void) { return @protocol(NSObject); } +Protocol* _1wx624s_NSObject(void) { return @protocol(NSObject); } -Protocol* _ObjectiveCBindings_NSPortDelegate(void) { return @protocol(NSPortDelegate); } +Protocol* _1wx624s_NSPortDelegate(void) { return @protocol(NSPortDelegate); } -Protocol* _ObjectiveCBindings_NSSecureCoding(void) { return @protocol(NSSecureCoding); } +Protocol* _1wx624s_NSSecureCoding(void) { return @protocol(NSSecureCoding); } -Protocol* _ObjectiveCBindings_NSStreamDelegate(void) { return @protocol(NSStreamDelegate); } +Protocol* _1wx624s_NSStreamDelegate(void) { return @protocol(NSStreamDelegate); } typedef id (^_ProtocolTrampoline)(void * sel); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_1mbt9g9(id target, void * sel) { +id _1wx624s_protocolTrampoline_1mbt9g9(id target, void * sel) { return ((_ProtocolTrampoline)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel); } typedef NSItemProviderRepresentationVisibility (^_ProtocolTrampoline_1)(void * sel, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -NSItemProviderRepresentationVisibility _ObjectiveCBindings_protocolTrampoline_1ldqghh(id target, void * sel, id arg1) { +NSItemProviderRepresentationVisibility _1wx624s_protocolTrampoline_1ldqghh(id target, void * sel, id arg1) { return ((_ProtocolTrampoline_1)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef id (^_ProtocolTrampoline_2)(void * sel, id arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_1q0i84(id target, void * sel, id arg1, id arg2) { +id _1wx624s_protocolTrampoline_1q0i84(id target, void * sel, id arg1, id arg2) { return ((_ProtocolTrampoline_2)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2); } typedef unsigned long (^_ProtocolTrampoline_3)(void * sel); __attribute__((visibility("default"))) __attribute__((used)) -unsigned long _ObjectiveCBindings_protocolTrampoline_1ckyi24(id target, void * sel) { +unsigned long _1wx624s_protocolTrampoline_1ckyi24(id target, void * sel) { return ((_ProtocolTrampoline_3)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel); } typedef unsigned long (^_ProtocolTrampoline_4)(void * sel, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3); __attribute__((visibility("default"))) __attribute__((used)) -unsigned long _ObjectiveCBindings_protocolTrampoline_17ap02x(id target, void * sel, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3) { +unsigned long _1wx624s_protocolTrampoline_17ap02x(id target, void * sel, NSFastEnumerationState * arg1, id * arg2, unsigned long arg3) { return ((_ProtocolTrampoline_4)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2, arg3); } typedef struct _NSZone * (^_ProtocolTrampoline_5)(void * sel); __attribute__((visibility("default"))) __attribute__((used)) -struct _NSZone * _ObjectiveCBindings_protocolTrampoline_1a8cl66(id target, void * sel) { +struct _NSZone * _1wx624s_protocolTrampoline_1a8cl66(id target, void * sel) { return ((_ProtocolTrampoline_5)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel); } typedef BOOL (^_ProtocolTrampoline_6)(void * sel); __attribute__((visibility("default"))) __attribute__((used)) -BOOL _ObjectiveCBindings_protocolTrampoline_e3qsqz(id target, void * sel) { +BOOL _1wx624s_protocolTrampoline_e3qsqz(id target, void * sel) { return ((_ProtocolTrampoline_6)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel); } typedef BOOL (^_ProtocolTrampoline_7)(void * sel, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -BOOL _ObjectiveCBindings_protocolTrampoline_3su7tt(id target, void * sel, id arg1) { +BOOL _1wx624s_protocolTrampoline_3su7tt(id target, void * sel, id arg1) { return ((_ProtocolTrampoline_7)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef BOOL (^_ProtocolTrampoline_8)(void * sel, struct objc_selector * arg1); __attribute__((visibility("default"))) __attribute__((used)) -BOOL _ObjectiveCBindings_protocolTrampoline_w1e3k0(id target, void * sel, struct objc_selector * arg1) { +BOOL _1wx624s_protocolTrampoline_w1e3k0(id target, void * sel, struct objc_selector * arg1) { return ((_ProtocolTrampoline_8)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef void (^_ListenerTrampoline)(void); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline _ObjectiveCBindings_wrapListenerBlock_1pl9qdv(_ListenerTrampoline block) NS_RETURNS_RETAINED { +_ListenerTrampoline _1wx624s_wrapListenerBlock_1pl9qdv(_ListenerTrampoline block) NS_RETURNS_RETAINED { return ^void() { objc_retainBlock(block); block(); @@ -138,7 +138,7 @@ _ListenerTrampoline _ObjectiveCBindings_wrapListenerBlock_1pl9qdv(_ListenerTramp typedef void (^_BlockingTrampoline)(void * waiter); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline _ObjectiveCBindings_wrapBlockingBlock_1pl9qdv( +_ListenerTrampoline _1wx624s_wrapBlockingBlock_1pl9qdv( _BlockingTrampoline block, _BlockingTrampoline listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(), { @@ -152,7 +152,7 @@ _ListenerTrampoline _ObjectiveCBindings_wrapBlockingBlock_1pl9qdv( typedef void (^_ListenerTrampoline_1)(id arg0, id arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_1 _ObjectiveCBindings_wrapListenerBlock_1o83rbn(_ListenerTrampoline_1 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_1 _1wx624s_wrapListenerBlock_1o83rbn(_ListenerTrampoline_1 block) NS_RETURNS_RETAINED { return ^void(id arg0, id arg1, BOOL * arg2) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), (__bridge id)(__bridge_retained void*)(arg1), arg2); @@ -161,7 +161,7 @@ _ListenerTrampoline_1 _ObjectiveCBindings_wrapListenerBlock_1o83rbn(_ListenerTra typedef void (^_BlockingTrampoline_1)(void * waiter, id arg0, id arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_1 _ObjectiveCBindings_wrapBlockingBlock_1o83rbn( +_ListenerTrampoline_1 _1wx624s_wrapBlockingBlock_1o83rbn( _BlockingTrampoline_1 block, _BlockingTrampoline_1 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, id arg1, BOOL * arg2), { @@ -175,7 +175,7 @@ _ListenerTrampoline_1 _ObjectiveCBindings_wrapBlockingBlock_1o83rbn( typedef void (^_ListenerTrampoline_2)(id arg0, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_2 _ObjectiveCBindings_wrapListenerBlock_pfv6jd(_ListenerTrampoline_2 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_2 _1wx624s_wrapListenerBlock_pfv6jd(_ListenerTrampoline_2 block) NS_RETURNS_RETAINED { return ^void(id arg0, id arg1) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), (__bridge id)(__bridge_retained void*)(arg1)); @@ -184,7 +184,7 @@ _ListenerTrampoline_2 _ObjectiveCBindings_wrapListenerBlock_pfv6jd(_ListenerTram typedef void (^_BlockingTrampoline_2)(void * waiter, id arg0, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_2 _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( +_ListenerTrampoline_2 _1wx624s_wrapBlockingBlock_pfv6jd( _BlockingTrampoline_2 block, _BlockingTrampoline_2 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, id arg1), { @@ -198,7 +198,7 @@ _ListenerTrampoline_2 _ObjectiveCBindings_wrapBlockingBlock_pfv6jd( typedef void (^_ListenerTrampoline_3)(id arg0, id arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_3 _ObjectiveCBindings_wrapListenerBlock_1b3bb6a(_ListenerTrampoline_3 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_3 _1wx624s_wrapListenerBlock_1b3bb6a(_ListenerTrampoline_3 block) NS_RETURNS_RETAINED { return ^void(id arg0, id arg1, id arg2) { objc_retainBlock(block); block(objc_retainBlock(arg0), (__bridge id)(__bridge_retained void*)(arg1), (__bridge id)(__bridge_retained void*)(arg2)); @@ -207,7 +207,7 @@ _ListenerTrampoline_3 _ObjectiveCBindings_wrapListenerBlock_1b3bb6a(_ListenerTra typedef void (^_BlockingTrampoline_3)(void * waiter, id arg0, id arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_3 _ObjectiveCBindings_wrapBlockingBlock_1b3bb6a( +_ListenerTrampoline_3 _1wx624s_wrapBlockingBlock_1b3bb6a( _BlockingTrampoline_3 block, _BlockingTrampoline_3 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, id arg1, id arg2), { @@ -221,7 +221,7 @@ _ListenerTrampoline_3 _ObjectiveCBindings_wrapBlockingBlock_1b3bb6a( typedef void (^_ListenerTrampoline_4)(struct _NSRange arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_4 _ObjectiveCBindings_wrapListenerBlock_zkjmn1(_ListenerTrampoline_4 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_4 _1wx624s_wrapListenerBlock_zkjmn1(_ListenerTrampoline_4 block) NS_RETURNS_RETAINED { return ^void(struct _NSRange arg0, BOOL * arg1) { objc_retainBlock(block); block(arg0, arg1); @@ -230,7 +230,7 @@ _ListenerTrampoline_4 _ObjectiveCBindings_wrapListenerBlock_zkjmn1(_ListenerTram typedef void (^_BlockingTrampoline_4)(void * waiter, struct _NSRange arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_4 _ObjectiveCBindings_wrapBlockingBlock_zkjmn1( +_ListenerTrampoline_4 _1wx624s_wrapBlockingBlock_zkjmn1( _BlockingTrampoline_4 block, _BlockingTrampoline_4 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(struct _NSRange arg0, BOOL * arg1), { @@ -244,7 +244,7 @@ _ListenerTrampoline_4 _ObjectiveCBindings_wrapBlockingBlock_zkjmn1( typedef void (^_ListenerTrampoline_5)(id arg0, struct _NSRange arg1, struct _NSRange arg2, BOOL * arg3); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_5 _ObjectiveCBindings_wrapListenerBlock_lmc3p5(_ListenerTrampoline_5 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_5 _1wx624s_wrapListenerBlock_lmc3p5(_ListenerTrampoline_5 block) NS_RETURNS_RETAINED { return ^void(id arg0, struct _NSRange arg1, struct _NSRange arg2, BOOL * arg3) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), arg1, arg2, arg3); @@ -253,7 +253,7 @@ _ListenerTrampoline_5 _ObjectiveCBindings_wrapListenerBlock_lmc3p5(_ListenerTram typedef void (^_BlockingTrampoline_5)(void * waiter, id arg0, struct _NSRange arg1, struct _NSRange arg2, BOOL * arg3); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_5 _ObjectiveCBindings_wrapBlockingBlock_lmc3p5( +_ListenerTrampoline_5 _1wx624s_wrapBlockingBlock_lmc3p5( _BlockingTrampoline_5 block, _BlockingTrampoline_5 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, struct _NSRange arg1, struct _NSRange arg2, BOOL * arg3), { @@ -267,7 +267,7 @@ _ListenerTrampoline_5 _ObjectiveCBindings_wrapBlockingBlock_lmc3p5( typedef void (^_ListenerTrampoline_6)(id arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_6 _ObjectiveCBindings_wrapListenerBlock_t8l8el(_ListenerTrampoline_6 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_6 _1wx624s_wrapListenerBlock_t8l8el(_ListenerTrampoline_6 block) NS_RETURNS_RETAINED { return ^void(id arg0, BOOL * arg1) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), arg1); @@ -276,7 +276,7 @@ _ListenerTrampoline_6 _ObjectiveCBindings_wrapListenerBlock_t8l8el(_ListenerTram typedef void (^_BlockingTrampoline_6)(void * waiter, id arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_6 _ObjectiveCBindings_wrapBlockingBlock_t8l8el( +_ListenerTrampoline_6 _1wx624s_wrapBlockingBlock_t8l8el( _BlockingTrampoline_6 block, _BlockingTrampoline_6 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, BOOL * arg1), { @@ -290,7 +290,7 @@ _ListenerTrampoline_6 _ObjectiveCBindings_wrapBlockingBlock_t8l8el( typedef void (^_ListenerTrampoline_7)(id arg0); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_7 _ObjectiveCBindings_wrapListenerBlock_xtuoz7(_ListenerTrampoline_7 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_7 _1wx624s_wrapListenerBlock_xtuoz7(_ListenerTrampoline_7 block) NS_RETURNS_RETAINED { return ^void(id arg0) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0)); @@ -299,7 +299,7 @@ _ListenerTrampoline_7 _ObjectiveCBindings_wrapListenerBlock_xtuoz7(_ListenerTram typedef void (^_BlockingTrampoline_7)(void * waiter, id arg0); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_7 _ObjectiveCBindings_wrapBlockingBlock_xtuoz7( +_ListenerTrampoline_7 _1wx624s_wrapBlockingBlock_xtuoz7( _BlockingTrampoline_7 block, _BlockingTrampoline_7 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0), { @@ -313,7 +313,7 @@ _ListenerTrampoline_7 _ObjectiveCBindings_wrapBlockingBlock_xtuoz7( typedef void (^_ListenerTrampoline_8)(unsigned long arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_8 _ObjectiveCBindings_wrapListenerBlock_q5jeyk(_ListenerTrampoline_8 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_8 _1wx624s_wrapListenerBlock_q5jeyk(_ListenerTrampoline_8 block) NS_RETURNS_RETAINED { return ^void(unsigned long arg0, BOOL * arg1) { objc_retainBlock(block); block(arg0, arg1); @@ -322,7 +322,7 @@ _ListenerTrampoline_8 _ObjectiveCBindings_wrapListenerBlock_q5jeyk(_ListenerTram typedef void (^_BlockingTrampoline_8)(void * waiter, unsigned long arg0, BOOL * arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_8 _ObjectiveCBindings_wrapBlockingBlock_q5jeyk( +_ListenerTrampoline_8 _1wx624s_wrapBlockingBlock_q5jeyk( _BlockingTrampoline_8 block, _BlockingTrampoline_8 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(unsigned long arg0, BOOL * arg1), { @@ -336,7 +336,7 @@ _ListenerTrampoline_8 _ObjectiveCBindings_wrapBlockingBlock_q5jeyk( typedef void (^_ListenerTrampoline_9)(id arg0, BOOL arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_9 _ObjectiveCBindings_wrapListenerBlock_rnu2c5(_ListenerTrampoline_9 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_9 _1wx624s_wrapListenerBlock_rnu2c5(_ListenerTrampoline_9 block) NS_RETURNS_RETAINED { return ^void(id arg0, BOOL arg1, id arg2) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), arg1, (__bridge id)(__bridge_retained void*)(arg2)); @@ -345,7 +345,7 @@ _ListenerTrampoline_9 _ObjectiveCBindings_wrapListenerBlock_rnu2c5(_ListenerTram typedef void (^_BlockingTrampoline_9)(void * waiter, id arg0, BOOL arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_9 _ObjectiveCBindings_wrapBlockingBlock_rnu2c5( +_ListenerTrampoline_9 _1wx624s_wrapBlockingBlock_rnu2c5( _BlockingTrampoline_9 block, _BlockingTrampoline_9 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, BOOL arg1, id arg2), { @@ -359,7 +359,7 @@ _ListenerTrampoline_9 _ObjectiveCBindings_wrapBlockingBlock_rnu2c5( typedef void (^_ListenerTrampoline_10)(id arg0, unsigned long arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_10 _ObjectiveCBindings_wrapListenerBlock_1p9ui4q(_ListenerTrampoline_10 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_10 _1wx624s_wrapListenerBlock_1p9ui4q(_ListenerTrampoline_10 block) NS_RETURNS_RETAINED { return ^void(id arg0, unsigned long arg1, BOOL * arg2) { objc_retainBlock(block); block((__bridge id)(__bridge_retained void*)(arg0), arg1, arg2); @@ -368,7 +368,7 @@ _ListenerTrampoline_10 _ObjectiveCBindings_wrapListenerBlock_1p9ui4q(_ListenerTr typedef void (^_BlockingTrampoline_10)(void * waiter, id arg0, unsigned long arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_10 _ObjectiveCBindings_wrapBlockingBlock_1p9ui4q( +_ListenerTrampoline_10 _1wx624s_wrapBlockingBlock_1p9ui4q( _BlockingTrampoline_10 block, _BlockingTrampoline_10 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(id arg0, unsigned long arg1, BOOL * arg2), { @@ -382,7 +382,7 @@ _ListenerTrampoline_10 _ObjectiveCBindings_wrapBlockingBlock_1p9ui4q( typedef void (^_ListenerTrampoline_11)(void * arg0); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_11 _ObjectiveCBindings_wrapListenerBlock_ovsamd(_ListenerTrampoline_11 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_11 _1wx624s_wrapListenerBlock_ovsamd(_ListenerTrampoline_11 block) NS_RETURNS_RETAINED { return ^void(void * arg0) { objc_retainBlock(block); block(arg0); @@ -391,7 +391,7 @@ _ListenerTrampoline_11 _ObjectiveCBindings_wrapListenerBlock_ovsamd(_ListenerTra typedef void (^_BlockingTrampoline_11)(void * waiter, void * arg0); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_11 _ObjectiveCBindings_wrapBlockingBlock_ovsamd( +_ListenerTrampoline_11 _1wx624s_wrapBlockingBlock_ovsamd( _BlockingTrampoline_11 block, _BlockingTrampoline_11 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0), { @@ -405,13 +405,13 @@ _ListenerTrampoline_11 _ObjectiveCBindings_wrapBlockingBlock_ovsamd( typedef void (^_ProtocolTrampoline_9)(void * sel); __attribute__((visibility("default"))) __attribute__((used)) -void _ObjectiveCBindings_protocolTrampoline_ovsamd(id target, void * sel) { +void _1wx624s_protocolTrampoline_ovsamd(id target, void * sel) { return ((_ProtocolTrampoline_9)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel); } typedef void (^_ListenerTrampoline_12)(void * arg0, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_12 _ObjectiveCBindings_wrapListenerBlock_18v1jvf(_ListenerTrampoline_12 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_12 _1wx624s_wrapListenerBlock_18v1jvf(_ListenerTrampoline_12 block) NS_RETURNS_RETAINED { return ^void(void * arg0, id arg1) { objc_retainBlock(block); block(arg0, (__bridge id)(__bridge_retained void*)(arg1)); @@ -420,7 +420,7 @@ _ListenerTrampoline_12 _ObjectiveCBindings_wrapListenerBlock_18v1jvf(_ListenerTr typedef void (^_BlockingTrampoline_12)(void * waiter, void * arg0, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_12 _ObjectiveCBindings_wrapBlockingBlock_18v1jvf( +_ListenerTrampoline_12 _1wx624s_wrapBlockingBlock_18v1jvf( _BlockingTrampoline_12 block, _BlockingTrampoline_12 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0, id arg1), { @@ -434,13 +434,13 @@ _ListenerTrampoline_12 _ObjectiveCBindings_wrapBlockingBlock_18v1jvf( typedef void (^_ProtocolTrampoline_10)(void * sel, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -void _ObjectiveCBindings_protocolTrampoline_18v1jvf(id target, void * sel, id arg1) { +void _1wx624s_protocolTrampoline_18v1jvf(id target, void * sel, id arg1) { return ((_ProtocolTrampoline_10)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef void (^_ListenerTrampoline_13)(void * arg0, struct _NSRange arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_13 _ObjectiveCBindings_wrapListenerBlock_1q8ia8l(_ListenerTrampoline_13 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_13 _1wx624s_wrapListenerBlock_1q8ia8l(_ListenerTrampoline_13 block) NS_RETURNS_RETAINED { return ^void(void * arg0, struct _NSRange arg1, BOOL * arg2) { objc_retainBlock(block); block(arg0, arg1, arg2); @@ -449,7 +449,7 @@ _ListenerTrampoline_13 _ObjectiveCBindings_wrapListenerBlock_1q8ia8l(_ListenerTr typedef void (^_BlockingTrampoline_13)(void * waiter, void * arg0, struct _NSRange arg1, BOOL * arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_13 _ObjectiveCBindings_wrapBlockingBlock_1q8ia8l( +_ListenerTrampoline_13 _1wx624s_wrapBlockingBlock_1q8ia8l( _BlockingTrampoline_13 block, _BlockingTrampoline_13 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0, struct _NSRange arg1, BOOL * arg2), { @@ -463,7 +463,7 @@ _ListenerTrampoline_13 _ObjectiveCBindings_wrapBlockingBlock_1q8ia8l( typedef void (^_ListenerTrampoline_14)(void * arg0, id arg1, NSStreamEvent arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_14 _ObjectiveCBindings_wrapListenerBlock_hoampi(_ListenerTrampoline_14 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_14 _1wx624s_wrapListenerBlock_hoampi(_ListenerTrampoline_14 block) NS_RETURNS_RETAINED { return ^void(void * arg0, id arg1, NSStreamEvent arg2) { objc_retainBlock(block); block(arg0, (__bridge id)(__bridge_retained void*)(arg1), arg2); @@ -472,7 +472,7 @@ _ListenerTrampoline_14 _ObjectiveCBindings_wrapListenerBlock_hoampi(_ListenerTra typedef void (^_BlockingTrampoline_14)(void * waiter, void * arg0, id arg1, NSStreamEvent arg2); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_14 _ObjectiveCBindings_wrapBlockingBlock_hoampi( +_ListenerTrampoline_14 _1wx624s_wrapBlockingBlock_hoampi( _BlockingTrampoline_14 block, _BlockingTrampoline_14 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0, id arg1, NSStreamEvent arg2), { @@ -486,13 +486,13 @@ _ListenerTrampoline_14 _ObjectiveCBindings_wrapBlockingBlock_hoampi( typedef void (^_ProtocolTrampoline_11)(void * sel, id arg1, NSStreamEvent arg2); __attribute__((visibility("default"))) __attribute__((used)) -void _ObjectiveCBindings_protocolTrampoline_hoampi(id target, void * sel, id arg1, NSStreamEvent arg2) { +void _1wx624s_protocolTrampoline_hoampi(id target, void * sel, id arg1, NSStreamEvent arg2) { return ((_ProtocolTrampoline_11)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2); } typedef void (^_ListenerTrampoline_15)(void * arg0, id arg1, id arg2, id arg3, void * arg4); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_15 _ObjectiveCBindings_wrapListenerBlock_1sr3ozv(_ListenerTrampoline_15 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_15 _1wx624s_wrapListenerBlock_1sr3ozv(_ListenerTrampoline_15 block) NS_RETURNS_RETAINED { return ^void(void * arg0, id arg1, id arg2, id arg3, void * arg4) { objc_retainBlock(block); block(arg0, (__bridge id)(__bridge_retained void*)(arg1), (__bridge id)(__bridge_retained void*)(arg2), (__bridge id)(__bridge_retained void*)(arg3), arg4); @@ -501,7 +501,7 @@ _ListenerTrampoline_15 _ObjectiveCBindings_wrapListenerBlock_1sr3ozv(_ListenerTr typedef void (^_BlockingTrampoline_15)(void * waiter, void * arg0, id arg1, id arg2, id arg3, void * arg4); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_15 _ObjectiveCBindings_wrapBlockingBlock_1sr3ozv( +_ListenerTrampoline_15 _1wx624s_wrapBlockingBlock_1sr3ozv( _BlockingTrampoline_15 block, _BlockingTrampoline_15 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0, id arg1, id arg2, id arg3, void * arg4), { @@ -515,13 +515,13 @@ _ListenerTrampoline_15 _ObjectiveCBindings_wrapBlockingBlock_1sr3ozv( typedef void (^_ProtocolTrampoline_12)(void * sel, id arg1, id arg2, id arg3, void * arg4); __attribute__((visibility("default"))) __attribute__((used)) -void _ObjectiveCBindings_protocolTrampoline_1sr3ozv(id target, void * sel, id arg1, id arg2, id arg3, void * arg4) { +void _1wx624s_protocolTrampoline_1sr3ozv(id target, void * sel, id arg1, id arg2, id arg3, void * arg4) { return ((_ProtocolTrampoline_12)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2, arg3, arg4); } typedef void (^_ListenerTrampoline_16)(void * arg0, unsigned long arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_16 _ObjectiveCBindings_wrapListenerBlock_zuf90e(_ListenerTrampoline_16 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_16 _1wx624s_wrapListenerBlock_zuf90e(_ListenerTrampoline_16 block) NS_RETURNS_RETAINED { return ^void(void * arg0, unsigned long arg1) { objc_retainBlock(block); block(arg0, arg1); @@ -530,7 +530,7 @@ _ListenerTrampoline_16 _ObjectiveCBindings_wrapListenerBlock_zuf90e(_ListenerTra typedef void (^_BlockingTrampoline_16)(void * waiter, void * arg0, unsigned long arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_16 _ObjectiveCBindings_wrapBlockingBlock_zuf90e( +_ListenerTrampoline_16 _1wx624s_wrapBlockingBlock_zuf90e( _BlockingTrampoline_16 block, _BlockingTrampoline_16 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(void * arg0, unsigned long arg1), { @@ -544,7 +544,7 @@ _ListenerTrampoline_16 _ObjectiveCBindings_wrapBlockingBlock_zuf90e( typedef void (^_ListenerTrampoline_17)(unsigned short * arg0, unsigned long arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_17 _ObjectiveCBindings_wrapListenerBlock_vhbh5h(_ListenerTrampoline_17 block) NS_RETURNS_RETAINED { +_ListenerTrampoline_17 _1wx624s_wrapListenerBlock_vhbh5h(_ListenerTrampoline_17 block) NS_RETURNS_RETAINED { return ^void(unsigned short * arg0, unsigned long arg1) { objc_retainBlock(block); block(arg0, arg1); @@ -553,7 +553,7 @@ _ListenerTrampoline_17 _ObjectiveCBindings_wrapListenerBlock_vhbh5h(_ListenerTra typedef void (^_BlockingTrampoline_17)(void * waiter, unsigned short * arg0, unsigned long arg1); __attribute__((visibility("default"))) __attribute__((used)) -_ListenerTrampoline_17 _ObjectiveCBindings_wrapBlockingBlock_vhbh5h( +_ListenerTrampoline_17 _1wx624s_wrapBlockingBlock_vhbh5h( _BlockingTrampoline_17 block, _BlockingTrampoline_17 listenerBlock, DOBJC_Context* ctx) NS_RETURNS_RETAINED { BLOCKING_BLOCK_IMPL(ctx, ^void(unsigned short * arg0, unsigned long arg1), { @@ -567,35 +567,35 @@ _ListenerTrampoline_17 _ObjectiveCBindings_wrapBlockingBlock_vhbh5h( typedef id (^_ProtocolTrampoline_13)(void * sel, id arg1); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_xr62hr(id target, void * sel, id arg1) { +id _1wx624s_protocolTrampoline_xr62hr(id target, void * sel, id arg1) { return ((_ProtocolTrampoline_13)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef id (^_ProtocolTrampoline_14)(void * sel, struct _NSZone * arg1); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_18nsem0(id target, void * sel, struct _NSZone * arg1) { +id _1wx624s_protocolTrampoline_18nsem0(id target, void * sel, struct _NSZone * arg1) { return ((_ProtocolTrampoline_14)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef id (^_ProtocolTrampoline_15)(void * sel, struct objc_selector * arg1); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_50as9u(id target, void * sel, struct objc_selector * arg1) { +id _1wx624s_protocolTrampoline_50as9u(id target, void * sel, struct objc_selector * arg1) { return ((_ProtocolTrampoline_15)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1); } typedef id (^_ProtocolTrampoline_16)(void * sel, struct objc_selector * arg1, id arg2); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_1mllhpc(id target, void * sel, struct objc_selector * arg1, id arg2) { +id _1wx624s_protocolTrampoline_1mllhpc(id target, void * sel, struct objc_selector * arg1, id arg2) { return ((_ProtocolTrampoline_16)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2); } typedef id (^_ProtocolTrampoline_17)(void * sel, struct objc_selector * arg1, id arg2, id arg3); __attribute__((visibility("default"))) __attribute__((used)) -id _ObjectiveCBindings_protocolTrampoline_c7gk2u(id target, void * sel, struct objc_selector * arg1, id arg2, id arg3) { +id _1wx624s_protocolTrampoline_c7gk2u(id target, void * sel, struct objc_selector * arg1, id arg2, id arg3) { return ((_ProtocolTrampoline_17)((id (*)(id, SEL, SEL))objc_msgSend)(target, @selector(getDOBJCDartProtocolMethodForSelector:), sel))(sel, arg1, arg2, arg3); } -Protocol* _ObjectiveCBindings_Observer(void) { return @protocol(Observer); } +Protocol* _1wx624s_Observer(void) { return @protocol(Observer); } #undef BLOCKING_BLOCK_IMPL #pragma clang diagnostic pop diff --git a/pkgs/swiftgen/lib/src/generator.dart b/pkgs/swiftgen/lib/src/generator.dart index 71a2dfb59..0a06e7773 100644 --- a/pkgs/swiftgen/lib/src/generator.dart +++ b/pkgs/swiftgen/lib/src/generator.dart @@ -83,11 +83,7 @@ extension SwiftGenGenerator on SwiftGenerator { dartFile: output.dartFile, objectiveCFile: output.objectiveCFile, preamble: output.preamble, - style: fg.NativeExternalBindings( - assetId: output.assetId, - // ignore: deprecated_member_use - wrapperName: output.assetId ?? output.module, - ), + style: fg.NativeExternalBindings(assetId: output.assetId), ), functions: ffigen.functions, structs: ffigen.structs, From 238a5652e62d7aed0f2af471bc75d0864e539654 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Fri, 28 Nov 2025 11:10:52 +1100 Subject: [PATCH 3/3] changelog --- pkgs/ffigen/CHANGELOG.md | 5 +++++ pkgs/ffigen/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/ffigen/CHANGELOG.md b/pkgs/ffigen/CHANGELOG.md index f0498d6f5..4f5ee74f0 100644 --- a/pkgs/ffigen/CHANGELOG.md +++ b/pkgs/ffigen/CHANGELOG.md @@ -1,3 +1,8 @@ +## 21.0.0 + +- __Breaking change__: Remove deprecated `wrapperName` field from + `NativeExternalBindings`. + ## 20.1.1 - Update tests and examples now that package:objective_c is using native assets. diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml index da0af1b3e..8b50c2b92 100644 --- a/pkgs/ffigen/pubspec.yaml +++ b/pkgs/ffigen/pubspec.yaml @@ -3,7 +3,7 @@ # BSD-style license that can be found in the LICENSE file. name: ffigen -version: 20.1.1 +version: 21.0.0-wip description: > Generator for FFI bindings, using LibClang to parse C, Objective-C, and Swift files.