From 663f61376aa9e019d1ddab5723c46d118b809832 Mon Sep 17 00:00:00 2001 From: tacosontitan Date: Fri, 29 Mar 2024 21:26:14 -0500 Subject: [PATCH] Renamed token types. --- src/Pasper.Json/Parsing/JsonLexer.cs | 8 ++++---- .../Tokens/{BeginArray.cs => BeginArrayToken.cs} | 2 +- .../Tokens/{BeginObject.cs => BeginObjectToken.cs} | 2 +- src/Pasper.Json/Tokens/{Comment.cs => CommentToken.cs} | 2 +- src/Pasper.Json/Tokens/{EndArray.cs => EndArrayToken.cs} | 2 +- .../Tokens/{EndObject.cs => EndObjectToken.cs} | 2 +- .../Tokens/{FalseLiteral.cs => LiteralFalseToken.cs} | 2 +- .../Tokens/{NullLiteral.cs => LiteralNullToken.cs} | 2 +- .../Tokens/{NumberLiteral.cs => LiteralNumberToken.cs} | 2 +- .../Tokens/{StringLiteral.cs => LiteralStringToken.cs} | 2 +- .../Tokens/{TrueLiteral.cs => LiteralTrueToken.cs} | 2 +- .../Tokens/{PropertyName.cs => PropertyNameToken.cs} | 2 +- .../{BeginArrayTests.cs => BeginArrayTokenTests.cs} | 4 ++-- .../{BeginObjectTests.cs => BeginObjectTokenTests.cs} | 4 ++-- .../Tokens/{CommentTests.cs => CommentTokenTests.cs} | 4 ++-- .../Tokens/{EndArrayTests.cs => EndArrayTokenTests.cs} | 4 ++-- .../Tokens/{EndObjectTests.cs => EndObjectTokenTests.cs} | 4 ++-- .../{FalseLiteralTests.cs => LiteralFalseTokenTests.cs} | 4 ++-- .../{NullLiteralTests.cs => LiteralNullTokenTests.cs} | 4 ++-- .../{NumberLiteralTests.cs => LiteralNumberTokenTests.cs} | 4 ++-- .../{StringLiteralTests.cs => LiteralStringTokenTests.cs} | 4 ++-- .../{TrueLiteralTests.cs => LiteralTrueTokenTests.cs} | 4 ++-- .../{PropertyNameTests.cs => PropertyNameTokenTests.cs} | 4 ++-- 23 files changed, 37 insertions(+), 37 deletions(-) rename src/Pasper.Json/Tokens/{BeginArray.cs => BeginArrayToken.cs} (90%) rename src/Pasper.Json/Tokens/{BeginObject.cs => BeginObjectToken.cs} (89%) rename src/Pasper.Json/Tokens/{Comment.cs => CommentToken.cs} (87%) rename src/Pasper.Json/Tokens/{EndArray.cs => EndArrayToken.cs} (90%) rename src/Pasper.Json/Tokens/{EndObject.cs => EndObjectToken.cs} (89%) rename src/Pasper.Json/Tokens/{FalseLiteral.cs => LiteralFalseToken.cs} (85%) rename src/Pasper.Json/Tokens/{NullLiteral.cs => LiteralNullToken.cs} (86%) rename src/Pasper.Json/Tokens/{NumberLiteral.cs => LiteralNumberToken.cs} (79%) rename src/Pasper.Json/Tokens/{StringLiteral.cs => LiteralStringToken.cs} (79%) rename src/Pasper.Json/Tokens/{TrueLiteral.cs => LiteralTrueToken.cs} (86%) rename src/Pasper.Json/Tokens/{PropertyName.cs => PropertyNameToken.cs} (80%) rename test/Pasper.Json.Tests/Tokens/{BeginArrayTests.cs => BeginArrayTokenTests.cs} (72%) rename test/Pasper.Json.Tests/Tokens/{BeginObjectTests.cs => BeginObjectTokenTests.cs} (73%) rename test/Pasper.Json.Tests/Tokens/{CommentTests.cs => CommentTokenTests.cs} (73%) rename test/Pasper.Json.Tests/Tokens/{EndArrayTests.cs => EndArrayTokenTests.cs} (74%) rename test/Pasper.Json.Tests/Tokens/{EndObjectTests.cs => EndObjectTokenTests.cs} (74%) rename test/Pasper.Json.Tests/Tokens/{FalseLiteralTests.cs => LiteralFalseTokenTests.cs} (72%) rename test/Pasper.Json.Tests/Tokens/{NullLiteralTests.cs => LiteralNullTokenTests.cs} (72%) rename test/Pasper.Json.Tests/Tokens/{NumberLiteralTests.cs => LiteralNumberTokenTests.cs} (70%) rename test/Pasper.Json.Tests/Tokens/{StringLiteralTests.cs => LiteralStringTokenTests.cs} (69%) rename test/Pasper.Json.Tests/Tokens/{TrueLiteralTests.cs => LiteralTrueTokenTests.cs} (72%) rename test/Pasper.Json.Tests/Tokens/{PropertyNameTests.cs => PropertyNameTokenTests.cs} (70%) diff --git a/src/Pasper.Json/Parsing/JsonLexer.cs b/src/Pasper.Json/Parsing/JsonLexer.cs index e057265..747903a 100644 --- a/src/Pasper.Json/Parsing/JsonLexer.cs +++ b/src/Pasper.Json/Parsing/JsonLexer.cs @@ -53,10 +53,10 @@ private bool TryGetNextToken([NotNullWhen(true)] out IToken? token) var currentCharacter = json[_currentIndex]; token = currentCharacter switch { - '{' => new BeginObject(), - '}' => new EndObject(), - '[' => new BeginArray(), - ']' => new EndArray(), + '{' => new BeginObjectToken(), + '}' => new EndObjectToken(), + '[' => new BeginArrayToken(), + ']' => new EndArrayToken(), _ => null }; diff --git a/src/Pasper.Json/Tokens/BeginArray.cs b/src/Pasper.Json/Tokens/BeginArrayToken.cs similarity index 90% rename from src/Pasper.Json/Tokens/BeginArray.cs rename to src/Pasper.Json/Tokens/BeginArrayToken.cs index d91a505..df95302 100644 --- a/src/Pasper.Json/Tokens/BeginArray.cs +++ b/src/Pasper.Json/Tokens/BeginArrayToken.cs @@ -10,7 +10,7 @@ namespace Pasper.Json.Tokens; /// /// This token is represented by the character [. /// -public sealed class BeginArray() +public sealed class BeginArrayToken() : IToken { /// diff --git a/src/Pasper.Json/Tokens/BeginObject.cs b/src/Pasper.Json/Tokens/BeginObjectToken.cs similarity index 89% rename from src/Pasper.Json/Tokens/BeginObject.cs rename to src/Pasper.Json/Tokens/BeginObjectToken.cs index e456a19..7ec6d55 100644 --- a/src/Pasper.Json/Tokens/BeginObject.cs +++ b/src/Pasper.Json/Tokens/BeginObjectToken.cs @@ -8,7 +8,7 @@ namespace Pasper.Json.Tokens; /// /// This token is represented by the character {. /// -public sealed class BeginObject +public sealed class BeginObjectToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/Comment.cs b/src/Pasper.Json/Tokens/CommentToken.cs similarity index 87% rename from src/Pasper.Json/Tokens/Comment.cs rename to src/Pasper.Json/Tokens/CommentToken.cs index 9a21976..eab080f 100644 --- a/src/Pasper.Json/Tokens/Comment.cs +++ b/src/Pasper.Json/Tokens/CommentToken.cs @@ -6,7 +6,7 @@ namespace Pasper.Json.Tokens; /// Represents a token containing a comment. /// /// The value of the comment. -public sealed class Comment(string value) +public sealed class CommentToken(string value) : IToken { /// diff --git a/src/Pasper.Json/Tokens/EndArray.cs b/src/Pasper.Json/Tokens/EndArrayToken.cs similarity index 90% rename from src/Pasper.Json/Tokens/EndArray.cs rename to src/Pasper.Json/Tokens/EndArrayToken.cs index cd55ef9..e06b230 100644 --- a/src/Pasper.Json/Tokens/EndArray.cs +++ b/src/Pasper.Json/Tokens/EndArrayToken.cs @@ -8,7 +8,7 @@ namespace Pasper.Json.Tokens; /// /// This token is represented by the character ]. /// -public sealed class EndArray +public sealed class EndArrayToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/EndObject.cs b/src/Pasper.Json/Tokens/EndObjectToken.cs similarity index 89% rename from src/Pasper.Json/Tokens/EndObject.cs rename to src/Pasper.Json/Tokens/EndObjectToken.cs index 9660485..2ab5b01 100644 --- a/src/Pasper.Json/Tokens/EndObject.cs +++ b/src/Pasper.Json/Tokens/EndObjectToken.cs @@ -8,7 +8,7 @@ namespace Pasper.Json.Tokens; /// /// This token is represented by the character }. /// -public sealed class EndObject +public sealed class EndObjectToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/FalseLiteral.cs b/src/Pasper.Json/Tokens/LiteralFalseToken.cs similarity index 85% rename from src/Pasper.Json/Tokens/FalseLiteral.cs rename to src/Pasper.Json/Tokens/LiteralFalseToken.cs index 8f22ab2..45a3ee0 100644 --- a/src/Pasper.Json/Tokens/FalseLiteral.cs +++ b/src/Pasper.Json/Tokens/LiteralFalseToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token containing the literal value false. /// -public sealed class FalseLiteral +public sealed class LiteralFalseToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/NullLiteral.cs b/src/Pasper.Json/Tokens/LiteralNullToken.cs similarity index 86% rename from src/Pasper.Json/Tokens/NullLiteral.cs rename to src/Pasper.Json/Tokens/LiteralNullToken.cs index 37c6b9e..03e1c5e 100644 --- a/src/Pasper.Json/Tokens/NullLiteral.cs +++ b/src/Pasper.Json/Tokens/LiteralNullToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token that indicates the literal value null. /// -public sealed class NullLiteral +public sealed class LiteralNullToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/NumberLiteral.cs b/src/Pasper.Json/Tokens/LiteralNumberToken.cs similarity index 79% rename from src/Pasper.Json/Tokens/NumberLiteral.cs rename to src/Pasper.Json/Tokens/LiteralNumberToken.cs index ea0b9ce..ab492fc 100644 --- a/src/Pasper.Json/Tokens/NumberLiteral.cs +++ b/src/Pasper.Json/Tokens/LiteralNumberToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token containing a number. /// -public sealed class NumberLiteral(string value) +public sealed class LiteralNumberToken(string value) : IToken { /// diff --git a/src/Pasper.Json/Tokens/StringLiteral.cs b/src/Pasper.Json/Tokens/LiteralStringToken.cs similarity index 79% rename from src/Pasper.Json/Tokens/StringLiteral.cs rename to src/Pasper.Json/Tokens/LiteralStringToken.cs index e613075..d6fb15c 100644 --- a/src/Pasper.Json/Tokens/StringLiteral.cs +++ b/src/Pasper.Json/Tokens/LiteralStringToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token containing a value. /// -public sealed class StringLiteral(string value) +public sealed class LiteralStringToken(string value) : IToken { /// diff --git a/src/Pasper.Json/Tokens/TrueLiteral.cs b/src/Pasper.Json/Tokens/LiteralTrueToken.cs similarity index 86% rename from src/Pasper.Json/Tokens/TrueLiteral.cs rename to src/Pasper.Json/Tokens/LiteralTrueToken.cs index 395d2ef..e61ff78 100644 --- a/src/Pasper.Json/Tokens/TrueLiteral.cs +++ b/src/Pasper.Json/Tokens/LiteralTrueToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token that indicates the literal value true. /// -public sealed class TrueLiteral +public sealed class LiteralTrueToken : IToken { /// diff --git a/src/Pasper.Json/Tokens/PropertyName.cs b/src/Pasper.Json/Tokens/PropertyNameToken.cs similarity index 80% rename from src/Pasper.Json/Tokens/PropertyName.cs rename to src/Pasper.Json/Tokens/PropertyNameToken.cs index e8b351f..636c998 100644 --- a/src/Pasper.Json/Tokens/PropertyName.cs +++ b/src/Pasper.Json/Tokens/PropertyNameToken.cs @@ -5,7 +5,7 @@ namespace Pasper.Json.Tokens; /// /// Represents a token containing a key. /// -public sealed class PropertyName(string key) +public sealed class PropertyNameToken(string key) : IToken { /// diff --git a/test/Pasper.Json.Tests/Tokens/BeginArrayTests.cs b/test/Pasper.Json.Tests/Tokens/BeginArrayTokenTests.cs similarity index 72% rename from test/Pasper.Json.Tests/Tokens/BeginArrayTests.cs rename to test/Pasper.Json.Tests/Tokens/BeginArrayTokenTests.cs index ca0fa7f..e321b55 100644 --- a/test/Pasper.Json.Tests/Tokens/BeginArrayTests.cs +++ b/test/Pasper.Json.Tests/Tokens/BeginArrayTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public sealed class BeginArrayTests +public sealed class BeginArrayTokenTests { [Fact] public void Value_ShouldBeOpenBracket() { const string expected = "["; - var token = new BeginArray(); + var token = new BeginArrayToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/BeginObjectTests.cs b/test/Pasper.Json.Tests/Tokens/BeginObjectTokenTests.cs similarity index 73% rename from test/Pasper.Json.Tests/Tokens/BeginObjectTests.cs rename to test/Pasper.Json.Tests/Tokens/BeginObjectTokenTests.cs index bafe50e..fe0126b 100644 --- a/test/Pasper.Json.Tests/Tokens/BeginObjectTests.cs +++ b/test/Pasper.Json.Tests/Tokens/BeginObjectTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class BeginObjectTests +public class BeginObjectTokenTests { [Fact] public void Value_ShouldBeOpenBrace() { const string expected = "{"; - var token = new BeginObject(); + var token = new BeginObjectToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/CommentTests.cs b/test/Pasper.Json.Tests/Tokens/CommentTokenTests.cs similarity index 73% rename from test/Pasper.Json.Tests/Tokens/CommentTests.cs rename to test/Pasper.Json.Tests/Tokens/CommentTokenTests.cs index b483fc6..e3d4f92 100644 --- a/test/Pasper.Json.Tests/Tokens/CommentTests.cs +++ b/test/Pasper.Json.Tests/Tokens/CommentTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class CommentTests +public class CommentTokenTests { [Fact] public void Value_ShouldBeSlashSlash() { const string expected = "abc"; - var token = new Comment(expected); + var token = new CommentToken(expected); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/EndArrayTests.cs b/test/Pasper.Json.Tests/Tokens/EndArrayTokenTests.cs similarity index 74% rename from test/Pasper.Json.Tests/Tokens/EndArrayTests.cs rename to test/Pasper.Json.Tests/Tokens/EndArrayTokenTests.cs index 2ea1060..ac85a12 100644 --- a/test/Pasper.Json.Tests/Tokens/EndArrayTests.cs +++ b/test/Pasper.Json.Tests/Tokens/EndArrayTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class EndArrayTests +public class EndArrayTokenTests { [Fact] public void Value_ShouldBeCloseBracket() { const string expected = "]"; - var token = new EndArray(); + var token = new EndArrayToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/EndObjectTests.cs b/test/Pasper.Json.Tests/Tokens/EndObjectTokenTests.cs similarity index 74% rename from test/Pasper.Json.Tests/Tokens/EndObjectTests.cs rename to test/Pasper.Json.Tests/Tokens/EndObjectTokenTests.cs index 642a309..48787bc 100644 --- a/test/Pasper.Json.Tests/Tokens/EndObjectTests.cs +++ b/test/Pasper.Json.Tests/Tokens/EndObjectTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class EndObjectTests +public class EndObjectTokenTests { [Fact] public void Value_ShouldBeCloseBrace() { const string expected = "}"; - var token = new EndObject(); + var token = new EndObjectToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/FalseLiteralTests.cs b/test/Pasper.Json.Tests/Tokens/LiteralFalseTokenTests.cs similarity index 72% rename from test/Pasper.Json.Tests/Tokens/FalseLiteralTests.cs rename to test/Pasper.Json.Tests/Tokens/LiteralFalseTokenTests.cs index 5ffd88b..a2afd1f 100644 --- a/test/Pasper.Json.Tests/Tokens/FalseLiteralTests.cs +++ b/test/Pasper.Json.Tests/Tokens/LiteralFalseTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class FalseLiteralTests +public class LiteralFalseTokenTests { [Fact] public void Value_ShouldBeFalse() { const string expected = "false"; - var token = new FalseLiteral(); + var token = new LiteralFalseToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/NullLiteralTests.cs b/test/Pasper.Json.Tests/Tokens/LiteralNullTokenTests.cs similarity index 72% rename from test/Pasper.Json.Tests/Tokens/NullLiteralTests.cs rename to test/Pasper.Json.Tests/Tokens/LiteralNullTokenTests.cs index 68e47bf..c5fc81c 100644 --- a/test/Pasper.Json.Tests/Tokens/NullLiteralTests.cs +++ b/test/Pasper.Json.Tests/Tokens/LiteralNullTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class NullLiteralTests +public class LiteralNullTokenTests { [Fact] public void Value_ShouldBeNull() { const string expected = "null"; - var token = new NullLiteral(); + var token = new LiteralNullToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/NumberLiteralTests.cs b/test/Pasper.Json.Tests/Tokens/LiteralNumberTokenTests.cs similarity index 70% rename from test/Pasper.Json.Tests/Tokens/NumberLiteralTests.cs rename to test/Pasper.Json.Tests/Tokens/LiteralNumberTokenTests.cs index 1e6cf3a..943de65 100644 --- a/test/Pasper.Json.Tests/Tokens/NumberLiteralTests.cs +++ b/test/Pasper.Json.Tests/Tokens/LiteralNumberTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class NumberLiteralTests +public class LiteralNumberTokenTests { [Fact] public void Value_ShouldBeNumber() { const string expected = "123"; - var token = new NumberLiteral("123"); + var token = new LiteralNumberToken("123"); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/StringLiteralTests.cs b/test/Pasper.Json.Tests/Tokens/LiteralStringTokenTests.cs similarity index 69% rename from test/Pasper.Json.Tests/Tokens/StringLiteralTests.cs rename to test/Pasper.Json.Tests/Tokens/LiteralStringTokenTests.cs index 257b8cb..2b97fc9 100644 --- a/test/Pasper.Json.Tests/Tokens/StringLiteralTests.cs +++ b/test/Pasper.Json.Tests/Tokens/LiteralStringTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class StringLiteralTests +public class LiteralStringTokenTests { [Fact] public void Value_ShouldBeValue() { const string expected = "abc"; - var token = new StringLiteral(expected); + var token = new LiteralStringToken(expected); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/TrueLiteralTests.cs b/test/Pasper.Json.Tests/Tokens/LiteralTrueTokenTests.cs similarity index 72% rename from test/Pasper.Json.Tests/Tokens/TrueLiteralTests.cs rename to test/Pasper.Json.Tests/Tokens/LiteralTrueTokenTests.cs index 919b867..b37bd47 100644 --- a/test/Pasper.Json.Tests/Tokens/TrueLiteralTests.cs +++ b/test/Pasper.Json.Tests/Tokens/LiteralTrueTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class TrueLiteralTests +public class LiteralTrueTokenTests { [Fact] public void Value_ShouldBeTrue() { const string expected = "true"; - var token = new TrueLiteral(); + var token = new LiteralTrueToken(); Assert.Equal(expected, token.Value); } } \ No newline at end of file diff --git a/test/Pasper.Json.Tests/Tokens/PropertyNameTests.cs b/test/Pasper.Json.Tests/Tokens/PropertyNameTokenTests.cs similarity index 70% rename from test/Pasper.Json.Tests/Tokens/PropertyNameTests.cs rename to test/Pasper.Json.Tests/Tokens/PropertyNameTokenTests.cs index 7fbb322..b36ea6f 100644 --- a/test/Pasper.Json.Tests/Tokens/PropertyNameTests.cs +++ b/test/Pasper.Json.Tests/Tokens/PropertyNameTokenTests.cs @@ -2,13 +2,13 @@ namespace Pasper.Json.Tests.Tokens; -public class PropertyNameTests +public class PropertyNameTokenTests { [Fact] public void Value_ShouldBeKey() { const string expected = "key"; - var token = new PropertyName(expected); + var token = new PropertyNameToken(expected); Assert.Equal(expected, token.Value); } } \ No newline at end of file