Merge pull request #44 from Cysharp/hadashiA/fix-net8

neuecc · web-flow · commit 3ac1cc815c45 · 2024-02-03T18:28:10.000+09:00
Fix compilation errors in .net8 with explicit static members
diff --git a/sandbox/ConsoleApp/ConsoleApp.csproj b/sandbox/ConsoleApp/ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
diff --git a/sandbox/FileGenerate/FileGenerate.csproj b/sandbox/FileGenerate/FileGenerate.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 
 		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
 		<CompilerGeneratedFilesOutputPath>$(ProjectDir)..\Generated</CompilerGeneratedFilesOutputPath>
diff --git a/sandbox/FileGenerate/SimplePrimitive.cs b/sandbox/FileGenerate/SimplePrimitive.cs
@@ -1,4 +1,5 @@
-﻿using UnitGenerator;
+﻿using System;
+using UnitGenerator;
 
 namespace FileGenerate
 {
@@ -11,12 +12,16 @@ public readonly partial struct A
     public readonly partial struct B
     {
     }
-    
+
     [UnitOf(typeof(int), UnitGenerateOptions.Comparable | UnitGenerateOptions.ArithmeticOperator | UnitGenerateOptions.ValueArithmeticOperator | UnitGenerateOptions.ParseMethod)]
     public readonly partial struct C
     {
     }
 
+    [UnitOf(typeof(Guid), UnitGenerateOptions.Comparable | UnitGenerateOptions.ParseMethod)]
+    public readonly partial struct D
+    {
+    }
 
     [UnitOf<int>]
     public readonly partial struct Aa
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.A.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.A.g.cs
@@ -18,6 +18,7 @@ readonly partial struct A
 #endif
 #if NET8_0_OR_GREATER
         , IEqualityOperators<A, A, bool>
+        , IUtf8SpanFormattable
 #endif
     {
         readonly int value;
@@ -83,6 +84,11 @@ public override int GetHashCode()
         public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider) => 
             ((ISpanFormattable)value).TryFormat(destination, out charsWritten, format, provider);
 #endif
+#if NET8_0_OR_GREATER        
+        public bool TryFormat (Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format, IFormatProvider? provider) =>
+            ((IUtf8SpanFormattable)value).TryFormat(utf8Destination, out bytesWritten, format, provider);
+#endif
+
         // Default
         
         private class ATypeConverter : System.ComponentModel.TypeConverter
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Aa.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Aa.g.cs
@@ -12,10 +12,14 @@ namespace FileGenerate
     [System.ComponentModel.TypeConverter(typeof(AaTypeConverter))]
     readonly partial struct Aa 
         : IEquatable<Aa>
-#if NET7_0_OR_GREATER
-        , IEqualityOperators<Aa, Aa, bool>
-#endif    
         , IFormattable
+#if NET6_0_OR_GREATER
+        , ISpanFormattable
+#endif
+#if NET8_0_OR_GREATER
+        , IEqualityOperators<Aa, Aa, bool>
+        , IUtf8SpanFormattable
+#endif
     {
         readonly int value;
 
@@ -76,6 +80,15 @@ public override int GetHashCode()
 
         public string ToString(string? format, IFormatProvider? formatProvider) => value.ToString(format, formatProvider);
 
+#if NET6_0_OR_GREATER
+        public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider) => 
+            ((ISpanFormattable)value).TryFormat(destination, out charsWritten, format, provider);
+#endif
+#if NET8_0_OR_GREATER        
+        public bool TryFormat (Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format, IFormatProvider? provider) =>
+            ((IUtf8SpanFormattable)value).TryFormat(utf8Destination, out bytesWritten, format, provider);
+#endif
+
         // Default
         
         private class AaTypeConverter : System.ComponentModel.TypeConverter
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Bb.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Bb.g.cs
@@ -12,9 +12,9 @@ namespace FileGenerate
     [System.ComponentModel.TypeConverter(typeof(BbTypeConverter))]
     readonly partial struct Bb 
         : IEquatable<Bb>
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
         , IEqualityOperators<Bb, Bb, bool>
-#endif    
+#endif
     {
         readonly string value;
 
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.C.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.C.g.cs
@@ -19,8 +19,6 @@ readonly partial struct C
 #endif
 #if NET7_0_OR_GREATER
         , IComparisonOperators<C, C, bool>
-        , IParsable<C>
-        , ISpanParsable<C>
         , IAdditionOperators<C, C, C>
         , ISubtractionOperators<C, C, C>
         , IMultiplyOperators<C, C, C>
@@ -32,7 +30,7 @@ readonly partial struct C
 #endif
 #if NET8_0_OR_GREATER
         , IEqualityOperators<C, C, bool>
-        , IUtf8SpanParsable<C>
+        , IUtf8SpanFormattable
 #endif
     {
         readonly int value;
@@ -98,6 +96,11 @@ public override int GetHashCode()
         public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider) => 
             ((ISpanFormattable)value).TryFormat(destination, out charsWritten, format, provider);
 #endif
+#if NET8_0_OR_GREATER        
+        public bool TryFormat (Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format, IFormatProvider? provider) =>
+            ((IUtf8SpanFormattable)value).TryFormat(utf8Destination, out bytesWritten, format, provider);
+#endif
+
         // UnitGenerateOptions.ParseMethod
         
         public static C Parse(string s)
@@ -119,69 +122,6 @@ public static bool TryParse(string s, out C result)
             }
         }
 
