[ffigen] Config update part 3: renaming visitor

pkgs/ffigen/lib/ffigen.dart

@@ -55,3 +55,5 @@ export 'src/config_provider.dart'
         macSdkUri,
         xcodePath,
         xcodeUri;
+export 'src/public_ast.dart';
+export 'src/public_visitor.dart';

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../config_provider/config_types.dart' show Declaration;
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'scope.dart';
@@ -61,6 +62,9 @@ abstract class Binding extends AstNode implements Declaration {
   /// Returns the Cpp glue code for this binding, if any.
   String? toCppBindingString(Writer w) => null;
 
+  /// Returns the public AST node wrapper for this binding, or null.
+  public_ast.AstNode? toPublicAstNode() => null;
+
   @override
   void visit(Visitation visitation) => visitation.visitBinding(this);
 

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

@@ -252,21 +252,21 @@ class CompoundMember extends AstNode {
   final String originalName;
   final Type type;
 
-  final Symbol _symbol;
-  String get name => _symbol.name;
+  final Symbol symbol;
+  String get name => symbol.name;
 
   CompoundMember({
     String? originalName,
     required String name,
     required this.type,
     this.dartDoc,
   }) : originalName = originalName ?? name,
-       _symbol = Symbol(name, SymbolKind.field);
+       symbol = Symbol(name, SymbolKind.field);
 
   @override
   void visitChildren(Visitor visitor) {
     super.visitChildren(visitor);
-    visitor.visit(_symbol);
+    visitor.visit(symbol);
     visitor.visit(type);
   }
 }

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding.dart';
 import 'binding_string.dart';
@@ -76,6 +77,9 @@ class UnnamedEnumConstant extends Constant {
     super.apiAvailability,
   });
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.UnnamedEnumConstant(this);
+
   @override
   void visit(Visitation visitation) =>
       visitation.visitUnnamedEnumConstant(this);
@@ -93,6 +97,9 @@ class MacroConstant extends Constant {
     super.apiAvailability,
   });
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.MacroConstant(this);
+
   @override
   void visit(Visitation visitation) => visitation.visitMacroConstant(this);
 }

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

@@ -4,6 +4,7 @@
 
 import '../code_generator.dart';
 import '../context.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 
 import 'binding_string.dart';
@@ -80,6 +81,9 @@ class CppClass extends BindingType with HasLocalScope {
     required this.fields,
   });
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.CppClass(this);
+
   @override
   void visit(Visitation visitation) => visitation.visitCppClass(this);
 

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

@@ -7,6 +7,7 @@ import 'package:collection/collection.dart';
 import '../config_provider.dart';
 import '../context.dart';
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'imports.dart';
@@ -72,6 +73,10 @@ class EnumClass extends BindingType with HasLocalScope {
   }) : nativeType = nativeType ?? intType,
        enumConstants = enumConstants ?? [];
 
