Make ClangSharp self-hosting by duplicating ...

Generated.cs is now duplicated inside ClangSharpPInvokeGenerator so that it can self hosted.
dotnet · Feb 23, 2015 · 7ae9c88 · 7ae9c88
1 parent 70a4208
commit 7ae9c88
Show file tree

Hide file tree

Showing 10 changed files with 2,077 additions and 115 deletions.
diff --git a/ClangSharp/ClangSharp.csproj → ClangSharp.csproj b/ClangSharp/ClangSharp.csproj → ClangSharp.csproj
diff --git a/ClangSharp.sln b/ClangSharp.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangSharp", "ClangSharp\ClangSharp.csproj", "{6091B9F6-D75E-4457-BF5B-89076FCB262B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangSharp", "ClangSharp.csproj", "{6091B9F6-D75E-4457-BF5B-89076FCB262B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClangSharpPInvokeGenerator", "ClangSharpPInvokeGenerator\ClangSharpPInvokeGenerator.csproj", "{FF792C72-8F27-474E-B6AD-9D3F646BC98D}"
 EndProject

diff --git a/ClangSharp/ClangSharp.sln b/ClangSharp/ClangSharp.sln
diff --git a/ClangSharp/Properties/AssemblyInfo.cs b/ClangSharp/Properties/AssemblyInfo.cs
diff --git a/ClangSharp/Extensions.cs → ...PInvokeGenerator/ClangSharp.Extensions.cs b/ClangSharp/Extensions.cs → ...PInvokeGenerator/ClangSharp.Extensions.cs
diff --git a/ClangSharpPInvokeGenerator/ClangSharpPInvokeGenerator.csproj b/ClangSharpPInvokeGenerator/ClangSharpPInvokeGenerator.csproj
@@ -36,28 +36,16 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClangSharp.Extensions.cs" />
+    <Compile Include="Generated.cs" />
     <Compile Include="EnumVisitor.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="ForwardDeclarationVisitor.cs" />
     <Compile Include="ICXCursorVisitor.cs" />
     <Compile Include="TypeDefVisitor.cs" />
     <Compile Include="FunctionVisitor.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StructVisitor.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ClangSharp\ClangSharp.csproj">
-      <Project>{6091b9f6-d75e-4457-bf5b-89076fcb262b}</Project>
-      <Name>ClangSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/ClangSharp/Generated.cs → ClangSharpPInvokeGenerator/Generated.cs b/ClangSharp/Generated.cs → ClangSharpPInvokeGenerator/Generated.cs
diff --git a/ClangSharpPInvokeGenerator/Properties/AssemblyInfo.cs b/ClangSharpPInvokeGenerator/Properties/AssemblyInfo.cs
diff --git a/Extensions.cs b/Extensions.cs
@@ -0,0 +1,38 @@
+namespace ClangSharp
+{
+    using System.Runtime.InteropServices;
+
+    public partial struct CXString
+    {
+        public override string ToString()
+        {
+            string retval = Marshal.PtrToStringAnsi(this.data);
+            clang.disposeString(this);
+            return retval;
+        }
+    }
+
+    public partial struct CXType
+    {
+        public override string ToString()
+        {
+            return clang.getTypeSpelling(this).ToString();
+        }
+    }
+
+    public partial struct CXCursor
+    {
+        public override string ToString()
+        {
+            return clang.getCursorSpelling(this).ToString();
+        }
+    }
+
+    public partial struct CXDiagnostic
+    {
+        public override string ToString()
+        {
+            return clang.getDiagnosticSpelling(this).ToString();
+        }
+    }
+}