-#if NET7_0_OR_GREATER
-        public static C Parse(string s, IFormatProvider? provider)
-        {
-            return new C(int.Parse(s, provider));
-        }
- 
-        public static bool TryParse(string s, IFormatProvider? provider, out C result)
-        {
-            if (int.TryParse(s, provider, out var r))
-            {
-                result = new C(r);
-                return true;
-            }
-            else
-            {
-                result = default(C);
-                return false;
-            }
-        }
-#endif
-
-#if NET7_0_OR_GREATER
-        public static C Parse(ReadOnlySpan<char> s, IFormatProvider? provider)
-        {
-            return new C(int.Parse(s, provider));
-        }
- 
-        public static bool TryParse(ReadOnlySpan<char> s, IFormatProvider? provider, out C result)
-        {
-            if (int.TryParse(s, provider, out var r))
-            {
-                result = new C(r);
-                return true;
-            }
-            else
-            {
-                result = default(C);
-                return false;
-            }
-        }
-#endif
-
-#if NET8_0_OR_GREATER
-        public static C Parse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider)
-        {
-            return new C(int.Parse(utf8Text, provider));
-        }
- 
-        public static bool TryParse(ReadOnlySpan<byte> utf8Text, IFormatProvider? provider, out C result)
-        {
-            if (int.TryParse(utf8Text, provider, out var r))
-            {
-                result = new C(r);
-                return true;
-            }
-            else
-            {
-                result = default(C);
-                return false;
-            }
-        }
-#endif
-
         // UnitGenerateOptions.ArithmeticOperator
         
         public static C operator +(C x, C y)
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Cc.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.Cc.g.cs
@@ -12,15 +12,13 @@ namespace FileGenerate
     [System.ComponentModel.TypeConverter(typeof(CcTypeConverter))]
     readonly partial struct Cc 
         : IEquatable<Cc>
-#if NET7_0_OR_GREATER
-        , IEqualityOperators<Cc, Cc, bool>
-#endif    
         , IComparable<Cc>
-#if NET7_0_OR_GREATER
-        , IComparisonOperators<Cc, Cc, bool>
-#endif
         , IFormattable
+#if NET6_0_OR_GREATER
+        , ISpanFormattable
+#endif
 #if NET7_0_OR_GREATER
+        , IComparisonOperators<Cc, Cc, bool>
         , IAdditionOperators<Cc, Cc, Cc>
         , ISubtractionOperators<Cc, Cc, Cc>
         , IMultiplyOperators<Cc, Cc, Cc>
@@ -29,6 +27,10 @@ readonly partial struct Cc
         , IUnaryNegationOperators<Cc, Cc>
         , IIncrementOperators<Cc>
         , IDecrementOperators<Cc>
+#endif
+#if NET8_0_OR_GREATER
+        , IEqualityOperators<Cc, Cc, bool>
+        , IUtf8SpanFormattable
 #endif
     {
         readonly int value;
@@ -90,6 +92,15 @@ public override int GetHashCode()
 
         public string ToString(string? format, IFormatProvider? formatProvider) => value.ToString(format, formatProvider);
 
+#if NET6_0_OR_GREATER
+        public bool TryFormat(Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider? provider) => 
+            ((ISpanFormattable)value).TryFormat(destination, out charsWritten, format, provider);
+#endif
+#if NET8_0_OR_GREATER        
+        public bool TryFormat (Span<byte> utf8Destination, out int bytesWritten, ReadOnlySpan<char> format, IFormatProvider? provider) =>
+            ((IUtf8SpanFormattable)value).TryFormat(utf8Destination, out bytesWritten, format, provider);
+#endif
+
         // UnitGenerateOptions.ArithmeticOperator
         
         public static Cc operator +(Cc x, Cc y)
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.D.g.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/FileGenerate.D.g.cs
diff --git a/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/UnitOfAttribute.cs b/sandbox/Generated/UnitGenerator/UnitGenerator.SourceGenerator/UnitOfAttribute.cs
diff --git a/src/UnitGenerator/SourceGenerator.cs b/src/UnitGenerator/SourceGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using UnitGenerator;`
	`1`	`+using System;`
	`2`	`+using UnitGenerator;`
`2`	`3`
`3`	`4`	`namespace FileGenerate`
`4`	`5`	`{`
`@@ -11,12 +12,16 @@ public readonly partial struct A`
`11`	`12`	`public readonly partial struct B`
`12`	`13`	`{`
`13`	`14`	`}`
`14`		`-`
	`15`	`+`
`15`	`16`	`[UnitOf(typeof(int), UnitGenerateOptions.Comparable \| UnitGenerateOptions.ArithmeticOperator \| UnitGenerateOptions.ValueArithmeticOperator \| UnitGenerateOptions.ParseMethod)]`
`16`	`17`	`public readonly partial struct C`
`17`	`18`	`{`
`18`	`19`	`}`
`19`	`20`
	`21`	`+ [UnitOf(typeof(Guid), UnitGenerateOptions.Comparable \| UnitGenerateOptions.ParseMethod)]`
	`22`	`+ public readonly partial struct D`
	`23`	`+ {`
	`24`	`+ }`
`20`	`25`
`21`	`26`	`[UnitOf<int>]`
`22`	`27`	`public readonly partial struct Aa`