Merge pull request #103 from hadashiA/ku/fix-unintended-skip

Allow YamlSerializer to be used in the middle of yaml
hadashiA · Apr 18, 2024 · 1eddcf3 · 1eddcf3
2 parents d5a0ad6 + 2b63865
commit 1eddcf3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Parser/YamlParser.cs b/VYaml.Unity/Assets/VYaml/Runtime/Parser/YamlParser.cs
@@ -264,6 +264,17 @@ public void ReadWithVerify(ParseEventType eventType)
             Read();
         }
 
+        public void SkipHeader()
+        {
+            while (CurrentEventType is ParseEventType.StreamStart or ParseEventType.DocumentStart or ParseEventType.Nothing)
+            {
+                if (!Read())
+                {
+                    break;
+                }
+            }
+        }
+
         public void SkipAfter(ParseEventType eventType)
         {
             while (CurrentEventType != eventType)

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlSerializer.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/YamlSerializer.cs
@@ -130,7 +130,7 @@ public static T Deserialize<T>(ref YamlParser parser, YamlSerializerOptions? opt
             var contextLocal = GetThreadLocalDeserializationContext(options);
             contextLocal.Reset();
 
-            parser.SkipAfter(ParseEventType.DocumentStart);
+            parser.SkipHeader();
 
             var formatter = options.Resolver.GetFormatterWithVerify<T>();
             return contextLocal.DeserializeWithAlias(formatter, ref parser);

diff --git a/VYaml/Parser/YamlParser.cs b/VYaml/Parser/YamlParser.cs
@@ -264,6 +264,17 @@ public void ReadWithVerify(ParseEventType eventType)
             Read();
         }
 
+        public void SkipHeader()
+        {
+            while (CurrentEventType is ParseEventType.StreamStart or ParseEventType.DocumentStart or ParseEventType.Nothing)
+            {
+                if (!Read())
+                {
+                    break;
+                }
+            }
+        }
+
         public void SkipAfter(ParseEventType eventType)
         {
             while (CurrentEventType != eventType)

diff --git a/VYaml/Serialization/YamlSerializer.cs b/VYaml/Serialization/YamlSerializer.cs
@@ -130,7 +130,7 @@ public static T Deserialize<T>(ref YamlParser parser, YamlSerializerOptions? opt
             var contextLocal = GetThreadLocalDeserializationContext(options);
             contextLocal.Reset();
 
-            parser.SkipAfter(ParseEventType.DocumentStart);
+            parser.SkipHeader();
 
             var formatter = options.Resolver.GetFormatterWithVerify<T>();
             return contextLocal.DeserializeWithAlias(formatter, ref parser);