Merge pull request #18 from SimpleStateMachine/dev

RomanSoloweow · web-flow · commit 8d4087308e02 · 2022-10-27T02:31:32.000+04:00
fix ArgumentOutOfRangeException exception
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/Expr.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/Expr.cs
@@ -96,7 +96,7 @@ public double Invoke()
                 UnaryOperatorType.Decrement => Expr.Invoke() - 1,
                 UnaryOperatorType.Plus => - Expr.Invoke(),
                 UnaryOperatorType.Minus => + Expr.Invoke(),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(Type), Type, null)
             };
         }
     }
@@ -135,7 +135,7 @@ public double Invoke()
                 BinaryOperatorType.Mul => Left.Invoke() * Right.Invoke(),
                 BinaryOperatorType.Div => Left.Invoke() / Right.Invoke(),
                 BinaryOperatorType.Sub => Left.Invoke() - Right.Invoke(),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(Type), Type, null)
             };
         }
     }
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/LogicalHelper.cs b/src/SimpleStateMachine.StructuralSearch/Helper/LogicalHelper.cs
@@ -3,7 +3,7 @@
 
 namespace SimpleStateMachine.StructuralSearch.Helper
 {
-    public static class  LogicalHelper
+    public static class LogicalHelper
     {
         public static bool Calculate(BinaryRuleType type, bool left, bool right)
         {
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/MatchHelper.cs b/src/SimpleStateMachine.StructuralSearch/Helper/MatchHelper.cs
@@ -12,7 +12,7 @@ public static ParenthesisType GetParenthesisType((char c1, char c2) parenthesis)
             (Constant.LeftParenthesis, Constant.RightParenthesis) => ParenthesisType.Usual,
             (Constant.LeftSquareParenthesis, Constant.RightSquareParenthesis) => ParenthesisType.Square,
             (Constant.LeftCurlyParenthesis, Constant.RightCurlyParenthesis) => ParenthesisType.Curly,
-            _ => throw new ArgumentOutOfRangeException()
+            _ => throw new ArgumentOutOfRangeException(nameof(parenthesis), parenthesis, null)
         };
 
         return type;
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/StringHelper.cs b/src/SimpleStateMachine.StructuralSearch/Helper/StringHelper.cs
@@ -0,0 +1,15 @@
+﻿using System.Linq;
+using System.Text;
+
+namespace SimpleStateMachine.StructuralSearch.Helper;
+
+public static class StringHelper
+{
+    public static string FormatPrivateVar(this string str)
+    {
+        var stringBuilder = new StringBuilder(str.Length - 1);
+        stringBuilder.Append(char.ToUpper(str[1]));
+        stringBuilder.Append(str[2..]);
+        return stringBuilder.ToString();
+    }
+}
diff --git a/src/SimpleStateMachine.StructuralSearch/ParsingContext.cs b/src/SimpleStateMachine.StructuralSearch/ParsingContext.cs
@@ -6,28 +6,27 @@ namespace SimpleStateMachine.StructuralSearch
     public class ParsingContext : IParsingContext
     {
         public static readonly EmptyParsingContext Empty = new (SimpleStateMachine.StructuralSearch.Input.Empty);
-
+        private readonly Dictionary<string, IPlaceholder> _placeholders = new();
+        public IInput Input { get; }
+        
         public ParsingContext(IInput input)
         {
             Input = input;
         }
-        public readonly Dictionary<string, IPlaceholder> Placeholders = new();
-
-        public IInput Input { get; }
 
         public bool TryGetPlaceholder(string name, out IPlaceholder value)
         {
-            return Placeholders.TryGetValue(name, out value);
+            return _placeholders.TryGetValue(name, out value);
         }
 
         public void AddPlaceholder(IPlaceholder placeholder)
         {
-            Placeholders[placeholder.Name] = placeholder;
+            _placeholders[placeholder.Name] = placeholder;
         }
 
         public IPlaceholder GetPlaceholder(string name)
         {
-            return Placeholders[name];
+            return _placeholders[name];
         }
         
         public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)
@@ -36,13 +35,13 @@ public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)
             
             foreach (var placeholder in placeholders)
             {
-                Placeholders.Add(placeholder.Key, placeholder.Value);
+                _placeholders.Add(placeholder.Key, placeholder.Value);
             }
         }
 
         public IReadOnlyDictionary<string, IPlaceholder> Clear()
         {
-            var placeholders = Placeholders
+            var placeholders = _placeholders
                 .OrderBy(x=> x.Value.Offset.Start)
                 .ToDictionary(x=> x.Key, x=> x.Value);
             
@@ -53,7 +52,7 @@ public IReadOnlyDictionary<string, IPlaceholder> Clear()
 
         private void ClearInternal()
         {
-            Placeholders.Clear();;
+            _placeholders.Clear();;
         }
     }
 }
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/BinarySubRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/BinarySubRule.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Text.RegularExpressions;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -28,7 +29,7 @@ public bool Execute(ref IParsingContext context)
                 SubRuleType.StartsWith => left.StartsWith(right),
                 SubRuleType.EndsWith => left.EndsWith(right),
                 SubRuleType.Match => Regex.IsMatch(left, right),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)
             };
         }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/IsSubRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/IsSubRule.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using SimpleStateMachine.StructuralSearch.Extensions;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -25,7 +26,7 @@ public bool Execute(ref IParsingContext context)
                 PlaceholderType.Double => double.TryParse(value, out _),
                 PlaceholderType.DateTime => DateTime.TryParse(value, out _),
                 PlaceholderType.Guid => Guid.TryParse(value, out _),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_argument).FormatPrivateVar(), _argument, null)
             };
         }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/UnaryRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/FindRule/UnaryRule.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -20,7 +21,7 @@ public bool Execute(ref IParsingContext context)
             return _type switch
             {
                 UnaryRuleType.Not => !result,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)
             };
         }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderColumnParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderColumnParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -22,7 +23,7 @@ public string GetValue(ref IParsingContext context)
             {
                 ColumnProperty.Start => column.Start,
                 ColumnProperty.End => column.End,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_property).FormatPrivateVar(), _property, null)
             };
 
             return value.ToString();
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderFileParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderFileParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -25,7 +26,7 @@ public string GetValue(ref IParsingContext context)
                 FileProperty.Extension => input.Extension,
                 FileProperty.Name => input.Name,
                 FileProperty.Lenght => input.Lenght.ToString(),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_property).FormatPrivateVar(), _property, null)
             };
         }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderLineParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderLineParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -22,7 +23,7 @@ public string GetValue(ref IParsingContext context)
             {
                 LineProperty.Start => line.Start,
                 LineProperty.End => line.End,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_property).FormatPrivateVar(), _property, null)
             };
 
             return value.ToString();
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderOffsetParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderOffsetParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Rules
 {
@@ -21,7 +22,7 @@ public string GetValue(ref IParsingContext context)
             {
                 OffsetProperty.Start => offset.Start,
                 OffsetProperty.End => offset.End,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_property).FormatPrivateVar(), _property, null)
             };
 
             return value.ToString();
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeBinaryParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeBinaryParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch;
@@ -24,7 +25,7 @@ public string GetValue(ref IParsingContext context)
             ChangeType.TrimStart => value.TrimStart(),
             ChangeType.ToUpper => value.ToUpper(),
             ChangeType.ToLower => value.ToLower(),
