Merge pull request #59 from hadashiA/ku/default-value-from-ctor2

Fix default value handling
hadashiA · Nov 4, 2023 · b334da4 · b334da4
2 parents 3883264 + 9fcd256
commit b334da4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/VYaml.SourceGenerator.Roslyn3/VYamlSourceGenerator.cs b/VYaml.SourceGenerator.Roslyn3/VYamlSourceGenerator.cs
@@ -427,7 +427,26 @@ static bool TryEmitDeserializeMethod(
         codeWriter.AppendLine();
         foreach (var memberMeta in typeMeta.MemberMetas)
         {
-            codeWriter.AppendLine($"var __{memberMeta.Name}__ = default({memberMeta.FullTypeName});");
+            codeWriter.Append($"var __{memberMeta.Name}__ = ");
+            if (memberMeta.HasExplicitDefaultValueFromConstructor)
+            {
+                switch (memberMeta.ExplicitDefaultValueFromConstructor)
+                {
+                    case null:
+                        codeWriter.AppendLine("null;", false);
+                        break;
+                    case string stringValue:
+                        codeWriter.AppendLine($"\"{stringValue}\";", false);
+                        break;
+                    case {} anyValue:
+                        codeWriter.AppendLine($"{anyValue};", false);
+                        break;
+                }
+            }
+            else
+            {
+                codeWriter.AppendLine($"default({memberMeta.FullTypeName});", false);
+            }
         }
 
         using (codeWriter.BeginBlockScope("while (!parser.End && parser.CurrentEventType != ParseEventType.MappingEnd)"))
@@ -639,4 +658,4 @@ static bool TryGetConstructor(
         constructedMembers = parameterMembers;
         return !error;
     }
-}
+}
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/VYaml.SourceGenerator.Roslyn3.dll b/VYaml.Unity/Assets/VYaml/Runtime/VYaml.SourceGenerator.Roslyn3.dll