Review feedback

dart-lang · Jan 2, 2024 · b9a548f · b9a548f
1 parent d4b1388
commit b9a548f
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 15 deletions.
diff --git a/pkgs/ffigen/example/ffinative/headers/example.h b/pkgs/ffigen/example/ffinative/headers/example.h
@@ -17,7 +17,9 @@ float *divide(int a, int b);
 /** Divides 2 floats, returns a pointer to double. */
 double *dividePrecision(float a, float b);
 
-const int array[10];
+int log_level = -1;
+
+const int array[5] = {0, 1, 2, 3, 4};
 
 /** Version of the native C library */
 const char* const library_version = "1.0.0-native";
diff --git a/pkgs/ffigen/example/ffinative/lib/generated_bindings.dart b/pkgs/ffigen/example/ffinative/lib/generated_bindings.dart
@@ -51,7 +51,11 @@ external ffi.Pointer<ffi.Double> dividePrecision(
   double b,
 );
 
-@ffi.Array(10)
+@ffi.Native<ffi.Int>(
+    assetId: 'package:ffinative_example/generated_bindings.dart')
+external int log_level;
+
+@ffi.Array(5)
 @ffi.Native<ffi.Array<ffi.Int>>(
     assetId: 'package:ffinative_example/generated_bindings.dart')
 external ffi.Array<ffi.Int> array;
@@ -60,6 +64,7 @@ external ffi.Array<ffi.Int> array;
 @ffi.Native<ffi.Pointer<ffi.Char>>(
     assetId: 'package:ffinative_example/generated_bindings.dart')
 external final ffi.Pointer<ffi.Char> library_version;
+
 const _SymbolAddresses addresses = _SymbolAddresses();
 
 class _SymbolAddresses {

diff --git a/pkgs/ffigen/example/ffinative/pubspec.yaml b/pkgs/ffigen/example/ffinative/pubspec.yaml
@@ -5,7 +5,7 @@
 name: ffinative_example
 
 environment:
-  sdk: '>=3.3.0-dev <4.0.0'
+  sdk: '>=3.3.0-252.0.dev <4.0.0'
 
 dependencies:
   ffi: ^2.0.1

diff --git a/pkgs/ffigen/lib/src/code_generator/func.dart b/pkgs/ffigen/lib/src/code_generator/func.dart
@@ -150,7 +150,8 @@ class Func extends LookUpBinding {
 ${makeNativeAnnotation(
         w,
         nativeType: cType,
-        differentName: originalName != nativeFuncName ? originalName : null,
+        dartName: nativeFuncName,
+        nativeSymbolName: originalName,
         assetId: ffiNativeConfig.assetId,
         isLeaf: isLeaf,
       )}

diff --git a/pkgs/ffigen/lib/src/code_generator/global.dart b/pkgs/ffigen/lib/src/code_generator/global.dart
@@ -58,15 +58,16 @@ class Global extends LookUpBinding {
           w,
           nativeType: cType,
           assetId: nativeConfig.assetId,
-          differentName: globalVarName != originalName ? originalName : null,
+          dartName: globalVarName,
+          nativeSymbolName: originalName,
           isLeaf: false,
         ))
         ..write('external ');
       if (constant) {
         s.write('final ');
       }
 
-      s.writeln('$dartType $globalVarName;');
+      s.writeln('$dartType $globalVarName;\n');
 
       if (exposeSymbolAddress) {
         w.symbolAddressWriter.addNativeSymbol(

diff --git a/pkgs/ffigen/lib/src/code_generator/utils.dart b/pkgs/ffigen/lib/src/code_generator/utils.dart
@@ -84,13 +84,14 @@ String makeDoc(String text) {
 String makeNativeAnnotation(
   Writer w, {
   required String? nativeType,
-  String? differentName,
+  required String dartName,
+  required String nativeSymbolName,
   String? assetId,
   bool isLeaf = false,
 }) {
   final args = <(String, String)>[];
-  if (differentName != null) {
-    args.add(('symbol', '"$differentName"'));
+  if (dartName != nativeSymbolName) {
+    args.add(('symbol', '"$nativeSymbolName"'));
   }
   if (assetId != null) {
     args.add(('assetId', "'$assetId'"));

diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml
@@ -14,7 +14,7 @@ topics:
   - codegen
 
 environment:
-  sdk: '>=3.3.0-0 <4.0.0'
+  sdk: '>=3.3.0-252.0.dev'
 
 dependencies:
   ffi: ^2.0.1

diff --git a/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart b/pkgs/ffigen/test/code_generator_tests/code_generator_test.dart
@@ -519,14 +519,21 @@ void main() {
         ]),
         Union(name: 'WithArray', members: [
           Member(
-              name: 'a', type: ConstantArray(10, charType, useArrayType: true)),
+            name: 'a',
+            type: ConstantArray(10, charType, useArrayType: true),
+          ),
           Member(
-              name: 'b', type: ConstantArray(10, union1, useArrayType: true)),
+            name: 'b',
+            type: ConstantArray(10, union1, useArrayType: true),
+          ),
           Member(
-              name: 'b', type: ConstantArray(10, struct1, useArrayType: true)),
+            name: 'b',
+            type: ConstantArray(10, struct1, useArrayType: true),
+          ),
           Member(
-              name: 'c',
-              type: ConstantArray(10, PointerType(union1), useArrayType: true)),
+            name: 'c',
+            type: ConstantArray(10, PointerType(union1), useArrayType: true),
+          ),
         ]),
       ],
     );

diff --git a/.../ffigen/test/code_generator_tests/expected_bindings/_expected_global_native_bindings.dart b/.../ffigen/test/code_generator_tests/expected_bindings/_expected_global_native_bindings.dart
@@ -10,13 +10,17 @@ import 'dart:ffi' as ffi;
 
 @ffi.Native<ffi.Int32>()
 external int test1;
+
 @ffi.Native<ffi.Pointer<ffi.Float>>()
 external final ffi.Pointer<ffi.Float> test2;
+
 @ffi.Array(10)
 @ffi.Native<ffi.Array<ffi.Float>>()
 external final ffi.Array<ffi.Float> test3;
+
 @ffi.Native<ffi.Pointer<Some>>()
 external ffi.Pointer<Some> test5;
+
 @ffi.Native<EmptyStruct>()
 external EmptyStruct globalStruct;