Fixes from #1175 that are not related to protocols (#1184)

dart-lang · May 31, 2024 · 2b3240e · 2b3240e
1 parent 4f3e4d8
commit 2b3240e
Show file tree

Hide file tree

Showing 5 changed files with 1,071 additions and 705 deletions.
diff --git a/pkgs/ffigen/lib/src/header_parser/sub_parsers/objcinterfacedecl_parser.dart b/pkgs/ffigen/lib/src/header_parser/sub_parsers/objcinterfacedecl_parser.dart
@@ -81,7 +81,7 @@ bool _isClassDeclaration(clang_types.CXCursor cursor) {
   // It's a class declaration if it has no children other than ObjCClassRef.
   bool result = true;
   cursor.visitChildrenMayBreak((child) {
-    if (cursor.kind == clang_types.CXCursorKind.CXCursor_ObjCClassRef) {
+    if (child.kind == clang_types.CXCursorKind.CXCursor_ObjCClassRef) {
       return true;
     }
     result = false;

diff --git a/pkgs/ffigen/lib/src/header_parser/utils.dart b/pkgs/ffigen/lib/src/header_parser/utils.dart
@@ -184,14 +184,14 @@ extension CXCursorExt on clang_types.CXCursor {
   bool visitChildrenMayRecurse(
       int Function(clang_types.CXCursor child, clang_types.CXCursor parent)
           callback) {
-    final protocolVisitor = NativeCallable<_CursorVisitorCallback>.isolateLocal(
+    final visitor = NativeCallable<_CursorVisitorCallback>.isolateLocal(
         (clang_types.CXCursor child, clang_types.CXCursor parent,
                 Pointer<Void> clientData) =>
             callback(child, parent),
         exceptionalReturn: exceptional_visitor_return);
-    final result = clang.clang_visitChildren(
-        this, protocolVisitor.nativeFunction, nullptr);
-    protocolVisitor.close();
+    final result =
+        clang.clang_visitChildren(this, visitor.nativeFunction, nullptr);
+    visitor.close();
     return result == 0;
   }
 
@@ -214,13 +214,12 @@ extension CXCursorExt on clang_types.CXCursor {
 
   /// Recursively print the AST, for debugging.
   void printAst([int maxDepth = 3]) => _printAst(maxDepth, 0);
-  bool _printAst(int maxDepth, int depth) {
+  void _printAst(int maxDepth, int depth) {
     if (depth > maxDepth) {
-      return false;
+      return;
     }
     print(('  ' * depth) + completeStringRepr());
     visitChildren((child) => child._printAst(maxDepth, depth + 1));
-    return true;
   }
 }
 

diff --git a/pkgs/objective_c/CHANGELOG.md b/pkgs/objective_c/CHANGELOG.md
@@ -4,6 +4,7 @@
   implementing ObjC protocols from Dart. Also adds `DartProxyBuilder` for
   constructing `DartProxy`.
 - Add some extensions methods for `NSMutableData`.
+- Fix the `NSError` bindings so that they're not empty.
 
 ## 1.0.1