nino v2.0.4

Nino.Serialization v2.0.4 - [Fix] Fix compilation error for subclasses having members with identical names #127
JasonXuDeveloper · Jul 19, 2024 · ad54d55 · ad54d55
1 parent 086e438
commit ad54d55
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/src/Nino.Core/Nino.Core.csproj b/src/Nino.Core/Nino.Core.csproj
@@ -7,17 +7,16 @@
         <LangVersion>9</LangVersion>
         <PackageId>Nino.Serialization</PackageId>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>2.0.3</Version>
+        <Version>2.0.4</Version>
         <Title>Nino.Serialization</Title>
         <Authors>JasonXuDeveloper</Authors>
         <Description>High performance and low size binary serialization solution, especially for Unity.</Description>
         <Copyright>JasonXuDeveloper</Copyright>
         <RepositoryUrl>https://github.com/JasonXuDeveloper/Nino</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>Nino;Serialization;Binary</PackageTags>
-        <PackageReleaseNotes>Nino.Serialization v2.0.3
-- [Fix] Fix complilation error for special assembly names
-- [Optimisation] Faster deserialisation</PackageReleaseNotes>
+        <PackageReleaseNotes>Nino.Serialization v2.0.4
+- [Fix] Fix complilation error for subclasses having members with identical names</PackageReleaseNotes>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://nino.xgamedev.net/</PackageProjectUrl>
     </PropertyGroup>

diff --git a/src/Nino.Generator/DeserializerGenerator.cs b/src/Nino.Generator/DeserializerGenerator.cs
@@ -167,7 +167,9 @@ void WriteMembers(List<MemberDeclarationSyntax> members, string valName)
                             sb.AppendLine($"                    Deserialize(out {valName}.{name}, ref reader);");
                         else
                         {
-                            var tempName = $"temp_{name}";
+                            var t = declaredType.ToDisplayString().Select(c => char.IsLetterOrDigit(c) ? c : '_')
+                                .Aggregate("", (a, b) => a + b);
+                            var tempName = $"{t}_temp_{name}";
                             sb.AppendLine(
                                 $"                    Deserialize(out {declaredType.ToDisplayString()} {tempName}, ref reader);");
                             sb.AppendLine($"                    {valName}.{name} = {tempName};");
@@ -210,6 +212,7 @@ void WriteMembers(List<MemberDeclarationSyntax> members, string valName)
                     string valName = subType.Replace(".", "_").ToLower();
                     int id = GetId(subType);
                     sb.AppendLine($"                case {id}:");
+                    sb.AppendLine("                {");
                     sb.AppendLine($"                    {subType} {valName} = new {subType}();");
 
 
@@ -223,13 +226,16 @@ void WriteMembers(List<MemberDeclarationSyntax> members, string valName)
                     WriteMembers(members, valName);
                     sb.AppendLine($"                    value = {valName};");
                     sb.AppendLine("                    return;");
+                    sb.AppendLine("                }");
                 }
 
                 sb.AppendLine($"                case {GetId(typeFullName)}:");
+                sb.AppendLine("                {");
                 sb.AppendLine($"                    value = new {typeFullName}();");
                 var defaultMembers = model.GetNinoTypeMembers(null);
                 WriteMembers(defaultMembers, "value");
                 sb.AppendLine("                    return;");
+                sb.AppendLine("                }");
 
                 sb.AppendLine("                default:");
                 sb.AppendLine(

diff --git a/src/Nino.Generator/Nino.Generator.csproj b/src/Nino.Generator/Nino.Generator.csproj
@@ -10,17 +10,16 @@
         <RootNamespace>Nino.Generator</RootNamespace>
         <PackageId>Nino.Generator</PackageId>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>2.0.3</Version>
+        <Version>2.0.4</Version>
         <Title>Nino.Generator</Title>
         <Authors>JasonXuDeveloper</Authors>
         <Description>Source Generator for the high performance and low size binary serialization solution, especially for Unity.</Description>
         <Copyright>JasonXuDeveloper</Copyright>
         <RepositoryUrl>https://github.com/JasonXuDeveloper/Nino</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>Nino;Serialization;Binary;Generator</PackageTags>
-        <PackageReleaseNotes>Nino.Serialization v2.0.3
-- [Fix] Fix complilation error for special assembly names
-- [Optimisation] Faster deserialisation</PackageReleaseNotes>
+        <PackageReleaseNotes>Nino.Serialization v2.0.4
+- [Fix] Fix complilation error for subclasses having members with identical names</PackageReleaseNotes>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <AnalyzerLanguage>cs</AnalyzerLanguage>
         <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/src/Nino/Nino.csproj b/src/Nino/Nino.csproj
@@ -7,17 +7,16 @@
         <IncludeContentInPack>true</IncludeContentInPack>
         <PackageId>Nino</PackageId>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>2.0.3</Version>
+        <Version>2.0.4</Version>
         <Title>Nino</Title>
         <Authors>JasonXuDeveloper</Authors>
         <Description>High performance and low size binary serialization solution, especially for Unity.</Description>
         <Copyright>JasonXuDeveloper</Copyright>
         <RepositoryUrl>https://github.com/JasonXuDeveloper/Nino</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>Nino;Serialization;Binary</PackageTags>
-        <PackageReleaseNotes>Nino.Serialization v2.0.3
-- [Fix] Fix complilation error for special assembly names
-- [Optimisation] Faster deserialisation</PackageReleaseNotes>
+        <PackageReleaseNotes>Nino.Serialization v2.0.4
+- [Fix] Fix complilation error for subclasses having members with identical names</PackageReleaseNotes>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://nino.xgamedev.net/</PackageProjectUrl>
     </PropertyGroup>