-            _ => throw new ArgumentOutOfRangeException()
+            _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)
         };
     }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch
@@ -24,7 +25,7 @@ public string GetValue(ref IParsingContext context)
                 ChangeType.TrimStart => value.TrimStart(),
                 ChangeType.ToUpper => value.ToUpper(),
                 ChangeType.ToLower => value.ToLower(),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)
             };
         }
         
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeUnaryParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ChangeUnaryParameter.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch;
@@ -23,7 +24,7 @@ public string GetValue(ref IParsingContext context)
         return _type switch
         {
             ChangeUnaryType.RemoveSubStr => parameter.Replace(arg, string.Empty),
-            _ => throw new ArgumentOutOfRangeException()
+            _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)
         };
     }
         

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public double Invoke()`
`96`	`96`	`UnaryOperatorType.Decrement => Expr.Invoke() - 1,`
`97`	`97`	`UnaryOperatorType.Plus => - Expr.Invoke(),`
`98`	`98`	`UnaryOperatorType.Minus => + Expr.Invoke(),`
`99`		`- _ => throw new ArgumentOutOfRangeException()`
	`99`	`+ _ => throw new ArgumentOutOfRangeException(nameof(Type), Type, null)`
`100`	`100`	`};`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -135,7 +135,7 @@ public double Invoke()`
`135`	`135`	`BinaryOperatorType.Mul => Left.Invoke() * Right.Invoke(),`
`136`	`136`	`BinaryOperatorType.Div => Left.Invoke() / Right.Invoke(),`
`137`	`137`	`BinaryOperatorType.Sub => Left.Invoke() - Right.Invoke(),`
`138`		`- _ => throw new ArgumentOutOfRangeException()`
	`138`	`+ _ => throw new ArgumentOutOfRangeException(nameof(Type), Type, null)`
