From 5491f4818e883032c28a90ab8559dce744dc67d9 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 18 Apr 2018 02:03:23 +0200 Subject: [PATCH] Use standard naming for Read methods. --- .../Utilities/StringTokenizer.cs | 26 +++++++++---------- src/Avalonia.Controls/GridLength.cs | 2 +- src/Avalonia.Visuals/Matrix.cs | 12 ++++----- src/Avalonia.Visuals/Point.cs | 4 +-- src/Avalonia.Visuals/Rect.cs | 8 +++--- src/Avalonia.Visuals/RelativePoint.cs | 4 +-- src/Avalonia.Visuals/RelativeRect.cs | 8 +++--- src/Avalonia.Visuals/Size.cs | 4 +-- src/Avalonia.Visuals/Thickness.cs | 8 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Avalonia.Base/Utilities/StringTokenizer.cs b/src/Avalonia.Base/Utilities/StringTokenizer.cs index 1c9f475eb7..2559e52932 100644 --- a/src/Avalonia.Base/Utilities/StringTokenizer.cs +++ b/src/Avalonia.Base/Utilities/StringTokenizer.cs @@ -50,16 +50,16 @@ namespace Avalonia.Utilities } } - public bool NextInt32(out Int32 result, char? separator = null) + public bool TryReadInt32(out Int32 result, char? separator = null) { - var success = NextString(out var stringResult, separator); + var success = TryReadString(out var stringResult, separator); result = success ? int.Parse(stringResult, _formatProvider) : 0; return success; } - public int NextInt32Required(char? separator = null) + public int ReadInt32(char? separator = null) { - if (!NextInt32(out var result, separator)) + if (!TryReadInt32(out var result, separator)) { throw GetFormatException(); } @@ -67,16 +67,16 @@ namespace Avalonia.Utilities return result; } - public bool NextDouble(out double result, char? separator = null) + public bool TryReadDouble(out double result, char? separator = null) { - var success = NextString(out var stringResult, separator); + var success = TryReadString(out var stringResult, separator); result = success ? double.Parse(stringResult, _formatProvider) : 0; return success; } - public double NextDoubleRequired(char? separator = null) + public double ReadDouble(char? separator = null) { - if (!NextDouble(out var result, separator)) + if (!TryReadDouble(out var result, separator)) { throw GetFormatException(); } @@ -84,16 +84,16 @@ namespace Avalonia.Utilities return result; } - public bool NextString(out string result, char? separator = null) + public bool TryReadString(out string result, char? separator = null) { - var success = NextToken(separator ?? _separator); + var success = TryReadToken(separator ?? _separator); result = CurrentToken; return success; } - public string NextStringRequired(char? separator = null) + public string ReadString(char? separator = null) { - if (!NextString(out var result, separator)) + if (!TryReadString(out var result, separator)) { throw GetFormatException(); } @@ -101,7 +101,7 @@ namespace Avalonia.Utilities return result; } - private bool NextToken(char separator) + private bool TryReadToken(char separator) { _tokenIndex = -1; diff --git a/src/Avalonia.Controls/GridLength.cs b/src/Avalonia.Controls/GridLength.cs index b17dc584bd..789953a249 100644 --- a/src/Avalonia.Controls/GridLength.cs +++ b/src/Avalonia.Controls/GridLength.cs @@ -213,7 +213,7 @@ namespace Avalonia.Controls { using (var tokenizer = new StringTokenizer(s, culture)) { - while (tokenizer.NextString(out var item)) + while (tokenizer.TryReadString(out var item)) { yield return Parse(item, culture); } diff --git a/src/Avalonia.Visuals/Matrix.cs b/src/Avalonia.Visuals/Matrix.cs index 6013cf94c6..70804ee04f 100644 --- a/src/Avalonia.Visuals/Matrix.cs +++ b/src/Avalonia.Visuals/Matrix.cs @@ -321,12 +321,12 @@ namespace Avalonia using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid Matrix")) { return new Matrix( - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired() + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble() ); } } diff --git a/src/Avalonia.Visuals/Point.cs b/src/Avalonia.Visuals/Point.cs index 49d2a401bf..d0c3edfeb2 100644 --- a/src/Avalonia.Visuals/Point.cs +++ b/src/Avalonia.Visuals/Point.cs @@ -177,8 +177,8 @@ namespace Avalonia using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid Point")) { return new Point( - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired() + tokenizer.ReadDouble(), + tokenizer.ReadDouble() ); } } diff --git a/src/Avalonia.Visuals/Rect.cs b/src/Avalonia.Visuals/Rect.cs index 11f3db31da..748928ada3 100644 --- a/src/Avalonia.Visuals/Rect.cs +++ b/src/Avalonia.Visuals/Rect.cs @@ -494,10 +494,10 @@ namespace Avalonia using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid Rect")) { return new Rect( - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired() + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble(), + tokenizer.ReadDouble() ); } } diff --git a/src/Avalonia.Visuals/RelativePoint.cs b/src/Avalonia.Visuals/RelativePoint.cs index 625ee61439..a2ef0e6725 100644 --- a/src/Avalonia.Visuals/RelativePoint.cs +++ b/src/Avalonia.Visuals/RelativePoint.cs @@ -160,8 +160,8 @@ namespace Avalonia { using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid RelativePoint")) { - var x = tokenizer.NextStringRequired(); - var y = tokenizer.NextStringRequired(); + var x = tokenizer.ReadString(); + var y = tokenizer.ReadString(); var unit = RelativeUnit.Absolute; var scale = 1.0; diff --git a/src/Avalonia.Visuals/RelativeRect.cs b/src/Avalonia.Visuals/RelativeRect.cs index 05e344f42b..c13c3282db 100644 --- a/src/Avalonia.Visuals/RelativeRect.cs +++ b/src/Avalonia.Visuals/RelativeRect.cs @@ -173,10 +173,10 @@ namespace Avalonia { using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid RelativeRect")) { - var x = tokenizer.NextStringRequired(); - var y = tokenizer.NextStringRequired(); - var width = tokenizer.NextStringRequired(); - var height = tokenizer.NextStringRequired(); + var x = tokenizer.ReadString(); + var y = tokenizer.ReadString(); + var width = tokenizer.ReadString(); + var height = tokenizer.ReadString(); var unit = RelativeUnit.Absolute; var scale = 1.0; diff --git a/src/Avalonia.Visuals/Size.cs b/src/Avalonia.Visuals/Size.cs index ff734146c2..c5eaa33b41 100644 --- a/src/Avalonia.Visuals/Size.cs +++ b/src/Avalonia.Visuals/Size.cs @@ -157,8 +157,8 @@ namespace Avalonia using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid Size")) { return new Size( - tokenizer.NextDoubleRequired(), - tokenizer.NextDoubleRequired()); + tokenizer.ReadDouble(), + tokenizer.ReadDouble()); } } diff --git a/src/Avalonia.Visuals/Thickness.cs b/src/Avalonia.Visuals/Thickness.cs index 4609cc3ced..a5ca0a04a8 100644 --- a/src/Avalonia.Visuals/Thickness.cs +++ b/src/Avalonia.Visuals/Thickness.cs @@ -171,13 +171,13 @@ namespace Avalonia { using (var tokenizer = new StringTokenizer(s, culture, exceptionMessage: "Invalid Thickness")) { - var a = tokenizer.NextDoubleRequired(); + var a = tokenizer.ReadDouble(); - if (tokenizer.NextDouble(out var b)) + if (tokenizer.TryReadDouble(out var b)) { - if (tokenizer.NextDouble(out var c)) + if (tokenizer.TryReadDouble(out var c)) { - return new Thickness(a, b, c, tokenizer.NextDoubleRequired()); + return new Thickness(a, b, c, tokenizer.ReadDouble()); } return new Thickness(a, b);