修改 类名 方法名

Author: toolgood

csharp/ToolGood.Algorithm2/AlgorithmEngine.cs

@@ -312,7 +312,7 @@ public bool Parse(string exp)
             }
             //try {
 
-            var stream = new CaseChangingCharStream(new AntlrInputStream(exp));
+            var stream = new AntlrCharStream(new AntlrInputStream(exp));
             var lexer = new mathLexer(stream);
             var tokens = new CommonTokenStream(lexer);
             var parser = new mathParser(tokens);

csharp/ToolGood.Algorithm2/ConditionCache.cs

@@ -121,7 +121,7 @@ private ProgContext Parse(string exp)
         {
             if (string.IsNullOrWhiteSpace(exp)) { return null; }
             try {
-                var stream = new CaseChangingCharStream(new AntlrInputStream(exp));
+                var stream = new AntlrCharStream(new AntlrInputStream(exp));
                 var lexer = new mathLexer(stream);
                 var tokens = new CommonTokenStream(lexer);
                 var parser = new mathParser(tokens);

…thm2/Internals/CaseChangingCharStream.cs ….Algorithm2/Internals/AntlrCharStream.cscsharp/ToolGood.Algorithm2/Internals/CaseChangingCharStream.cs renamed to csharp/ToolGood.Algorithm2/Internals/AntlrCharStream.cs csharp/ToolGood.Algorithm2/Internals/CaseChangingCharStream.cs renamed to csharp/ToolGood.Algorithm2/Internals/AntlrCharStream.cs

@@ -16,7 +16,7 @@ namespace ToolGood.Algorithm.Internals
     /// 'BEGIN' if constructor parameter upper=true but getText() would return
     /// 'BeGiN'.
     /// </summary>
-    class CaseChangingCharStream : ICharStream
+    class AntlrCharStream : ICharStream
     {
         private ICharStream stream;
 
@@ -26,7 +26,7 @@ class CaseChangingCharStream : ICharStream
         /// </summary>
         /// <param name="stream">The stream to wrap.</param>
         /// <param name="upper">If true force each symbol to upper case, otherwise force to lower.</param>
-        public CaseChangingCharStream(ICharStream stream)
+        public AntlrCharStream(ICharStream stream)
         {
             this.stream = stream;
         }

…ithm2/Internals/LookupAlgorithmEngine.cs …lgorithm2/Internals/AntlrLookupEngine.cscsharp/ToolGood.Algorithm2/Internals/LookupAlgorithmEngine.cs renamed to csharp/ToolGood.Algorithm2/Internals/AntlrLookupEngine.cs csharp/ToolGood.Algorithm2/Internals/LookupAlgorithmEngine.cs renamed to csharp/ToolGood.Algorithm2/Internals/AntlrLookupEngine.cs

@@ -6,7 +6,7 @@
 
 namespace ToolGood.Algorithm.Internals
 {
-    class LookupAlgorithmEngine : AlgorithmEngine
+    class AntlrLookupEngine : AlgorithmEngine
     {
         public Operand Json;
 

csharp/ToolGood.Algorithm2/Internals/Base64.cs

@@ -60,15 +60,6 @@ public static byte[] FromBase64ForUrlString(string base64ForUrlInput)
             int padChars = (len % 4) == 0 ? 0 : (4 - (len % 4));
             if (padChars > 0) sb.Append(String.Empty.PadRight(padChars, '='));
             return Convert.FromBase64String(sb.ToString());
-
-            //base64ForUrlInput = Regex.Replace(base64ForUrlInput, @"[^a-zA-Z0-9+/\-_]", "");
-
-            //int padChars = (base64ForUrlInput.Length % 4) == 0 ? 0 : (4 - (base64ForUrlInput.Length % 4));
-            //StringBuilder result = new StringBuilder(base64ForUrlInput, base64ForUrlInput.Length + padChars);
-            //result.Append(String.Empty.PadRight(padChars, '='));
-            //result.Replace('-', '+');
-            //result.Replace('_', '/');
-            //return Convert.FromBase64String(result.ToString());
         }
     }
 }

csharp/ToolGood.Algorithm2/Internals/CharUtil.cs

@@ -32,34 +32,46 @@ public static char StandardChar(char c)
             return char.ToUpperInvariant(o);
         }
 
-        public static bool Equals(string left, string right)
+        public static bool EqualsOnce(string left, string right)
         {
-            if (left == null) return false;
-            if (right == null) return false;
             if (left.Length != right.Length) return false;
             for (int i = 0; i < left.Length; i++) {
-                var a = StandardChar(left[i]);
-                var b = StandardChar(right[i]);
-                if (a != b) {
-                    return false;
+                if (left[i] != right[i]) {
+                    var a = StandardChar(left[i]);
+                    var b = StandardChar(right[i]);
+                    if (a != b) return false;
                 }
             }
             return true;
         }
+
+        public static bool Equals(string left, string right)
+        {
+            if (left == null) return false;
+            if (right == null) return false;
+            return EqualsOnce(left, right);
+        }
         public static bool Equals(string left, string arg1, string arg2)
         {
-            if (Equals(left, arg1))
+            if (left == null) return false;
+            if (arg1 != null && EqualsOnce(left, arg1))
+                return true;
+            if (arg2 != null && EqualsOnce(left, arg2))
                 return true;
-            return Equals(left, arg2);
+            return false;
         }
 
-        public static bool Equals(string left, string arg1, string arg2,string arg3)
+        public static bool Equals(string left, string arg1, string arg2, string arg3)
         {
-            if (Equals(left, arg1))
+            if (left == null) return false;
+            if (left == null) return false;
+            if (arg1 != null && EqualsOnce(left, arg1))
+                return true;
+            if (arg2 != null && EqualsOnce(left, arg2))
                 return true;
-            if (Equals(left, arg2))
+            if (arg3 != null && EqualsOnce(left, arg3))
                 return true;
-            return Equals(left, arg3);
+            return false;
         }
 
     }

csharp/ToolGood.Algorithm2/Internals/ConditionCacheInfo.cs

@@ -42,7 +42,7 @@ private ProgContext Parse(string exp)
         {
             if (string.IsNullOrWhiteSpace(exp)) { return null; }
             try {
-                var stream = new CaseChangingCharStream(new AntlrInputStream(exp));
+                var stream = new AntlrCharStream(new AntlrInputStream(exp));
                 var lexer = new mathLexer(stream);
                 var tokens = new CommonTokenStream(lexer);
                 var parser = new mathParser(tokens);