`139`	`139`	`};`
`140`	`140`	`}`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace SimpleStateMachine.StructuralSearch.Helper`
`5`	`5`	`{`
`6`		`- public static class LogicalHelper`
	`6`	`+ public static class LogicalHelper`
`7`	`7`	`{`
`8`	`8`	`public static bool Calculate(BinaryRuleType type, bool left, bool right)`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,28 +6,27 @@ namespace SimpleStateMachine.StructuralSearch`
`6`	`6`	`public class ParsingContext : IParsingContext`
`7`	`7`	`{`
`8`	`8`	`public static readonly EmptyParsingContext Empty = new (SimpleStateMachine.StructuralSearch.Input.Empty);`
`9`		`-`
	`9`	`+ private readonly Dictionary<string, IPlaceholder> _placeholders = new();`
	`10`	`+ public IInput Input { get; }`
	`11`	`+`
`10`	`12`	`public ParsingContext(IInput input)`
`11`	`13`	`{`
`12`	`14`	`Input = input;`
`13`	`15`	`}`
`14`		`- public readonly Dictionary<string, IPlaceholder> Placeholders = new();`
`15`		`-`
`16`		`- public IInput Input { get; }`
`17`	`16`
`18`	`17`	`public bool TryGetPlaceholder(string name, out IPlaceholder value)`
`19`	`18`	`{`
`20`		`- return Placeholders.TryGetValue(name, out value);`
	`19`	`+ return _placeholders.TryGetValue(name, out value);`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`public void AddPlaceholder(IPlaceholder placeholder)`
`24`	`23`	`{`
`25`		`- Placeholders[placeholder.Name] = placeholder;`
	`24`	`+ _placeholders[placeholder.Name] = placeholder;`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`public IPlaceholder GetPlaceholder(string name)`
`29`	`28`	`{`
`30`		`- return Placeholders[name];`
	`29`	`+ return _placeholders[name];`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)`
`@@ -36,13 +35,13 @@ public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)`
`36`	`35`
`37`	`36`	`foreach (var placeholder in placeholders)`
`38`	`37`	`{`
`39`		`- Placeholders.Add(placeholder.Key, placeholder.Value);`
	`38`	`+ _placeholders.Add(placeholder.Key, placeholder.Value);`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`public IReadOnlyDictionary<string, IPlaceholder> Clear()`
`44`	`43`	`{`
`45`		`- var placeholders = Placeholders`
	`44`	`+ var placeholders = _placeholders`
`46`	`45`	`.OrderBy(x=> x.Value.Offset.Start)`
`47`	`46`	`.ToDictionary(x=> x.Key, x=> x.Value);`
`48`	`47`
`@@ -53,7 +52,7 @@ public IReadOnlyDictionary<string, IPlaceholder> Clear()`
`53`	`52`
`54`	`53`	`private void ClearInternal()`
`55`	`54`	`{`
`56`		`- Placeholders.Clear();;`
	`55`	`+ _placeholders.Clear();;`
`57`	`56`	`}`
`58`	`57`	`}`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Text.RegularExpressions;`
	`3`	`+using SimpleStateMachine.StructuralSearch.Helper;`
`3`	`4`
`4`	`5`	`namespace SimpleStateMachine.StructuralSearch.Rules`
`5`	`6`	`{`
`@@ -28,7 +29,7 @@ public bool Execute(ref IParsingContext context)`
`28`	`29`	`SubRuleType.StartsWith => left.StartsWith(right),`
`29`	`30`	`SubRuleType.EndsWith => left.EndsWith(right),`
`30`	`31`	`SubRuleType.Match => Regex.IsMatch(left, right),`
`31`		`- _ => throw new ArgumentOutOfRangeException()`
	`32`	`+ _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)`
`32`	`33`	`};`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using SimpleStateMachine.StructuralSearch.Extensions;`
	`3`	`+using SimpleStateMachine.StructuralSearch.Helper;`
`3`	`4`
`4`	`5`	`namespace SimpleStateMachine.StructuralSearch.Rules`
`5`	`6`	`{`
`@@ -25,7 +26,7 @@ public bool Execute(ref IParsingContext context)`
`25`	`26`	`PlaceholderType.Double => double.TryParse(value, out _),`
`26`	`27`	`PlaceholderType.DateTime => DateTime.TryParse(value, out _),`
`27`	`28`	`PlaceholderType.Guid => Guid.TryParse(value, out _),`
`28`		`- _ => throw new ArgumentOutOfRangeException()`
	`29`	`+ _ => throw new ArgumentOutOfRangeException(nameof(_argument).FormatPrivateVar(), _argument, null)`
`29`	`30`	`};`
`30`	`31`	`}`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using SimpleStateMachine.StructuralSearch.Helper;`
`2`	`3`
`3`	`4`	`namespace SimpleStateMachine.StructuralSearch.Rules`
`4`	`5`	`{`
`@@ -20,7 +21,7 @@ public bool Execute(ref IParsingContext context)`
`20`	`21`	`return _type switch`
`21`	`22`	`{`
`22`	`23`	`UnaryRuleType.Not => !result,`
`23`		`- _ => throw new ArgumentOutOfRangeException()`
	`24`	`+ _ => throw new ArgumentOutOfRangeException(nameof(_type).FormatPrivateVar(), _type, null)`
`24`	`25`	`};`
`25`	`26`	`}`
`26`	`27`