crontab: constraint order is month, day, day-of-week, hour, minute.

diff --git a/extra/crontab/crontab.factor b/extra/crontab/crontab.factor
index fc64c932510d562c71808c50c627dfbe417cbeb1..0b09c3c07e3dc6badd7e4a2adc304044135e16a1 100644 (file)
--- a/extra/crontab/crontab.factor
+++ b/extra/crontab/crontab.factor
@@ -76,6 +76,14 @@ CONSTANT: aliases H{
         cronentry days>> first >>day 1 +month
     ] if* [ cronentry timestamp (next-time-after) ] when
 
+    timestamp day-of-week :> weekday
+    cronentry days-of-week>> [ weekday >= ] find nip [
+        cronentry days-of-week>> first 7 +
+    ] unless* weekday - [
+        timestamp 0 >>hour 0 >>minute swap +day drop
+        cronentry timestamp (next-time-after)
+    ] unless-zero
+
     timestamp hour>> :> hour
     cronentry hours>> [ hour >= ] find nip [
         dup hour = [ drop f ] [
@@ -91,15 +99,7 @@ CONSTANT: aliases H{
         dup minute = [ drop f ] [ timestamp minute<< t ] if
     ] [
         timestamp cronentry minutes>> first >>minute 1 +hour
-    ] if* [ cronentry timestamp (next-time-after) ] when
-
-    timestamp day-of-week :> weekday
-    cronentry days-of-week>> [ weekday >= ] find nip [
-        cronentry days-of-week>> first 7 +
-    ] unless* weekday - [
-        timestamp swap +day drop
-        cronentry timestamp (next-time-after)
-    ] unless-zero ;
+    ] if* [ cronentry timestamp (next-time-after) ] when ;
 
 PRIVATE>