[ffigen] Separate Symbols into distinct kinds (#2675)

Author: liamappelbe

pkgs/ffigen/example/libclang-example/generated_bindings.dart

@@ -49,8 +49,8 @@ class LibClang {
       .asFunction<DartClang_disposeString>();
 
   /// Free the given string set.
-  void clang_disposeStringSet(ffi.Pointer<CXStringSet> set$) {
-    return _clang_disposeStringSet(set$);
+  void clang_disposeStringSet(ffi.Pointer<CXStringSet> set) {
+    return _clang_disposeStringSet(set);
   }
 
   late final _clang_disposeStringSetPtr =

pkgs/ffigen/example/objective_c/avf_audio_bindings.dart

@@ -672,11 +672,11 @@ class AVAudioPlayer extends objc.NSObject {
   }
 
   /// allocWithZone:
-  static AVAudioPlayer allocWithZone(ffi.Pointer<objc.NSZone> zone$1) {
+  static AVAudioPlayer allocWithZone(ffi.Pointer<objc.NSZone> zone) {
     final $ret = _objc_msgSend_1cwp428(
       _class_AVAudioPlayer,
       _sel_allocWithZone_,
-      zone$1,
+      zone,
     );
     return AVAudioPlayer.castFromPointer($ret, retain: false, release: true);
   }
@@ -844,7 +844,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
 
   /// initWithContentsOfURL:error:
   AVAudioPlayer? initWithContentsOfURL(
-    objc.NSURL url$1, {
+    objc.NSURL url, {
     required ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error,
   }) {
     objc.checkOsVersionInternal(
@@ -855,7 +855,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
     final $ret = _objc_msgSend_1lhpu4m(
       this.ref.retainAndReturnPointer(),
       _sel_initWithContentsOfURL_error_,
-      url$1.ref.pointer,
+      url.ref.pointer,
       error,
     );
     return $ret.address == 0
@@ -865,7 +865,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
 
   /// initWithContentsOfURL:fileTypeHint:error:
   AVAudioPlayer? initWithContentsOfURL$1(
-    objc.NSURL url$1, {
+    objc.NSURL url, {
     objc.NSString? fileTypeHint,
     required ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error,
   }) {
@@ -877,7 +877,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
     final $ret = _objc_msgSend_1pnyuds(
       this.ref.retainAndReturnPointer(),
       _sel_initWithContentsOfURL_fileTypeHint_error_,
-      url$1.ref.pointer,
+      url.ref.pointer,
       fileTypeHint?.ref.pointer ?? ffi.nullptr,
       error,
     );
@@ -888,7 +888,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
 
   /// initWithData:error:
   AVAudioPlayer? initWithData(
-    objc.NSData data$1, {
+    objc.NSData data, {
     required ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error,
   }) {
     objc.checkOsVersionInternal(
@@ -899,7 +899,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
     final $ret = _objc_msgSend_1lhpu4m(
       this.ref.retainAndReturnPointer(),
       _sel_initWithData_error_,
-      data$1.ref.pointer,
+      data.ref.pointer,
       error,
     );
     return $ret.address == 0
@@ -909,7 +909,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
 
   /// initWithData:fileTypeHint:error:
   AVAudioPlayer? initWithData$1(
-    objc.NSData data$1, {
+    objc.NSData data, {
     objc.NSString? fileTypeHint,
     required ffi.Pointer<ffi.Pointer<objc.ObjCObject>> error,
   }) {
@@ -921,7 +921,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
     final $ret = _objc_msgSend_1pnyuds(
       this.ref.retainAndReturnPointer(),
       _sel_initWithData_fileTypeHint_error_,
-      data$1.ref.pointer,
+      data.ref.pointer,
       fileTypeHint?.ref.pointer ?? ffi.nullptr,
       error,
     );
@@ -1199,7 +1199,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
   }
 
   /// setVolume:fadeDuration:
-  void setVolume(double volume$1, {required double fadeDuration}) {
+  void setVolume(double volume, {required double fadeDuration}) {
     objc.checkOsVersionInternal(
       'AVAudioPlayer.setVolume:fadeDuration:',
       iOS: (false, (10, 0, 0)),
@@ -1208,7 +1208,7 @@ extension AVAudioPlayer$Methods on AVAudioPlayer {
     _objc_msgSend_1p4uk9e(
       this.ref.pointer,
       _sel_setVolume_fadeDuration_,
-      volume$1,
+      volume,
       fadeDuration,
     );
   }

pkgs/ffigen/example/swift/swift_api_bindings.dart

@@ -141,11 +141,11 @@ class SwiftClass extends objc.NSObject {
   }
 
   /// allocWithZone:
-  static SwiftClass allocWithZone(ffi.Pointer<objc.NSZone> zone$1) {
+  static SwiftClass allocWithZone(ffi.Pointer<objc.NSZone> zone) {
     final $ret = _objc_msgSend_1cwp428(
       _class_SwiftClass,
       _sel_allocWithZone_,
-      zone$1,
+      zone,
     );
     return SwiftClass.castFromPointer($ret, retain: false, release: true);
   }

pkgs/ffigen/lib/src/code_generator/binding.dart

@@ -40,10 +40,10 @@ abstract class Binding extends AstNode implements Declaration {
   Binding({
     required this.usr,
     required this.originalName,
-    required String name,
+    required Symbol symbol,
     this.dartDoc,
     this.isInternal = false,
-  }) : _symbol = Symbol(name);
+  }) : _symbol = symbol;
 
   /// Converts a Binding to its actual string representation.
   ///
@@ -72,10 +72,13 @@ abstract class LookUpBinding extends Binding {
   LookUpBinding({
     String? usr,
     String? originalName,
-    required super.name,
+    required super.symbol,
     super.dartDoc,
     super.isInternal,
-  }) : super(usr: usr ?? name, originalName: originalName ?? name);
+  }) : super(
+         usr: usr ?? symbol.oldName,
+         originalName: originalName ?? symbol.oldName,
+       );
 
   @override
   void visit(Visitation visitation) => visitation.visitLookUpBinding(this);
@@ -88,10 +91,13 @@ abstract class NoLookUpBinding extends Binding {
   NoLookUpBinding({
     String? usr,
     String? originalName,
-    required super.name,
+    required super.symbol,
     super.dartDoc,
     super.isInternal,
-  }) : super(usr: usr ?? name, originalName: originalName ?? name);
+  }) : super(
+         usr: usr ?? symbol.oldName,
+         originalName: originalName ?? symbol.oldName,
+       );
 
   @override
   void visit(Visitation visitation) => visitation.visitNoLookUpBinding(this);

pkgs/ffigen/lib/src/code_generator/compound.dart

@@ -167,7 +167,7 @@ class CompoundMember extends AstNode {
     required this.type,
     this.dartDoc,
   }) : originalName = originalName ?? name,
-       _symbol = Symbol(name);
+       _symbol = Symbol(name, SymbolKind.field);
 
   @override
   void visitChildren(Visitor visitor) {

pkgs/ffigen/lib/src/code_generator/constant.dart

@@ -5,6 +5,7 @@
 import '../visitor/ast.dart';
 import 'binding.dart';
 import 'binding_string.dart';
+import 'scope.dart';
 import 'utils.dart';
 import 'writer.dart';
 
@@ -31,11 +32,11 @@ class Constant extends NoLookUpBinding {
   Constant({
     super.usr,
     super.originalName,
-    required super.name,
+    required String name,
     super.dartDoc,
     required this.rawType,
     required this.rawValue,
-  });
+  }) : super(symbol: Symbol(name, SymbolKind.field));
 
   @override
   BindingString toBindingString(Writer w) {

pkgs/ffigen/lib/src/code_generator/dart_keywords.dart

@@ -301,7 +301,7 @@ class EnumConstant extends AstNode {
     required this.value,
     this.dartDoc,
   }) : originalName = originalName ?? name,
-       _symbol = Symbol(name);
+       _symbol = Symbol(name, SymbolKind.field);
 
   @override
   void visitChildren(Visitor visitor) {

pkgs/ffigen/lib/src/code_generator/enum_class.dart

@@ -75,10 +75,10 @@ class Func extends LookUpBinding with HasLocalScope {
          parameters: parameters,
          varArgParameters: varArgParameters,
        ),
-       super(name: name) {
+       super(symbol: Symbol(name, SymbolKind.method)) {
     for (var i = 0; i < functionType.parameters.length; i++) {
       if (functionType.parameters[i].symbol.oldName.isEmpty) {
-        functionType.parameters[i].symbol = Symbol('arg$i');
+        functionType.parameters[i].symbol = Symbol('arg$i', SymbolKind.field);
       }
     }
 
@@ -250,7 +250,7 @@ class Parameter extends AstNode {
     required Type type,
     required this.objCConsumed,
   }) : originalName = originalName ?? name,
-       symbol = Symbol(name),
+       symbol = Symbol(name, SymbolKind.field),
        // A [NativeFunc] is wrapped with a pointer because this is a shorthand
        // used in C for Pointer to function.
        type = type.typealiasType is NativeFunc ? PointerType(type) : type;

pkgs/ffigen/lib/src/code_generator/func.dart

@@ -8,6 +8,7 @@ import 'binding_string.dart';
 import 'compound.dart';
 import 'imports.dart';
 import 'pointer.dart';
+import 'scope.dart';
 import 'type.dart';
 import 'utils.dart';
 import 'writer.dart';
@@ -33,13 +34,13 @@ class Global extends LookUpBinding {
   Global({
     super.usr,
     super.originalName,
-    required super.name,
+    required String name,
     required this.type,
     super.dartDoc,
     this.exposeSymbolAddress = false,
     this.constant = false,
     this.loadFromNativeAsset = false,
-  });
+  }) : super(symbol: Symbol(name, SymbolKind.field));
 
   @override
   BindingString toBindingString(Writer w) {