+  @override
+  public_ast.AstNode? toPublicAstNode() =>
+      isAnonymous ? null : public_ast.EnumClass(this);
+
   /// Returns a string to declare the enum member and any documentation it may
   /// have had.
   String _formatValue(EnumConstant ec, {bool asInt = false}) {
@@ -300,20 +305,20 @@ class EnumConstant extends AstNode {
   final String? dartDoc;
   final int value;
 
-  final Symbol _symbol;
-  String get name => _symbol.name;
+  final Symbol symbol;
+  String get name => symbol.name;
 
   EnumConstant({
     String? originalName,
     required String name,
     required this.value,
     this.dartDoc,
   }) : originalName = originalName ?? name,
-       _symbol = Symbol(name, SymbolKind.field);
+       symbol = Symbol(name, SymbolKind.field);
 
   @override
   void visitChildren(Visitor visitor) {
     super.visitChildren(visitor);
-    visitor.visit(_symbol);
+    visitor.visit(symbol);
   }
 }

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

@@ -5,6 +5,7 @@
 import '../code_generator.dart';
 import '../context.dart';
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'local_variables.dart';
@@ -107,6 +108,9 @@ class Func extends LookUpBinding with HasLocalScope {
     }
   }
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.Func(this);
+
   @override
   BindingString toBindingString(Writer w) {
     final s = StringBuffer();

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

@@ -2,6 +2,7 @@
 // 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 '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding.dart';
 import 'binding_string.dart';
@@ -43,6 +44,9 @@ class Global extends LookUpBinding with HasLocalScope {
     this.loadFromNativeAsset = false,
   }) : super(symbol: Symbol(name, SymbolKind.field));
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.Global(this);
+
   @override
   BindingString toBindingString(Writer w) {
     final s = StringBuffer();

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

@@ -5,6 +5,7 @@
 import '../code_generator.dart';
 import '../context.dart';
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'scope.dart';
@@ -45,6 +46,9 @@ class ObjCCategory extends NoLookUpBinding with ObjCMethods, HasLocalScope {
   bool get isObjCImport =>
       context.objCBuiltInFunctions.isBuiltInCategory(originalName);
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.ObjCCategory(this);
+
   @override
   BindingString toBindingString(Writer w) {
     final s = StringBuffer();

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

@@ -5,6 +5,7 @@
 import '../code_generator.dart';
 import '../context.dart';
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'local_variables.dart';
@@ -19,7 +20,7 @@ class ObjCInterface extends BindingType with ObjCMethods, HasLocalScope {
   bool filled = false;
 
   final String? module;
-  late final NoLookUpBinding classObject;
+  late final ObjCClassGlobal classObject;
   late final ObjCInternalGlobal _isKindOfClass;
   late final ObjCMsgSendFunc _isKindOfClassMsgSend;
   final protocols = <ObjCProtocol>[];
@@ -108,6 +109,9 @@ class ObjCInterface extends BindingType with ObjCMethods, HasLocalScope {
 
   bool get unavailable => apiAvailability.availability == Availability.none;
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.ObjCInterface(this);
+
   @override
   BindingString toBindingString(Writer w) {
     final context = w.context;

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

@@ -324,6 +324,8 @@ class ObjCMethod extends AstNode with HasLocalScope {
   bool get isProperty =>
       kind == ObjCMethodKind.propertyGetter ||
       kind == ObjCMethodKind.propertySetter;
+  bool get isPropertyGetter => kind == ObjCMethodKind.propertyGetter;
+  bool get isPropertySetter => kind == ObjCMethodKind.propertySetter;
   bool get isRequired => !isOptional;
   bool get isInstanceMethod => !isClassMethod;
   bool get unavailable => apiAvailability.availability == Availability.none;

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

@@ -5,6 +5,7 @@
 import '../code_generator.dart';
 import '../context.dart';
 import '../header_parser/sub_parsers/api_availability.dart';
+import '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
 import 'local_variables.dart';
@@ -71,6 +72,9 @@ class ObjCProtocol extends BindingType with ObjCMethods, HasLocalScope {
 
   bool get unavailable => apiAvailability.availability == Availability.none;
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.ObjCProtocol(this);
+
   @override
   BindingString toBindingString(Writer w) {
     final protocolClass = ObjCBuiltInFunctions.protocolClass.gen(context);

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

@@ -2,6 +2,7 @@
 // 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 '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 
 import 'compound.dart';
@@ -48,6 +49,9 @@ class Struct extends Compound {
   @override
   int? pack;
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.Struct(this);
+
   @override
   void visit(Visitation visitation) => visitation.visitStruct(this);
 }

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

@@ -4,6 +4,7 @@
 
 import '../code_generator.dart';
 import '../context.dart';
+import '../public_ast.dart' as public_ast;
 import '../strings.dart' as strings;
 import '../visitor/ast.dart';
 import 'binding_string.dart';
@@ -106,6 +107,9 @@ class Typealias extends BindingType {
     return pointee.type;
   }
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.Typealias(this);
+
   @override
   BindingString toBindingString(Writer w) {
     assert(!isAnonymous);

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

@@ -2,6 +2,7 @@
 // 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 '../public_ast.dart' as public_ast;
 import '../visitor/ast.dart';
 
 import 'compound.dart';
@@ -45,6 +46,9 @@ class Union extends Compound {
   @override
   int? get pack => null;
 
+  @override
+  public_ast.AstNode? toPublicAstNode() => public_ast.Union(this);
+
   @override
   void visit(Visitation visitation) => visitation.visitUnion(this);
 }