From ec9133455cc90c9ec16a5440efb347ea06ec1d99 Mon Sep 17 00:00:00 2001 From: Konstantin Dyachenko Date: Wed, 17 Jan 2024 17:01:16 +0300 Subject: [PATCH] Update variables naming --- .../DefaultJsonStorage.cs | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/csharp/Platform.Data.Doublets.Json/DefaultJsonStorage.cs b/csharp/Platform.Data.Doublets.Json/DefaultJsonStorage.cs index 12c2789..bba2e88 100644 --- a/csharp/Platform.Data.Doublets.Json/DefaultJsonStorage.cs +++ b/csharp/Platform.Data.Doublets.Json/DefaultJsonStorage.cs @@ -68,7 +68,7 @@ public class DefaultJsonStorage : IJsonStorage /// /// /// - public readonly TLinkAddress MeaningRoot; + public readonly TLinkAddress Type; /// /// /// The default. @@ -171,91 +171,91 @@ public class DefaultJsonStorage : IJsonStorage /// /// /// - public TLinkAddress DocumentMarker { get; } + public TLinkAddress DocumentType { get; } /// /// /// Gets the object marker value. /// /// /// - public TLinkAddress ObjectMarker { get; } + public TLinkAddress ObjectType { get; } /// /// /// Gets the member marker value. /// /// /// - public TLinkAddress MemberMarker { get; } + public TLinkAddress MemberType { get; } /// /// /// Gets the value marker value. /// /// /// - public TLinkAddress ValueMarker { get; } + public TLinkAddress ValueType { get; } /// /// /// Gets the string marker value. /// /// /// - public TLinkAddress StringMarker { get; } + public TLinkAddress StringType { get; } /// /// /// Gets the empty string marker value. /// /// /// - public TLinkAddress EmptyStringMarker { get; } + public TLinkAddress EmptyStringType { get; } /// /// /// Gets the number marker value. /// /// /// - public TLinkAddress NumberMarker { get; } + public TLinkAddress NumberType { get; } /// /// /// Gets the negative number marker value. /// /// /// - public TLinkAddress NegativeNumberMarker { get; } + public TLinkAddress NegativeNumberType { get; } /// /// /// Gets the array marker value. /// /// /// - public TLinkAddress ArrayMarker { get; } + public TLinkAddress ArrayType { get; } /// /// /// Gets the empty array marker value. /// /// /// - public TLinkAddress EmptyArrayMarker { get; } + public TLinkAddress EmptyArrayType { get; } /// /// /// Gets the true marker value. /// /// /// - public TLinkAddress TrueMarker { get; } + public TLinkAddress TrueType { get; } /// /// /// Gets the false marker value. /// /// /// - public TLinkAddress FalseMarker { get; } + public TLinkAddress FalseType { get; } /// /// /// Gets the null marker value. /// /// /// - public TLinkAddress NullMarker { get; } + public TLinkAddress NullType { get; } /// /// @@ -277,41 +277,41 @@ public DefaultJsonStorage(ILinks links, IConverter unicodeSymbolCriterionMatcher = new(Links, unicodeSymbolMarker); - TargetMatcher unicodeSequenceCriterionMatcher = new(Links, unicodeSequenceMarker); + TargetMatcher unicodeSymbolCriterionMatcher = new(Links, unicodeSymbolType); + TargetMatcher unicodeSequenceCriterionMatcher = new(Links, unicodeSequenceType); CharToUnicodeSymbolConverter charToUnicodeSymbolConverter = - new(Links, AddressToNumberConverter, unicodeSymbolMarker); + new(Links, AddressToNumberConverter, unicodeSymbolType); UnicodeSymbolToCharConverter unicodeSymbolToCharConverter = new(Links, NumberToAddressConverter, unicodeSymbolCriterionMatcher); StringToUnicodeSequenceConverter = new CachingConverterDecorator( new StringToUnicodeSequenceConverter(Links, charToUnicodeSymbolConverter, - BalancedVariantConverter, unicodeSequenceMarker)); + BalancedVariantConverter, unicodeSequenceType)); RightSequenceWalker sequenceWalker = new(Links, new DefaultStack(), unicodeSymbolCriterionMatcher.IsMatched); UnicodeSequenceToStringConverter = new CachingConverterDecorator( new UnicodeSequenceToStringConverter(Links, unicodeSequenceCriterionMatcher, sequenceWalker, unicodeSymbolToCharConverter)); BigIntegerToRawNumberSequenceConverter = - new(links, AddressToNumberConverter, ListToSequenceConverter, NegativeNumberMarker); - RawNumberSequenceToBigIntegerConverter = new(links, NumberToAddressConverter, NegativeNumberMarker); + new(links, AddressToNumberConverter, ListToSequenceConverter, NegativeNumberType); + RawNumberSequenceToBigIntegerConverter = new(links, NumberToAddressConverter, NegativeNumberType); DecimalToRationalConverter = new(links, BigIntegerToRawNumberSequenceConverter); RationalToDecimalConverter = new(links, RawNumberSequenceToBigIntegerConverter); JsonArrayElementCriterionMatcher = new(this); @@ -336,7 +336,7 @@ public DefaultJsonStorage(ILinks links, IConverter @@ -376,7 +376,7 @@ public TLinkAddress CreateStringValue(string content) public TLinkAddress CreateNumber(decimal number) { var numberSequence = DecimalToRationalConverter.Convert(number); - return Links.GetOrCreate(NumberMarker, numberSequence); + return Links.GetOrCreate(NumberType, numberSequence); } /// @@ -413,7 +413,7 @@ public TLinkAddress CreateNumberValue(decimal number) /// The link /// /// - public TLinkAddress CreateBooleanValue(bool value) => CreateValue(value ? TrueMarker : FalseMarker); + public TLinkAddress CreateBooleanValue(bool value) => CreateValue(value ? TrueType : FalseType); /// /// @@ -425,7 +425,7 @@ public TLinkAddress CreateNumberValue(decimal number) /// The link /// /// - public TLinkAddress CreateNullValue() => CreateValue(NullMarker); + public TLinkAddress CreateNullValue() => CreateValue(NullType); /// /// @@ -444,7 +444,7 @@ public TLinkAddress CreateNumberValue(decimal number) public TLinkAddress CreateDocument(string name) { var documentName = CreateString(name); - return Links.GetOrCreate(DocumentMarker, documentName); + return Links.GetOrCreate(DocumentType, documentName); } /// @@ -460,7 +460,7 @@ public TLinkAddress CreateDocument(string name) public TLinkAddress CreateObject() { var @object = Links.Create(); - return Links.Update(@object, newSource: ObjectMarker, newTarget: @object); + return Links.Update(@object, newSource: ObjectType, newTarget: @object); } /// @@ -495,7 +495,7 @@ public TLinkAddress CreateObjectValue() /// public TLinkAddress CreateArray(IList? array) { - var arraySequence = array.Count == 0 ? EmptyArrayMarker : BalancedVariantConverter.Convert(array); + var arraySequence = array.Count == 0 ? EmptyArrayType : BalancedVariantConverter.Convert(array); return CreateArray(arraySequence); } @@ -513,7 +513,7 @@ public TLinkAddress CreateArray(IList? array) /// The link /// /// - public TLinkAddress CreateArray(TLinkAddress sequence) => Links.GetOrCreate(ArrayMarker, sequence); + public TLinkAddress CreateArray(TLinkAddress sequence) => Links.GetOrCreate(ArrayType, sequence); /// /// @@ -572,7 +572,7 @@ public TLinkAddress CreateArrayValue(TLinkAddress sequence) public TLinkAddress CreateMember(string name) { var nameLink = CreateString(name); - return Links.GetOrCreate(MemberMarker, nameLink); + return Links.GetOrCreate(MemberType, nameLink); } /// @@ -589,7 +589,7 @@ public TLinkAddress CreateMember(string name) /// The link /// /// - public TLinkAddress CreateValue(TLinkAddress value) => Links.GetOrCreate(ValueMarker, value); + public TLinkAddress CreateValue(TLinkAddress value) => Links.GetOrCreate(ValueType, value); /// /// @@ -792,7 +792,7 @@ public TLinkAddress AppendArrayValue(TLinkAddress arrayValue, TLinkAddress appen var array = GetArray(arrayValue); var arraySequence = Links.GetTarget(array); TLinkAddress newArrayValue; - if (EqualityComparer.Equals(arraySequence, EmptyArrayMarker)) + if (EqualityComparer.Equals(arraySequence, EmptyArrayType)) { newArrayValue = CreateArrayValue(appendant); } @@ -821,14 +821,14 @@ public TLinkAddress AppendArrayValue(TLinkAddress arrayValue, TLinkAddress appen public TLinkAddress GetDocumentOrDefault(string name) { var stringSequence = GetStringSequence(name); - var @string = Links.SearchOrDefault(StringMarker, stringSequence); + var @string = Links.SearchOrDefault(StringType, stringSequence); if (EqualityComparer.Equals(@string, default)) { return default; } - return Links.SearchOrDefault(DocumentMarker, @string); + return Links.SearchOrDefault(DocumentType, @string); } - private TLinkAddress GetStringSequence(string content) => content == "" ? EmptyStringMarker : StringToUnicodeSequenceConverter.Convert(content); + private TLinkAddress GetStringSequence(string content) => content == "" ? EmptyStringType : StringToUnicodeSequenceConverter.Convert(content); /// /// @@ -855,10 +855,10 @@ public string GetString(TLinkAddress stringValue) for (int i = 0; i < 3; i++) { source = Links.GetSource(current); - if (EqualityComparer.Equals(source, StringMarker)) + if (EqualityComparer.Equals(source, StringType)) { var sequence = Links.GetTarget(current); - var isEmpty = EqualityComparer.Equals(sequence, EmptyStringMarker); + var isEmpty = EqualityComparer.Equals(sequence, EmptyStringType); return isEmpty ? "" : UnicodeSequenceToStringConverter.Convert(sequence); } current = Links.GetTarget(current); @@ -893,7 +893,7 @@ public decimal GetNumber(TLinkAddress valueLink) { source = Links.GetSource(current); target = Links.GetTarget(current); - if (EqualityComparer.Equals(source, NumberMarker)) + if (EqualityComparer.Equals(source, NumberType)) { return RationalToDecimalConverter.Convert(target); } @@ -928,7 +928,7 @@ public TLinkAddress GetObject(TLinkAddress objectValueLink) for (int i = 0; i < 3; i++) { source = Links.GetSource(current); - if (EqualityComparer.Equals(source, ObjectMarker)) + if (EqualityComparer.Equals(source, ObjectType)) { return current; } @@ -962,7 +962,7 @@ public TLinkAddress GetArray(TLinkAddress arrayValueLink) for (int i = 0; i < 3; i++) { source = Links.GetSource(current); - if (EqualityComparer.Equals(source, ArrayMarker)) + if (EqualityComparer.Equals(source, ArrayType)) { return current; } @@ -1023,7 +1023,7 @@ public TLinkAddress GetValueLink(TLinkAddress parent) return default; case 1: var resultLinkTarget = Links.GetTarget(resultLinks[0]); - if (EqualityComparer.Equals(Links.GetSource(resultLinkTarget), ValueMarker)) + if (EqualityComparer.Equals(Links.GetSource(resultLinkTarget), ValueType)) { return resultLinkTarget; } @@ -1052,11 +1052,11 @@ public TLinkAddress GetValueLink(TLinkAddress parent) /// The target source. /// /// - public TLinkAddress GetValueMarker(TLinkAddress value) + public TLinkAddress GetValueType(TLinkAddress value) { var target = Links.GetTarget(value); var targetSource = Links.GetSource(target); - if (EqualityComparer.Equals(MeaningRoot, targetSource)) + if (EqualityComparer.Equals(Type, targetSource)) { return target; } @@ -1084,8 +1084,8 @@ public List GetMembersLinks(TLinkAddress @object) Links.Each(objectMemberLink => { var memberLink = Links.GetTarget(objectMemberLink); - var memberMarker = Links.GetSource(memberLink); - if (EqualityComparer.Equals(memberMarker, MemberMarker)) + var memberType = Links.GetSource(memberLink); + if (EqualityComparer.Equals(memberType, MemberType)) { members.Add(Links.GetIndex(objectMemberLink)); }