Fix bug enum values in another header file (#31)

* Rename * Fix bug
bottlenoselabs · May 12, 2024 · 50253c7 · 50253c7
1 parent d520a26
commit 50253c7
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 19 deletions.
diff --git a/src/cs/c2ffi.sln b/src/cs/c2ffi.sln
@@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c2ffi.Tests.EndToEnd.Extrac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c2ffi.Data", "production\c2ffi.Data\c2ffi.Data.csproj", "{14BAF06A-F498-4B99-AD01-FA300EFFAB42}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c2ffi.Tests.Library", "tests\c2ffi.Tests.Library\c2ffi.Tests.Library.csproj", "{D8933EFB-2F00-4356-8F69-4438A9711DA3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c2ffi.Tests.Common", "tests\c2ffi.Tests.Common\c2ffi.Tests.Common.csproj", "{D8933EFB-2F00-4356-8F69-4438A9711DA3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c2ffi.Tests.EndToEnd.Merge", "tests\c2ffi.Tests.EndToEnd.Merge\c2ffi.Tests.EndToEnd.Merge.csproj", "{CEC639D4-F1FD-40BD-81B7-B20B2DE18EA1}"
 EndProject

diff --git a/src/cs/production/c2ffi.Tool/Commands/Extract/Infrastructure/Clang/ClangExtensions.cs b/src/cs/production/c2ffi.Tool/Commands/Extract/Infrastructure/Clang/ClangExtensions.cs
@@ -92,10 +92,10 @@ public static bool IsSignedPrimitive(this CXType clangType)
         }
 
         public static ImmutableArray<CXCursor> GetDescendents(
-            this CXCursor cursor, VisitChildPredicate? predicate = null, bool mustBeFromSameFile = true)
+            this CXCursor cursor, VisitChildPredicate? predicate = null)
         {
             var predicate2 = predicate ?? EmptyVisitChildPredicate;
-            var visitData = new VisitChildInstance(predicate2, mustBeFromSameFile);
+            var visitData = new VisitChildInstance(predicate2);
             var visitsCount = Interlocked.Increment(ref _visitChildCount);
             if (visitsCount > _visitChildInstances.Length)
             {
@@ -155,17 +155,6 @@ private static CXChildVisitResult VisitChild(CXCursor child, CXCursor parent, CX
             }
 
             var data = _visitChildInstances[index - 1];
-
-            if (data.MustBeFromSameFile)
-            {
-                var location = clang_getCursorLocation(child);
-                var isFromMainFile = clang_Location_isFromMainFile(location) > 0;
-                if (!isFromMainFile)
-                {
-                    return CXChildVisitResult.CXChildVisit_Continue;
-                }
-            }
-
             var result = data.Predicate(child, parent);
             if (!result)
             {
@@ -195,13 +184,11 @@ private readonly struct VisitChildInstance
         {
             public readonly VisitChildPredicate Predicate;
             public readonly ImmutableArray<CXCursor>.Builder CursorBuilder;
-            public readonly bool MustBeFromSameFile;
 
-            public VisitChildInstance(VisitChildPredicate predicate, bool mustBeFromSameFile)
+            public VisitChildInstance(VisitChildPredicate predicate)
             {
                 Predicate = predicate;
                 CursorBuilder = ImmutableArray.CreateBuilder<CXCursor>();
-                MustBeFromSameFile = mustBeFromSameFile;
             }
         }
 

diff --git a/...Library/Assertions/CTestTypeAssertions.cs → ....Common/Assertions/CTestTypeAssertions.cs b/...Library/Assertions/CTestTypeAssertions.cs → ....Common/Assertions/CTestTypeAssertions.cs
diff --git a/...s.Library/CTestTypeAssertionExtensions.cs → ...ts.Common/CTestTypeAssertionExtensions.cs b/...s.Library/CTestTypeAssertionExtensions.cs → ...ts.Common/CTestTypeAssertionExtensions.cs
diff --git a/...Tests.Library/Helpers/FileSystemHelper.cs → ....Tests.Common/Helpers/FileSystemHelper.cs b/...Tests.Library/Helpers/FileSystemHelper.cs → ....Tests.Common/Helpers/FileSystemHelper.cs
diff --git a/...s/c2ffi.Tests.Library/Models/CTestEnum.cs → ...ts/c2ffi.Tests.Common/Models/CTestEnum.cs b/...s/c2ffi.Tests.Library/Models/CTestEnum.cs → ...ts/c2ffi.Tests.Common/Models/CTestEnum.cs
diff --git a/...fi.Tests.Library/Models/CTestEnumValue.cs → ...ffi.Tests.Common/Models/CTestEnumValue.cs b/...fi.Tests.Library/Models/CTestEnumValue.cs → ...ffi.Tests.Common/Models/CTestEnumValue.cs
diff --git a/...s.Library/Models/CTestFfiCrossPlatform.cs → ...ts.Common/Models/CTestFfiCrossPlatform.cs b/...s.Library/Models/CTestFfiCrossPlatform.cs → ...ts.Common/Models/CTestFfiCrossPlatform.cs
diff --git a/....Library/Models/CTestFfiTargetPlatform.cs → ...s.Common/Models/CTestFfiTargetPlatform.cs b/....Library/Models/CTestFfiTargetPlatform.cs → ...s.Common/Models/CTestFfiTargetPlatform.cs
diff --git a/...ffi.Tests.Library/Models/CTestFunction.cs → ...2ffi.Tests.Common/Models/CTestFunction.cs b/...ffi.Tests.Library/Models/CTestFunction.cs → ...2ffi.Tests.Common/Models/CTestFunction.cs
diff --git a/....Library/Models/CTestFunctionParameter.cs → ...s.Common/Models/CTestFunctionParameter.cs b/....Library/Models/CTestFunctionParameter.cs → ...s.Common/Models/CTestFunctionParameter.cs
diff --git a/...ts.Library/Models/CTestFunctionPointer.cs → ...sts.Common/Models/CTestFunctionPointer.cs b/...ts.Library/Models/CTestFunctionPointer.cs → ...sts.Common/Models/CTestFunctionPointer.cs
diff --git a/...y/Models/CTestFunctionPointerParameter.cs → ...n/Models/CTestFunctionPointerParameter.cs b/...y/Models/CTestFunctionPointerParameter.cs → ...n/Models/CTestFunctionPointerParameter.cs
diff --git a/....Tests.Library/Models/CTestMacroObject.cs → ...i.Tests.Common/Models/CTestMacroObject.cs b/....Tests.Library/Models/CTestMacroObject.cs → ...i.Tests.Common/Models/CTestMacroObject.cs
diff --git a/...i.Tests.Library/Models/CTestOpaqueType.cs → ...fi.Tests.Common/Models/CTestOpaqueType.cs b/...i.Tests.Library/Models/CTestOpaqueType.cs → ...fi.Tests.Common/Models/CTestOpaqueType.cs
diff --git a/...c2ffi.Tests.Library/Models/CTestRecord.cs → .../c2ffi.Tests.Common/Models/CTestRecord.cs b/...c2ffi.Tests.Library/Models/CTestRecord.cs → .../c2ffi.Tests.Common/Models/CTestRecord.cs
diff --git a/....Tests.Library/Models/CTestRecordField.cs → ...i.Tests.Common/Models/CTestRecordField.cs b/....Tests.Library/Models/CTestRecordField.cs → ...i.Tests.Common/Models/CTestRecordField.cs
diff --git a/...s/c2ffi.Tests.Library/Models/CTestType.cs → ...ts/c2ffi.Tests.Common/Models/CTestType.cs b/...s/c2ffi.Tests.Library/Models/CTestType.cs → ...ts/c2ffi.Tests.Common/Models/CTestType.cs
diff --git a/...fi.Tests.Library/Models/CTestTypeAlias.cs → ...ffi.Tests.Common/Models/CTestTypeAlias.cs b/...fi.Tests.Library/Models/CTestTypeAlias.cs → ...ffi.Tests.Common/Models/CTestTypeAlias.cs
diff --git a/...ffi.Tests.Library/Models/CTestVariable.cs → ...2ffi.Tests.Common/Models/CTestVariable.cs b/...ffi.Tests.Library/Models/CTestVariable.cs → ...2ffi.Tests.Common/Models/CTestVariable.cs
diff --git a/src/cs/tests/c2ffi.Tests.Library/TestHost.cs → src/cs/tests/c2ffi.Tests.Common/TestHost.cs b/src/cs/tests/c2ffi.Tests.Library/TestHost.cs → src/cs/tests/c2ffi.Tests.Common/TestHost.cs
diff --git a/....Tests.Library/c2ffi.Tests.Library.csproj → ...fi.Tests.Common/c2ffi.Tests.Common.csproj b/....Tests.Library/c2ffi.Tests.Library.csproj → ...fi.Tests.Common/c2ffi.Tests.Common.csproj
diff --git a/src/cs/tests/c2ffi.Tests.EndToEnd.Extract/c2ffi.Tests.EndToEnd.Extract.csproj b/src/cs/tests/c2ffi.Tests.EndToEnd.Extract/c2ffi.Tests.EndToEnd.Extract.csproj
@@ -13,7 +13,7 @@
 
   <!-- Project references -->
   <ItemGroup>
-    <ProjectReference Include="..\c2ffi.Tests.Library\c2ffi.Tests.Library.csproj" />
+    <ProjectReference Include="..\c2ffi.Tests.Common\c2ffi.Tests.Common.csproj" />
   </ItemGroup>
 
   <!-- NuGet package references -->

diff --git a/src/cs/tests/c2ffi.Tests.EndToEnd.Merge/c2ffi.Tests.EndToEnd.Merge.csproj b/src/cs/tests/c2ffi.Tests.EndToEnd.Merge/c2ffi.Tests.EndToEnd.Merge.csproj
@@ -13,7 +13,7 @@
 
   <!-- Project references -->
   <ItemGroup>
-    <ProjectReference Include="..\c2ffi.Tests.Library\c2ffi.Tests.Library.csproj" />
+    <ProjectReference Include="..\c2ffi.Tests.Common\c2ffi.Tests.Common.csproj" />
   </ItemGroup>
 
   <!-- NuGet package references -->