Add zero-argument form of wouldtrig.

This commit is contained in:
Dianne Skoll
2022-03-04 11:16:33 -05:00
parent 669be7bf57
commit 905287901f

View File

@@ -305,7 +305,7 @@ BuiltinFunc Func[] = {
{ "weekno", 0, 3, 1, FWeekno },
{ "wkday", 1, 1, 1, FWkday },
{ "wkdaynum", 1, 1, 1, FWkdaynum },
{ "wouldtrig", 1, 2, 0, FWouldTrig },
{ "wouldtrig", 0, 2, 0, FWouldTrig },
{ "year", 1, 1, 1, FYear }
};
@@ -3010,6 +3010,8 @@ FEvalTrig(func_info *info)
}
return OK;
}
static int LastWouldTrig = 0;
static int
FWouldTrig(func_info *info)
{
@@ -3019,6 +3021,12 @@ FWouldTrig(func_info *info)
int jul, scanfrom;
int r;
if (Nargs == 0) {
RetVal.type = DATE_TYPE;
RETVAL = LastWouldTrig;
return OK;
}
ASSERT_TYPE(0, STR_TYPE);
if (Nargs >= 2) {
if (!HASDATE(ARG(1))) return E_BAD_TYPE;
@@ -3057,6 +3065,7 @@ FWouldTrig(func_info *info)
return OK;
}
if (ShouldTriggerReminder(&trig, &tim, jul, &r)) {
LastWouldTrig = jul;
RETVAL = 1;
}
DestroyParser(&p);