Skip to content

Commit 9e2a7c5

Browse files
h3xds1nzh3xds1nz
committed
Use ValueTokenizerHelper in generated structs/collections
1 parent 5933477 commit 9e2a7c5

File tree

22 files changed

+124
-124
lines changed

22 files changed

+124
-124
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -724,14 +724,14 @@ public static DoubleCollection Parse(string source)
724724
{
725725
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
726726

727-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
727+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
728728
DoubleCollection resource = new DoubleCollection();
729729

730730
double value;
731731

732-
while (th.NextToken())
732+
while (tokenizer.NextToken())
733733
{
734-
value = double.Parse(th.GetCurrentTokenAsSpan(), formatProvider);
734+
value = double.Parse(tokenizer.GetCurrentToken(), formatProvider);
735735

736736
resource.Add(value);
737737
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -804,16 +804,16 @@ public static GradientStopCollection Parse(string source)
804804
{
805805
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
806806

807-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
807+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
808808
GradientStopCollection resource = new GradientStopCollection();
809809

810810
GradientStop value;
811811

812-
while (th.NextToken())
812+
while (tokenizer.NextToken())
813813
{
814814
value = new GradientStop(
815-
Parsers.ParseColor(th.GetCurrentToken(), formatProvider),
816-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
815+
Parsers.ParseColor(tokenizer.GetCurrentToken().ToString(), formatProvider),
816+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
817817

818818
resource.Add(value);
819819
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -724,14 +724,14 @@ public static Int32Collection Parse(string source)
724724
{
725725
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
726726

727-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
727+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
728728
Int32Collection resource = new Int32Collection();
729729

730730
int value;
731731

732-
while (th.NextToken())
732+
while (tokenizer.NextToken())
733733
{
734-
value = Int32.Parse(th.GetCurrentTokenAsSpan(), formatProvider);
734+
value = Int32.Parse(tokenizer.GetCurrentToken(), formatProvider);
735735

736736
resource.Add(value);
737737
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,16 +724,16 @@ public static PointCollection Parse(string source)
724724
{
725725
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
726726

727-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
727+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
728728
PointCollection resource = new PointCollection();
729729

730730
Point value;
731731

732-
while (th.NextToken())
732+
while (tokenizer.NextToken())
733733
{
734734
value = new Point(
735-
double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
736-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
735+
double.Parse(tokenizer.GetCurrentToken(), formatProvider),
736+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
737737

738738
resource.Add(value);
739739
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,16 +724,16 @@ public static VectorCollection Parse(string source)
724724
{
725725
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
726726

727-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
727+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
728728
VectorCollection resource = new VectorCollection();
729729

730730
Vector value;
731731

732-
while (th.NextToken())
732+
while (tokenizer.NextToken())
733733
{
734734
value = new Vector(
735-
double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
736-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
735+
double.Parse(tokenizer.GetCurrentToken(), formatProvider),
736+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
737737

738738
resource.Add(value);
739739
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ public static Matrix3D Parse(string source)
226226
{
227227
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
228228

229-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
229+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
230230

231231
Matrix3D value;
232232

233-
ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
233+
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
234234

235235
// The token will already have had whitespace trimmed so we can do a
236236
// simple string compare.
@@ -241,25 +241,25 @@ public static Matrix3D Parse(string source)
241241
else
242242
{
243243
value = new Matrix3D(double.Parse(firstToken, formatProvider),
244-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
245-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
246-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
247-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
248-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
249-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
250-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
251-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
252-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
253-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
254-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
255-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
256-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
257-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
258-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
244+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
245+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
246+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
247+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
248+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
249+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
250+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
251+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
252+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
253+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
254+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
255+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
256+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
257+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
258+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
259259
}
260260

261261
// There should be no more tokens in this string.
262-
th.LastTokenRequired();
262+
tokenizer.LastTokenRequired();
263263

264264
return value;
265265
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ public static Point3D Parse(string source)
166166
{
167167
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
168168

169-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
169+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
170170

171171
Point3D value;
172172

173-
ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
173+
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
174174

175175
value = new Point3D(double.Parse(firstToken, formatProvider),
176-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
177-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
176+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
177+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
178178

179179
// There should be no more tokens in this string.
180-
th.LastTokenRequired();
180+
tokenizer.LastTokenRequired();
181181

182182
return value;
183183
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -720,17 +720,17 @@ public static Point3DCollection Parse(string source)
720720
{
721721
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
722722

723-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
723+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
724724
Point3DCollection resource = new Point3DCollection();
725725

726726
Point3D value;
727727

728-
while (th.NextToken())
728+
while (tokenizer.NextToken())
729729
{
730730
value = new Point3D(
731-
double.Parse(th.GetCurrentTokenAsSpan(), formatProvider),
732-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
733-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
731+
double.Parse(tokenizer.GetCurrentToken(), formatProvider),
732+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
733+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
734734

735735
resource.Add(value);
736736
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,19 @@ public static Point4D Parse(string source)
169169
{
170170
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
171171

172-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
172+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
173173

174174
Point4D value;
175175

176-
ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
176+
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
177177

178178
value = new Point4D(double.Parse(firstToken, formatProvider),
179-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
180-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
181-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
179+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
180+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
181+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
182182

183183
// There should be no more tokens in this string.
184-
th.LastTokenRequired();
184+
tokenizer.LastTokenRequired();
185185

186186
return value;
187187
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ public static Quaternion Parse(string source)
190190
{
191191
IFormatProvider formatProvider = System.Windows.Markup.TypeConverterHelper.InvariantEnglishUS;
192192

193-
TokenizerHelper th = new TokenizerHelper(source, formatProvider);
193+
ValueTokenizerHelper tokenizer = new(source, formatProvider);
194194

195195
Quaternion value;
196196

197-
ReadOnlySpan<char> firstToken = th.NextTokenRequiredAsSpan();
197+
ReadOnlySpan<char> firstToken = tokenizer.NextTokenRequired();
198198

199199
// The token will already have had whitespace trimmed so we can do a
200200
// simple string compare.
@@ -205,13 +205,13 @@ public static Quaternion Parse(string source)
205205
else
206206
{
207207
value = new Quaternion(double.Parse(firstToken, formatProvider),
208-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
209-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider),
210-
double.Parse(th.NextTokenRequiredAsSpan(), formatProvider));
208+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
209+
double.Parse(tokenizer.NextTokenRequired(), formatProvider),
210+
double.Parse(tokenizer.NextTokenRequired(), formatProvider));
211211
}
212212

213213
// There should be no more tokens in this string.
214-
th.LastTokenRequired();
214+
tokenizer.LastTokenRequired();
215215

216216
return value;
217217
}

0 commit comments

Comments
 (0)