GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Dates

Browse source 
- Eliminated redundant implementations of daysInMonth().
This commit is contained in:
Paul Beckingham 2014-07-05 13:01:01 -04:00
parent 8861193999
commit fb48177e90
1 changed files with 11 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/Dates.cpp
View file

@ -29,6 +29,7 @@
#include <time.h> #include <time.h>
#include <text.h> #include <text.h>
#include <Dates.h> #include <Dates.h>
#include <Date.h>
#include <i18n.h> #include <i18n.h>
static const char* days[] = static const char* days[] =
@ -41,36 +42,20 @@ static const char* days_short[] =
"sun", "mon", "tue", "wed", "thu", "fri", "sat", "sun", "mon", "tue", "wed", "thu", "fri", "sat",
}; };
static const char* months[] =
{
"january", "february", "march", "april", "may", "june",
"july", "august", "september", "october", "november", "december",
};
static const char* months_short[] =
{
"jan", "feb", "mar", "apr", "may", "jun",
"jul", "aug", "sep", "oct", "nov", "dec",
};
static int month_days[12] =
{
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
};
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool isMonth (const std::string& name, int& i) static bool isMonth (const std::string& name, int& i)
{ {
for (i = 0; i < 12; i++) i = Date::monthOfYear (name) - 1;
if (name == months[i] || name == months_short[i]) return i != -2 ? true : false;
return true;
return false;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static bool isDay (const std::string& name, int& i) static bool isDay (const std::string& name, int& i)
{ {
/*
i = Date::dayOfWeek (name) - 1;
return i != -2 ? true : false;
*/
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
if (name == days[i] || name == days_short[i]) if (name == days[i] || name == days_short[i])
return true; return true;
@ -79,20 +64,13 @@ static bool isDay (const std::string& name, int& i)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/**/
static bool leapYear (int year) static bool leapYear (int year)
{ {
return ((!(year % 4)) && (year % 100)) || return ((!(year % 4)) && (year % 100)) ||
(!(year % 400)); (!(year % 400));
} }
/**/
////////////////////////////////////////////////////////////////////////////////
static int daysInMonth (int year, int month)
{
if (month == 2 && leapYear (year))
return 29;
return month_days[month - 1];
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void easter (struct tm* t) static void easter (struct tm* t)
@ -341,7 +319,7 @@ bool namedDates (const std::string& name, Variant& value)
t->tm_hour = 24; t->tm_hour = 24;
t->tm_min = 0; t->tm_min = 0;
t->tm_sec = -1; t->tm_sec = -1;
t->tm_mday = daysInMonth (t->tm_year + 1900, t->tm_mon + 1); t->tm_mday = Date::daysInMonth (t->tm_mon + 1, t->tm_year + 1900);
t->tm_isdst = -1; t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date); value = Variant (mktime (t), Variant::type_date);
} }
@ -454,7 +432,7 @@ bool namedDates (const std::string& name, Variant& value)
// If it is this month. // If it is this month.
if (d < number && if (d < number &&
number <= daysInMonth (y, m)) number <= Date::daysInMonth (m, y))
{ {
t->tm_hour = t->tm_min = t->tm_sec = 0; t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_mon = m - 1; t->tm_mon = m - 1;