Bug fix for N/1 ignoring remaining field values; closes #16

Author: atifaziz

NCrontab.Tests/CrontabScheduleTests.cs

@@ -253,6 +253,9 @@ public void Formatting(string format, string expression, bool includingSeconds)
         [TestCase("28/02/2003 12:01:00", "1 12 28 2 *", "28/02/2004 12:01:00", false)]
         [TestCase("29/02/2004 12:01:00", "1 12 28 2 *", "28/02/2005 12:01:00", false)]
 
+        [TestCase("01/01/2000 12:00:00", "40 14/1 * * *", "01/01/2000 14:40:00", false)]
+        [TestCase("01/01/2000 14:40:00", "40 14/1 * * *", "01/01/2000 15:40:00", false)]
+
         public void Evaluations(string startTimeString, string cronExpression, string nextTimeString, bool includingSeconds)
         {
             CronCall(startTimeString, cronExpression, nextTimeString, new ParseOptions

NCrontab/AssemblyInfo.g.cs

@@ -1,8 +1,8 @@
 // This code was generated by a tool. Any changes made manually will be lost
 // the next time this code is regenerated.
-// Generated: Fri, 11 Dec 2015 07:45:17 GMT
- 
+// Generated: Thu, 20 Oct 2016 06:08:37 GMT
+
 using System.Reflection;
- 
-[assembly: AssemblyVersion("3.1.19111.0")]
-[assembly: AssemblyFileVersion("3.1.19111.745")]
+
+[assembly: AssemblyVersion("3.1.20120.0")]
+[assembly: AssemblyFileVersion("3.1.20120.608")]

NCrontab/CrontabFieldImpl.cs

@@ -220,7 +220,7 @@ T InternalParse<T>(string str, CrontabFieldAccumulator<T> acc, T success, Func<E
                 return result;
             }
 
-            var every = 1;
+            int? every = null;
 
             //
             // Look for stepping first (e.g. */2 = every 2nd).
@@ -240,7 +240,7 @@ T InternalParse<T>(string str, CrontabFieldAccumulator<T> acc, T success, Func<E
 
             if (str.Length == 1 && str[0]== '*')
             {
-                return acc(-1, -1, every, success, errorSelector);
+                return acc(-1, -1, every ?? 1, success, errorSelector);
             }
 
             //
@@ -254,7 +254,7 @@ T InternalParse<T>(string str, CrontabFieldAccumulator<T> acc, T success, Func<E
                 var first = ParseValue(str.Substring(0, dashIndex));
                 var last = ParseValue(str.Substring(dashIndex + 1));
 
-                return acc(first, last, every, success, errorSelector);
+                return acc(first, last, every ?? 1, success, errorSelector);
             }
 
             //
@@ -263,11 +263,11 @@ T InternalParse<T>(string str, CrontabFieldAccumulator<T> acc, T success, Func<E
 
             var value = ParseValue(str);
 
-            if (every == 1)
+            if (every == null)
                 return acc(value, value, 1, success, errorSelector);
 
             Debug.Assert(every != 0);
-            return acc(value, MaxValue, every, success, errorSelector);
+            return acc(value, MaxValue, every.Value, success, errorSelector);
         }
 
         int ParseValue(string str)