Merge pull request #341 from saucecontrol/funcacc

Allow private access specifiers on functions
dotnet · Apr 28, 2022 · 9538cce · 9538cce
2 parents fa1e00b + 7ab85a4
commit 9538cce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sources/ClangSharp.PInvokeGenerator/CSharp/CSharpOutputBuilder.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/CSharp/CSharpOutputBuilder.VisitDecl.cs
@@ -445,7 +445,7 @@ public void BeginFunctionOrDelegate(in FunctionOrDelegateDesc desc, ref bool isM
             }
             else
             {
-                WriteIndented(GetAccessSpecifierString(desc.AccessSpecifier, isNested: false));
+                WriteIndented(GetAccessSpecifierString(desc.AccessSpecifier, isNested: true));
                 Write(' ');
             }
 

diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -491,7 +491,7 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
                 return;
             }
 
-            var accessSppecifier = GetAccessSpecifier(functionDecl);
+            var accessSpecifier = GetAccessSpecifier(functionDecl);
 
             var body = functionDecl.Body;
             var hasBody = body is not null;
@@ -530,7 +530,7 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
             var needsReturnFixup = isCxxMethodDecl && NeedsReturnFixup(cxxMethodDecl);
 
             var desc = new FunctionOrDelegateDesc {
-                AccessSpecifier = accessSppecifier,
+                AccessSpecifier = accessSpecifier,
                 NativeTypeName = nativeTypeName,
                 EscapedName = escapedName,
                 ParentName = parentName,
@@ -3677,7 +3677,7 @@ private bool IsPrimitiveValue(Type type)
             {
                 return IsPrimitiveValue(autoType.CanonicalType);
             }
-            else if (type is BuiltinType builtinType)
+            else if (type is BuiltinType)
             {
                 switch (type.Kind)
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    WriteIndented(GetAccessSpecifierString(desc.AccessSpecifier, isNested: false));
+                    WriteIndented(GetAccessSpecifierString(desc.AccessSpecifier, isNested: true));
                     Write(' ');
                 }
@@ Expand Down @@