felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow any of the args to date() function to be a date,

Browse Source 
in which case we just extract the appropriate part.
This commit is contained in:
David F. Skoll
2008-09-20 11:07:33 -04:00
parent 36035dda01
commit 1bffa0e00b
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/funcs.c
View File

@@ -418,14 +418,33 @@ static int FBaseyr(void)
static int FDate(void)
{
int y, m, d;
if (ARG(0).type != INT_TYPE ||
ARG(1).type != INT_TYPE ||
ARG(2).type != INT_TYPE) return E_BAD_TYPE;
y = ARGV(0);
m = ARGV(1) - 1;
d = ARGV(2);
int ytemp, mtemp, dtemp;
if (!DateOK(y, m, d)) return E_BAD_DATE;
/* Any arg can be a date (in which case we use the corresponding
component) or an integer */
if (HASDATE(ARG(0))) {
FromJulian(DATEPART(ARG(0)), &ytemp, &mtemp, &dtemp);
y = ytemp;
} else {
ASSERT_TYPE(0, INT_TYPE);
y = ARGV(0);
}
if (HASDATE(ARG(1))) {
FromJulian(DATEPART(ARG(1)), &ytemp, &mtemp, &dtemp);
m = mtemp;
} else {
ASSERT_TYPE(1, INT_TYPE);
m = ARGV(1) - 1;
}
if (HASDATE(ARG(2))) {
FromJulian(DATEPART(ARG(2)), &ytemp, &mtemp, &dtemp);
d = dtemp;
} else {
ASSERT_TYPE(2, INT_TYPE);
d = ARGV(2);
}
RetVal.type = DATE_TYPE;
RetVal.v.val = Julian(y, m, d);