From 33fdb4d4f96b2c176325cc2855bcc47e947f0a0c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 5 Jul 2020 10:44:05 -0700 Subject: [PATCH] Rename PeekOneOrThrow back to Peek. --- src/Avalonia.Base/Utilities/CharacterReader.cs | 6 +++--- src/Avalonia.Base/Utilities/IdentifierParser.cs | 2 +- src/Avalonia.Base/Utilities/StyleClassParser.cs | 2 +- .../Avalonia.Markup.Xaml/Parsers/PropertyParser.cs | 2 +- .../Markup/Parsers/ArgumentListParser.cs | 2 +- .../Markup/Parsers/BindingExpressionGrammar.cs | 2 +- .../Markup/Parsers/PropertyPathGrammar.cs | 2 +- .../Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs | 10 +++++----- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Avalonia.Base/Utilities/CharacterReader.cs b/src/Avalonia.Base/Utilities/CharacterReader.cs index 65c5c2d010..2b98785d0d 100644 --- a/src/Avalonia.Base/Utilities/CharacterReader.cs +++ b/src/Avalonia.Base/Utilities/CharacterReader.cs @@ -16,7 +16,7 @@ namespace Avalonia.Utilities } public bool End => _s.IsEmpty; - public char PeekOneOrThrow => _s[0]; + public char Peek => _s[0]; public int Position { get; private set; } public char Take() { @@ -35,7 +35,7 @@ namespace Avalonia.Utilities public bool TakeIf(char c) { - if (PeekOneOrThrow == c) + if (Peek == c) { Take(); return true; @@ -48,7 +48,7 @@ namespace Avalonia.Utilities public bool TakeIf(Func condition) { - if (condition(PeekOneOrThrow)) + if (condition(Peek)) { Take(); return true; diff --git a/src/Avalonia.Base/Utilities/IdentifierParser.cs b/src/Avalonia.Base/Utilities/IdentifierParser.cs index 5bbea06d10..b105d0746b 100644 --- a/src/Avalonia.Base/Utilities/IdentifierParser.cs +++ b/src/Avalonia.Base/Utilities/IdentifierParser.cs @@ -10,7 +10,7 @@ namespace Avalonia.Utilities { public static ReadOnlySpan ParseIdentifier(this ref CharacterReader r) { - if (IsValidIdentifierStart(r.PeekOneOrThrow)) + if (IsValidIdentifierStart(r.Peek)) { return r.TakeWhile(c => IsValidIdentifierChar(c)); } diff --git a/src/Avalonia.Base/Utilities/StyleClassParser.cs b/src/Avalonia.Base/Utilities/StyleClassParser.cs index a4d6a33ad9..2db58f73d9 100644 --- a/src/Avalonia.Base/Utilities/StyleClassParser.cs +++ b/src/Avalonia.Base/Utilities/StyleClassParser.cs @@ -10,7 +10,7 @@ namespace Avalonia.Utilities { public static ReadOnlySpan ParseStyleClass(this ref CharacterReader r) { - if (IsValidIdentifierStart(r.PeekOneOrThrow)) + if (IsValidIdentifierStart(r.Peek)) { return r.TakeWhile(c => IsValidIdentifierChar(c)); } diff --git a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs index ebd6347a86..ea94012096 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs @@ -41,7 +41,7 @@ namespace Avalonia.Markup.Xaml.Parsers throw new ExpressionParseException(r.Position, $"Expected ')'."); } - throw new ExpressionParseException(r.Position, $"Unexpected '{r.PeekOneOrThrow}'."); + throw new ExpressionParseException(r.Position, $"Unexpected '{r.Peek}'."); } } else if (!r.End && r.TakeIf(':')) diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs index 609ae5a57e..e858bacb74 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/ArgumentListParser.cs @@ -11,7 +11,7 @@ namespace Avalonia.Markup.Parsers { public static IList ParseArguments(this ref CharacterReader r, char open, char close, char delimiter = ',') { - if (r.PeekOneOrThrow == open) + if (r.Peek == open) { var result = new List(); diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs index cbf2fa201a..8de64e56ff 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/BindingExpressionGrammar.cs @@ -290,7 +290,7 @@ namespace Avalonia.Markup.Parsers private static bool PeekOpenBracket(ref CharacterReader r) { - return !r.End && r.PeekOneOrThrow == '['; + return !r.End && r.Peek == '['; } private static bool ParseStreamOperator(ref CharacterReader r) diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs index 1f0f421233..c5953b514c 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/PropertyPathGrammar.cs @@ -160,7 +160,7 @@ namespace Avalonia.Markup.Parsers - throw new ExpressionParseException(r.Position, "Unexpected character " + r.PeekOneOrThrow + " after property name"); + throw new ExpressionParseException(r.Position, "Unexpected character " + r.Peek + " after property name"); } private static (State, ISyntax) ParseEnsureType(ref CharacterReader r) diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs index 4e76085f5f..b25e9490cd 100644 --- a/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs +++ b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs @@ -120,7 +120,7 @@ namespace Avalonia.Markup.Parsers { return (State.Class, null); } - else if (r.TakeIf(char.IsWhiteSpace) || r.PeekOneOrThrow == '>') + else if (r.TakeIf(char.IsWhiteSpace) || r.Peek == '>') { return (State.Traversal, null); } @@ -136,7 +136,7 @@ namespace Avalonia.Markup.Parsers { return (State.Start, new CommaSyntax()); } - else if (end.HasValue && !r.End && r.PeekOneOrThrow == end.Value) + else if (end.HasValue && !r.End && r.Peek == end.Value) { return (State.End, null); } @@ -259,7 +259,7 @@ namespace Avalonia.Markup.Parsers if (!r.TakeIf('=')) { - throw new ExpressionParseException(r.Position, $"Expected '=', got '{r.PeekOneOrThrow}'"); + throw new ExpressionParseException(r.Position, $"Expected '=', got '{r.Peek}'"); } var value = r.TakeUntil(']'); @@ -278,7 +278,7 @@ namespace Avalonia.Markup.Parsers if (namespaceOrTypeName.IsEmpty) { - throw new ExpressionParseException(r.Position, $"Expected an identifier, got '{r.PeekOneOrThrow}"); + throw new ExpressionParseException(r.Position, $"Expected an identifier, got '{r.Peek}"); } if (!r.End && r.TakeIf('|')) @@ -308,7 +308,7 @@ namespace Avalonia.Markup.Parsers } else if (!r.TakeIf(')')) { - throw new ExpressionParseException(r.Position, $"Expected '{c}', got '{r.PeekOneOrThrow}'."); + throw new ExpressionParseException(r.Position, $"Expected '{c}', got '{r.Peek}'."); } }