Use ValueTokenizerHelper in generated structs/collections

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/DoubleCollection.cs

@@ -724,14 +724,14 @@ public static DoubleCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             DoubleCollection resource = new DoubleCollection();
 
             double value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
-                value = double.Parse(th.GetCurrentTokenAsSpan(), formatProvider);
+                value = double.Parse(tokenizer.GetCurrentToken(), formatProvider);
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/GradientStopCollection.cs

@@ -804,16 +804,16 @@ public static GradientStopCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             GradientStopCollection resource = new GradientStopCollection();
 
             GradientStop value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
                 value = new GradientStop(
-                    Parsers.ParseColor(th.GetCurrentToken(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    Parsers.ParseColor(tokenizer.GetCurrentToken().ToString(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/Int32Collection.cs

@@ -724,14 +724,14 @@ public static Int32Collection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             Int32Collection resource = new Int32Collection();
 
             int value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
-                value = Int32.Parse(th.GetCurrentTokenAsSpan(), formatProvider);
+                value = Int32.Parse(tokenizer.GetCurrentToken(), formatProvider);
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/PointCollection.cs

@@ -724,16 +724,16 @@ public static PointCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             PointCollection resource = new PointCollection();
 
             Point value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
                 value = new Point(
-                    double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.GetCurrentToken(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Generated/VectorCollection.cs

@@ -724,16 +724,16 @@ public static VectorCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             VectorCollection resource = new VectorCollection();
 
             Vector value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
                 value = new Vector(
-                    double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.GetCurrentToken(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Matrix3D.cs

@@ -226,11 +226,11 @@ public static Matrix3D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Matrix3D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             // The token will already have had whitespace trimmed so we can do a
             // simple string compare.
@@ -241,25 +241,25 @@ public static Matrix3D Parse(string source)
             else
             {
                 value = new Matrix3D(double.Parse(firstToken, formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
             }
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3D.cs

@@ -166,18 +166,18 @@ public static Point3D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Point3D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             value = new Point3D(double.Parse(firstToken, formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point3DCollection.cs

@@ -720,17 +720,17 @@ public static Point3DCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             Point3DCollection resource = new Point3DCollection();
 
             Point3D value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
                 value = new Point3D(
-                    double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.GetCurrentToken(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
                 resource.Add(value);
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Point4D.cs

@@ -169,19 +169,19 @@ public static Point4D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Point4D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             value = new Point4D(double.Parse(firstToken, formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Quaternion.cs

@@ -190,11 +190,11 @@ public static Quaternion Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Quaternion value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             // The token will already have had whitespace trimmed so we can do a
             // simple string compare.
@@ -205,13 +205,13 @@ public static Quaternion Parse(string source)
             else
             {
                 value = new Quaternion(double.Parse(firstToken, formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
             }
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Rect3D.cs

@@ -189,11 +189,11 @@ public static Rect3D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Rect3D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             // The token will already have had whitespace trimmed so we can do a
             // simple string compare.
@@ -204,15 +204,15 @@ public static Rect3D Parse(string source)
             else
             {
                 value = new Rect3D(double.Parse(firstToken, formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
             }
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Size3D.cs

@@ -180,11 +180,11 @@ public static Size3D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Size3D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             // The token will already have had whitespace trimmed so we can do a
             // simple string compare.
@@ -195,12 +195,12 @@ public static Size3D Parse(string source)
             else
             {
                 value = new Size3D(double.Parse(firstToken, formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
             }
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3D.cs

@@ -166,18 +166,18 @@ public static Vector3D Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
 
             Vector3D value;
 
-            ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
+            ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
 
             value = new Vector3D(double.Parse(firstToken, formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
             // There should be no more tokens in this string.
-            th.LastTokenRequired();
+            tokenizer.LastTokenRequired();
 
             return value;
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Generated/Vector3DCollection.cs

@@ -720,17 +720,17 @@ public static Vector3DCollection Parse(string source)
         {
             IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
 
-            TokenizerHelper th = new TokenizerHelper(source, formatProvider);
+            ValueTokenizerHelper tokenizer = new(source, formatProvider);
             Vector3DCollection resource = new Vector3DCollection();
 
             Vector3D value;
 
-            while (th.NextToken())
+            while (tokenizer.NextToken())
             {
                 value = new Vector3D(
-                    double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
-                    double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
+                    double.Parse(tokenizer.GetCurrentToken(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider),
+                    double.Parse(tokenizer.NextTokenRequired(), formatProvider));
 
                 resource.Add(value);
             }