this is a commit message

dart-lang · Sep 25, 2024 · f6d4df3 · f6d4df3
1 parent 9eba708
commit f6d4df3
Show file tree

Hide file tree

Showing 5 changed files with 14,172 additions and 6,954 deletions.
diff --git a/pkgs/ffigen/lib/src/code_generator/library.dart b/pkgs/ffigen/lib/src/code_generator/library.dart
@@ -40,7 +40,8 @@ class Library {
   }) {
     _findBindings(bindings, sort);
 
-    final codeGenBindings = bindings.where((b) => b.generateBindings).toList();
+    final codeGenBindings =
+        this.bindings.where((b) => b.generateBindings).toList();
 
     /// Handle any declaration-declaration name conflicts and emit warnings.
     final declConflictHandler = UniqueNamer({});

diff --git a/pkgs/objective_c/lib/src/c_bindings_generated.dart b/pkgs/objective_c/lib/src/c_bindings_generated.dart
@@ -37,45 +37,30 @@ external int Dart_InitializeApiDL(
   ffi.Pointer<ffi.Void> data,
 );
 
-@ffi.Native<ffi.Pointer<ObjCSelector> Function(ffi.Pointer<ffi.Char>)>(
-    symbol: "sel_registerName", isLeaf: true)
-external ffi.Pointer<ObjCSelector> registerName(
-  ffi.Pointer<ffi.Char> name,
-);
-
-@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ffi.Char>)>(
-    symbol: "objc_getClass", isLeaf: true)
-external ffi.Pointer<ObjCObject> getClass(
-  ffi.Pointer<ffi.Char> name,
-);
+@ffi.Array.multi([32])
+@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteAutoBlock")
+external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteAutoBlock;
 
-@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
-    symbol: "objc_retain", isLeaf: true)
-external ffi.Pointer<ObjCObject> objectRetain(
-  ffi.Pointer<ObjCObject> object,
-);
+@ffi.Array.multi([32])
+@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(
+    symbol: "_NSConcreteFinalizingBlock")
+external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteFinalizingBlock;
 
-@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
-    symbol: "objc_retainBlock", isLeaf: true)
-external ffi.Pointer<ObjCObject> blockRetain(
-  ffi.Pointer<ObjCObject> object,
-);
+@ffi.Array.multi([32])
+@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteGlobalBlock")
+external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteGlobalBlock;
 
-@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCObject>)>(
-    symbol: "objc_release", isLeaf: true)
-external void objectRelease(
-  ffi.Pointer<ObjCObject> object,
-);
+@ffi.Array.multi([32])
+@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteMallocBlock")
+external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteMallocBlock;
 
-@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
-    symbol: "objc_autorelease", isLeaf: true)
-external ffi.Pointer<ObjCObject> objectAutorelease(
-  ffi.Pointer<ObjCObject> object,
-);
+@ffi.Array.multi([32])
+@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteStackBlock")
+external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteStackBlock;
 
 @ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
-    symbol: "object_getClass", isLeaf: true)
-external ffi.Pointer<ObjCObject> getObjectClass(
+    symbol: "objc_retainBlock", isLeaf: true)
+external ffi.Pointer<ObjCObject> blockRetain(
   ffi.Pointer<ObjCObject> object,
 );
 
@@ -87,39 +72,20 @@ external ffi.Pointer<ffi.Pointer<ObjCObject>> copyClassList(
   ffi.Pointer<ffi.UnsignedInt> count,
 );
 
-@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend")
-external void msgSend();
-
-@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend_fpret")
-external void msgSendFpret();
-
-@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend_stret")
-external void msgSendStret();
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteStackBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteStackBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteMallocBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteMallocBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteAutoBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteAutoBlock;
-
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(
-    symbol: "_NSConcreteFinalizingBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteFinalizingBlock;
+@ffi.Native<ffi.Void Function(Dart_FinalizableHandle, ffi.Handle)>()
+external void deleteFinalizableHandle(
+  Dart_FinalizableHandle handle,
+  Object owner,
+);
 
-@ffi.Array.multi([32])
-@ffi.Native<ffi.Array<ffi.Pointer<ffi.Void>>>(symbol: "_NSConcreteGlobalBlock")
-external ffi.Array<ffi.Pointer<ffi.Void>> NSConcreteGlobalBlock;
+@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCBlockImpl>)>()
+external void disposeObjCBlockWithClosure(
+  ffi.Pointer<ObjCBlockImpl> block,
+);
 
-@ffi.Native<ffi.Pointer<ObjCProtocol> Function(ffi.Pointer<ffi.Char>)>(
-    symbol: "objc_getProtocol", isLeaf: true)
-external ffi.Pointer<ObjCProtocol> getProtocol(
+@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ffi.Char>)>(
+    symbol: "objc_getClass", isLeaf: true)
+external ffi.Pointer<ObjCObject> getClass(
   ffi.Pointer<ffi.Char> name,
 );
 
