Globals

lib/src/code_generator/global.dart

@@ -2,6 +2,8 @@
 // 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:ffigen/src/code_generator/typedef.dart';
+
 import 'binding.dart';
 import 'binding_string.dart';
 import 'type.dart';
@@ -34,6 +36,21 @@ class Global extends LookUpBinding {
           dartDoc: dartDoc,
         );
 
+  List<Typedef>? _typedefDependencies;
+  @override
+  List<Typedef> getTypedefDependencies(Writer w) {
+    if (_typedefDependencies == null) {
+      _typedefDependencies = <Typedef>[];
+
+      // Add typedef's required by the variable's type.
+      final valueType = type.getBaseType();
+      if (valueType.broadType == BroadType.NativeFunction) {
+        _typedefDependencies!.addAll(valueType.nativeFunc!.getDependencies());
+      }
+    }
+    return _typedefDependencies!;
+  }
+
   @override
   BindingString toBindingString(Writer w) {
     final s = StringBuffer();
@@ -42,12 +59,9 @@ class Global extends LookUpBinding {
       s.write(makeDartDoc(dartDoc!));
     }
 
-    final holderVarName =
-        w.wrapperLevelUniqueNamer.makeUnique('_$globalVarName');
-    s.write(
-        '${w.ffiLibraryPrefix}.Pointer<${type.getCType(w)}> $holderVarName;\n');
+    final refOrValue = type.broadType == BroadType.Struct ? 'ref' : 'value';
     s.write(
-        "${type.getDartType(w)} get $globalVarName => ($holderVarName ??= ${w.dylibIdentifier}.lookup<${type.getCType(w)}>('$originalName')).value;\n\n");
+        "late final ${type.getDartType(w)} $globalVarName = ${w.dylibIdentifier}.lookup<${type.getCType(w)}>('$originalName').$refOrValue;\n\n");
 
     return BindingString(type: BindingStringType.global, string: s.toString());
   }

lib/src/config_provider/config.dart

@@ -51,6 +51,10 @@ class Config {
   Declaration get unnamedEnumConstants => _unnamedEnumConstants;
   late Declaration _unnamedEnumConstants;
 
+  /// Declaration config for Globals.
+  Declaration get globals => _globals;
+  late Declaration _globals;
+
   /// Declaration config for Macro constants.
   Declaration get macroDecl => _macroDecl;
   late Declaration _macroDecl;
@@ -222,6 +226,15 @@ class Config {
         extractedResult: (dynamic result) =>
             _unnamedEnumConstants = result as Declaration,
       ),
+      strings.globals: Specification<Declaration>(
+        requirement: Requirement.no,
+        validator: declarationConfigValidator,
+        extractor: declarationConfigExtractor,
+        defaultValue: () => Declaration(),
+        extractedResult: (dynamic result) {
+          _globals = result as Declaration;
+        },
+      ),
       strings.macros: Specification<Declaration>(
         requirement: Requirement.no,
         validator: declarationConfigValidator,

lib/src/header_parser/sub_parsers/var_parser.dart

@@ -0,0 +1,31 @@
+// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+// 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:ffigen/src/code_generator.dart';
+import 'package:ffigen/src/header_parser/data.dart';
+import 'package:logging/logging.dart';
+
+import '../clang_bindings/clang_bindings.dart' as clang_types;
+import '../data.dart';
+import '../utils.dart';
+
+final _logger = Logger('ffigen.header_parser.var_parser');
+
+/// Parses a global variable
+Global? parseVarDefinition(clang_types.CXCursor cursor) {
+  final type = cursor.type().toCodeGenType();
+  if (type.broadType == BroadType.Unimplemented) {
+    _logger
+        .warning('Global Type not supported $type ${cursor.type().spelling()}');
+    return null;
+  }
+  final g = Global(
+    originalName: cursor.spelling(),
+    name: config.globals.renameUsingConfig(cursor.spelling()),
+    usr: cursor.usr(),
+    type: cursor.type().toCodeGenType(),
+    dartDoc: getCursorDocComment(cursor),
+  );
+  return g;
+}

lib/src/header_parser/translation_unit_parser.dart

@@ -6,6 +6,7 @@ import 'dart:ffi';
 
 import 'package:ffigen/src/code_generator.dart';
 import 'package:ffigen/src/header_parser/sub_parsers/macro_parser.dart';
+import 'package:ffigen/src/header_parser/sub_parsers/var_parser.dart';
 import 'package:logging/logging.dart';
 
 import 'clang_bindings/clang_bindings.dart' as clang_types;
@@ -58,6 +59,9 @@ int _rootCursorVisitor(clang_types.CXCursor cursor, clang_types.CXCursor parent,
         case clang_types.CXCursorKind.CXCursor_MacroDefinition:
           saveMacroDefinition(cursor);
           break;
+        case clang_types.CXCursorKind.CXCursor_VarDecl:
+          addToBindings(parseVarDefinition(cursor));
+          break;
         default:
           _logger.finer('rootCursorVisitor: CursorKind not implemented');
       }

lib/src/strings.dart

@@ -39,6 +39,7 @@ const functions = 'functions';
 const structs = 'structs';
 const enums = 'enums';
 const unnamedEnums = 'unnamed-enums';
+const globals = 'globals';
 const macros = 'macros';
 
 // Sub-fields of Declarations.

test/code_generator_test.dart

@@ -436,14 +436,11 @@ final ffi.DynamicLibrary _dylib;
 /// The symbols are looked up in [dynamicLibrary].
 Bindings(ffi.DynamicLibrary dynamicLibrary): _dylib = dynamicLibrary;
 
-ffi.Pointer<ffi.Int32> _test1;
-int get test1 => (_test1 ??= _dylib.lookup<ffi.Int32>('test1')).value;
+late final int test1 = _dylib.lookup<ffi.Int32>('test1').value;
 
-ffi.Pointer<ffi.Pointer<ffi.Float>> _test2;
-ffi.Pointer<ffi.Float> get test2 => (_test2 ??= _dylib.lookup<ffi.Pointer<ffi.Float>>('test2')).value;
+late final ffi.Pointer<ffi.Float> test2 = _dylib.lookup<ffi.Pointer<ffi.Float>>('test2').value;
 
-ffi.Pointer<ffi.Pointer<Some>> _test5;
-ffi.Pointer<Some> get test5 => (_test5 ??= _dylib.lookup<ffi.Pointer<Some>>('test5')).value;
+late final ffi.Pointer<Some> test5 = _dylib.lookup<ffi.Pointer<Some>>('test5').value;
 
 }