Fixes #20

Underscore and colon's not read. Issue with pattern not matching when last segment of pattern ends with a * and the string being matched contains more characters for that * to match on.
dazinator · Mar 6, 2017 · 289b206 · 289b206
1 parent c610aab
commit 289b206
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/src/DotNet.Glob/Evaluation/CompositeTokenEvaluator.cs b/src/DotNet.Glob/Evaluation/CompositeTokenEvaluator.cs
@@ -115,6 +115,13 @@ public bool IsMatch(string allChars, int currentPosition, out int newPosition)
                 return false;
             }
 
+            //if (_Evaluators.Count == 0)
+            //{
+            //    // no sub evaluators in this composite.
+            //    // happens for wildcards that are at the end of a pattern.
+            //    return true;
+            //}
+
             foreach (var matcher in _Evaluators)
             {
                 if (!matcher.IsMatch(allChars, newPosition, out newPosition))
@@ -135,6 +142,8 @@ public bool IsMatch(string allChars, int currentPosition, out int newPosition)
 
         public bool ConsumesVariableLength { get; protected set; }
 
+        public int EvaluatorCount { get { return _Evaluators.Count; } }
+
         protected void AddEvaluator(IGlobTokenEvaluator evaluator)
         {
             _Evaluators.Add(evaluator);

diff --git a/src/DotNet.Glob/Evaluation/WildcardTokenEvaluator.cs b/src/DotNet.Glob/Evaluation/WildcardTokenEvaluator.cs
@@ -9,11 +9,13 @@ public class WildcardTokenEvaluator : IGlobTokenEvaluator
         private readonly WildcardToken _token;
         //private readonly IGlobToken[] _subTokens;
         private readonly CompositeTokenEvaluator _subEvaluator;
+        private readonly bool _requiresSubEvaluation;
 
         public WildcardTokenEvaluator(WildcardToken token, CompositeTokenEvaluator subEvaluator)
         {
             _token = token;
             _subEvaluator = subEvaluator;
+            _requiresSubEvaluation = _subEvaluator.EvaluatorCount > 0;
         }
 
         #region IGlobTokenEvaluator
@@ -22,6 +24,33 @@ public bool IsMatch(string allChars, int currentPosition, out int newPosition)
         {
 
             newPosition = currentPosition;
+
+            // If the glob is last in a pattern, there is no remaining patterns that need matching.
+            // In that case we just match every thing until we reach a seperator, at which point we fail.
+
+            if (!_requiresSubEvaluation)
+            {
+                // if we are at the end of the string, we match!
+                if (currentPosition >= allChars.Length)
+                {
+                    return true;
+                }
+
+                for (int i = currentPosition; i <= allChars.Length -1; i++)
+                {
+                    var currentChar = allChars[i];
+                    if (currentChar == '/' || currentChar == '\\')
+                    {
+                        return false;
+                    }                   
+                }
+
+                newPosition = currentPosition + allChars.Length;
+                return true;
+
+            }
+
+            // We have remaining pattern to evaluate.
             if (!_subEvaluator.ConsumesVariableLength)
             {
                 // The remaining tokens match against a fixed length string, so wildcard **must** consume
@@ -54,7 +83,8 @@ public bool IsMatch(string allChars, int currentPosition, out int newPosition)
                 if (currentChar == '/' || currentChar == '\\')
                 {
                     return false;
-                }
+                }                   
+
 
                 //int newSubPosition;
                 var isMatch = _subEvaluator.IsMatch(allChars, i, out newPosition);

diff --git a/src/DotNet.Glob/GlobStringReader.cs b/src/DotNet.Glob/GlobStringReader.cs
@@ -24,7 +24,7 @@ public class GlobStringReader : StringReader
         //public const char HashChar = '#';
 
 
-        public static char[] AllowedNonAlphaNumericChars = new[] { '.', ' ', '!', '#', '-', ';', '=', '@', '~' };
+        public static char[] AllowedNonAlphaNumericChars = new[] { '.', ' ', '!', '#', '-', ';', '=', '@', '~', '_',':' };
 
         /// <summary>
         /// The current delimiters