@@ -136,43 +102,79 @@ external ObjCMethodDesc getMethodDescription(
   bool isInstanceMethod,
 );
 
-@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCBlockImpl>)>()
-external void disposeObjCBlockWithClosure(
-  ffi.Pointer<ObjCBlockImpl> block,
+@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
+    symbol: "object_getClass", isLeaf: true)
+external ffi.Pointer<ObjCObject> getObjectClass(
+  ffi.Pointer<ObjCObject> object,
+);
+
+@ffi.Native<ffi.Pointer<ObjCProtocol> Function(ffi.Pointer<ffi.Char>)>(
+    symbol: "objc_getProtocol", isLeaf: true)
+external ffi.Pointer<ObjCProtocol> getProtocol(
+  ffi.Pointer<ffi.Char> name,
 );
 
 @ffi.Native<ffi.Bool Function(ffi.Pointer<ObjCBlockImpl>)>(isLeaf: true)
 external bool isValidBlock(
   ffi.Pointer<ObjCBlockImpl> block,
 );
 
+@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend")
+external void msgSend();
+
+@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend_fpret")
+external void msgSendFpret();
+
+@ffi.Native<ffi.Void Function()>(symbol: "objc_msgSend_stret")
+external void msgSendStret();
+
+@ffi.Native<ffi.Pointer<ffi.Bool> Function(ffi.Handle)>()
+external ffi.Pointer<ffi.Bool> newFinalizableBool(
+  Object owner,
+);
+
 @ffi.Native<
     Dart_FinalizableHandle Function(ffi.Handle, ffi.Pointer<ObjCObject>)>()
 external Dart_FinalizableHandle newFinalizableHandle(
   Object owner,
   ffi.Pointer<ObjCObject> object,
 );
 
-@ffi.Native<ffi.Void Function(Dart_FinalizableHandle, ffi.Handle)>()
-external void deleteFinalizableHandle(
-  Dart_FinalizableHandle handle,
-  Object owner,
+@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
+    symbol: "objc_autorelease", isLeaf: true)
+external ffi.Pointer<ObjCObject> objectAutorelease(
+  ffi.Pointer<ObjCObject> object,
 );
 
-@ffi.Native<ffi.Pointer<ffi.Bool> Function(ffi.Handle)>()
-external ffi.Pointer<ffi.Bool> newFinalizableBool(
-  Object owner,
+@ffi.Native<ffi.Void Function(ffi.Pointer<ObjCObject>)>(
+    symbol: "objc_release", isLeaf: true)
+external void objectRelease(
+  ffi.Pointer<ObjCObject> object,
 );
 
-final class _Dart_Handle extends ffi.Opaque {}
+@ffi.Native<ffi.Pointer<ObjCObject> Function(ffi.Pointer<ObjCObject>)>(
+    symbol: "objc_retain", isLeaf: true)
+external ffi.Pointer<ObjCObject> objectRetain(
+  ffi.Pointer<ObjCObject> object,
+);
 
-final class _Dart_FinalizableHandle extends ffi.Opaque {}
+@ffi.Native<ffi.Pointer<ObjCSelector> Function(ffi.Pointer<ffi.Char>)>(
+    symbol: "sel_registerName", isLeaf: true)
+external ffi.Pointer<ObjCSelector> registerName(
+  ffi.Pointer<ffi.Char> name,
+);
 
-final class _ObjCSelector extends ffi.Opaque {}
+typedef Dart_FinalizableHandle = ffi.Pointer<_Dart_FinalizableHandle>;
+typedef ObjCBlockDesc = _ObjCBlockDesc;
+typedef ObjCBlockImpl = _ObjCBlockImpl;
+typedef ObjCMethodDesc = _ObjCMethodDesc;
+typedef ObjCObject = _ObjCObject;
+typedef ObjCProtocol = _ObjCProtocol;
+typedef ObjCSelector = _ObjCSelector;
 
-final class _ObjCObject extends ffi.Opaque {}
+final class _Dart_FinalizableHandle extends ffi.Opaque {}
 
-final class _ObjCProtocol extends ffi.Opaque {}
+final class _Dart_Handle extends ffi.Opaque {}
 
 final class _ObjCBlockDesc extends ffi.Struct {
   @ffi.UnsignedLong()
@@ -218,3 +220,9 @@ final class _ObjCMethodDesc extends ffi.Struct {
 
   external ffi.Pointer<ffi.Char> types;
 }
+
+final class _ObjCObject extends ffi.Opaque {}
+
+final class _ObjCProtocol extends ffi.Opaque {}
+
+final class _ObjCSelector extends ffi.Opaque {}