Skip to content

Add time offset to current_date #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EduardoRSeifert wants to merge 3 commits into from
Closed

Add time offset to current_date #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1431d0
Move auxiliar functions up (should this be a separate file?
EduardoRSeifert Dec 5, 2024
ee4d38f
Add timezone to current_date
EduardoRSeifert Dec 5, 2024
39ef10a
add tests
EduardoRSeifert Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
282 changes: 158 additions & 124 deletions parser/mpFuncCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,136 @@

MUP_NAMESPACE_START

//------------------------------------------------------------------------------
// |
// Time auxiliar functions! |
// |
//------------------------------------------------------------------------------

int calculate_hour_offset(int original_hour, int gmt_offset) {
return ((original_hour + gmt_offset) % 24 + 24) % 24;
}

string_type format_time (struct tm time, int gmt_offset) {
char buffer[9];
int hours = calculate_hour_offset(time.tm_hour, gmt_offset);
snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d", hours, time.tm_min, time.tm_sec);

return std::string(buffer);
}

//------------------------------------------------------------------------------
// |
// Date auxiliar functions! |
// |
//------------------------------------------------------------------------------

// https://en.wikipedia.org/wiki/Rata_Die
int rata_die (int y, int m, int d) { /* Rata Die day one is 0001-01-01 */
if (m < 3)
y--, m += 12;
return 365*y + y/4 - y/100 + y/400 + (153*m - 457)/5 + d - 306;
}

string_type format_date (struct tm time, bool is_date_time) {
string_type year = std::to_string(time.tm_year + 1900);
string_type month = std::to_string(time.tm_mon + 1);
string_type day = std::to_string(time.tm_mday);
string_type hours = std::to_string(time.tm_hour);
string_type min = std::to_string(time.tm_min);

month = month.length() > 1 ? month : '0' + month;
day = day.length() > 1 ? day : '0' + day;
hours = hours.length() > 1 ? hours : '0' + hours;
min = min.length() > 1 ? min : '0' + min;

if (is_date_time) {
return(year + "-" + month + "-" + day + "T" + hours + ":" + min);
} else {
return(year + "-" + month + "-" + day);
}
}

void add_days (struct tm* date, float_type days) {
// Avoid mismatch between winter and summer time on mktime() conversion
date->tm_isdst = -1;

// Seconds since start of epoch
time_t new_day = mktime(date) + (days * ONE_DAY);

// Update caller's date
// localtime is used because mktime converts from localtime to UTC and we need to convert it back
*date = *localtime(&new_day);
}

void raise_error (EErrorCodes error, int position, const ptr_val_type *arguments) {
ErrorContext err;
err.Errc = error;
err.Arg = position;
err.Type1 = arguments[position - 1]->GetType();
err.Type2 = 's';
throw ParserError(err);
}

string_type localized_weekday(int week_day, const ptr_val_type *a_pArg) {
string_type locale = a_pArg[1]->GetString();
string_type ret = "";
string_type localized_weekdays[8][7] = {
{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"},
{"Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"},
{"Domingo", "Segunda-Feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"},
{"Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sabado"},
{"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"},
{"Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"},
{"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"},
{"วันอาทิตย์", "วันจันทร์", "วันอังคาร", "วันพุธ", "วันพฤหัสบดี", "วันศุกร์", "วันเสาร์"}
};
string_type locales[8] = {"en", "nb", "pt-BR", "es-ES", "fr-FR", "de-DE", "zh-CN", "th-TH"};

for (int i = 0; i < 8; i++) {
if(locale == locales[i]) {
ret = localized_weekdays[i][week_day];
}
}

if(ret == ""){
raise_error(ecUKNOWN_LOCALE, 2, a_pArg);
}

return ret;
}

//------------------------------------------------------------------------------
// |
// String auxiliar functions! |
// |
//------------------------------------------------------------------------------

static string_type to_string(long_double_type number) {
std::string string_number = std::to_string (number);
int offset = 1;
if (string_number.find_last_not_of('0') == string_number.find('.')) {
offset = 0;
}
string_number.erase(string_number.find_last_not_of('0') + offset, std::string::npos);
return string_number;
}

static string_type apply_mask(string_type mask, string_type number_string) {
for (int i = mask.length() - 1; i >= 0; i--) {
if (mask[i] == '0' && number_string.length() > 0) {
mask[i] = number_string.back();
number_string.pop_back();
}
}

if (number_string.length() > 0) {
mask.insert(0, number_string);
}

return mask;
}

//------------------------------------------------------------------------------
//
// FunParserID
Expand Down Expand Up @@ -338,31 +468,6 @@ MUP_NAMESPACE_START
//
//------------------------------------------------------------------------------

static string_type to_string(long_double_type number) {
std::string string_number = std::to_string (number);
int offset = 1;
if (string_number.find_last_not_of('0') == string_number.find('.')) {
offset = 0;
}
string_number.erase(string_number.find_last_not_of('0') + offset, std::string::npos);
return string_number;
}

static string_type apply_mask(string_type mask, string_type number_string) {
for (int i = mask.length() - 1; i >= 0; i--) {
if (mask[i] == '0' && number_string.length() > 0) {
mask[i] = number_string.back();
number_string.pop_back();
}
}

if (number_string.length() > 0) {
mask.insert(0, number_string);
}

return mask;
}

FunMask::FunMask()
:ICallback(cmFUNC, _T("mask"), -1)
{}
Expand Down Expand Up @@ -405,86 +510,6 @@ MUP_NAMESPACE_START
// |
//------------------------------------------------------------------------------

//------------------------------------------------------------------------------
// |
// Date auxiliar functions! |
// |
//------------------------------------------------------------------------------

// https://en.wikipedia.org/wiki/Rata_Die
int rata_die (int y, int m, int d) { /* Rata Die day one is 0001-01-01 */
if (m < 3)
y--, m += 12;
return 365*y + y/4 - y/100 + y/400 + (153*m - 457)/5 + d - 306;
}

string_type format_date (struct tm time, bool is_date_time) {
string_type year = std::to_string(time.tm_year + 1900);
string_type month = std::to_string(time.tm_mon + 1);
string_type day = std::to_string(time.tm_mday);
string_type hours = std::to_string(time.tm_hour);
string_type min = std::to_string(time.tm_min);

month = month.length() > 1 ? month : '0' + month;
day = day.length() > 1 ? day : '0' + day;
hours = hours.length() > 1 ? hours : '0' + hours;
min = min.length() > 1 ? min : '0' + min;

if (is_date_time) {
return(year + "-" + month + "-" + day + "T" + hours + ":" + min);
} else {
return(year + "-" + month + "-" + day);
}
}

void add_days (struct tm* date, float_type days) {
// Avoid mismatch between winter and summer time on mktime() conversion
date->tm_isdst = -1;

// Seconds since start of epoch
time_t new_day = mktime(date) + (days * ONE_DAY);

// Update caller's date
// localtime is used because mktime converts from localtime to UTC and we need to convert it back
*date = *localtime(&new_day);
}

void raise_error (EErrorCodes error, int position, const ptr_val_type *arguments) {
ErrorContext err;
err.Errc = error;
err.Arg = position;
err.Type1 = arguments[position - 1]->GetType();
err.Type2 = 's';
throw ParserError(err);
}

string_type localized_weekday(int week_day, const ptr_val_type *a_pArg) {
string_type locale = a_pArg[1]->GetString();
string_type ret = "";
string_type localized_weekdays[8][7] = {
{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"},
{"Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"},
{"Domingo", "Segunda-Feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"},
{"Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sabado"},
{"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"},
{"Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"},
{"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"},
{"วันอาทิตย์", "วันจันทร์", "วันอังคาร", "วันพุธ", "วันพฤหัสบดี", "วันศุกร์", "วันเสาร์"}
};
string_type locales[8] = {"en", "nb", "pt-BR", "es-ES", "fr-FR", "de-DE", "zh-CN", "th-TH"};

for (int i = 0; i < 8; i++) {
if(locale == locales[i]) {
ret = localized_weekdays[i][week_day];
}
}

if(ret == ""){
raise_error(ecUKNOWN_LOCALE, 2, a_pArg);
}

return ret;
}

//------------------------------------------------------------------------------
//
Expand Down Expand Up @@ -619,13 +644,40 @@ MUP_NAMESPACE_START
*/
void FunCurrentDate::Eval(ptr_val_type &ret, const ptr_val_type *a_pArg, int a_iArgc)
{
if (a_iArgc != 0)
int gmt_offset = 0;
if (a_iArgc > 1) {
throw ParserError(ErrorContext(ecTOO_MANY_PARAMS, GetExprPos(), GetIdent()));
} else if (a_iArgc == 1) {
switch(a_pArg[0]->GetType())
{
case 'i': gmt_offset = a_pArg[0]->GetInteger(); break;
default:
{
ErrorContext err;
err.Errc = ecTYPE_CONFLICT_FUN;
err.Arg = 1;
err.Type1 = a_pArg[0]->GetType();
err.Type2 = 'i';
err.Ident = GetIdent();
throw ParserError(err);
}
}
}

(void)*a_pArg;
std::time_t t = std::time(0); // get time now
std::tm now = *std::localtime(&t);
Copy link
Member Author

@EduardoRSeifert EduardoRSeifert Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now that it has timezone, should this become gmtime?


if (gmt_offset != 0) {
int original_hour = now.tm_hour;
now.tm_hour = calculate_hour_offset(original_hour, gmt_offset);
if (now.tm_hour <= original_hour && gmt_offset > 0) {
add_days(&now, 1);
} else if (now.tm_hour >= original_hour && gmt_offset < 0) {
add_days(&now, -1);
}
}

*ret = format_date(now, false);
}

Expand Down Expand Up @@ -803,24 +855,6 @@ MUP_NAMESPACE_START
// |
//------------------------------------------------------------------------------

//------------------------------------------------------------------------------
// |
// Time auxiliar functions! |
// |
//------------------------------------------------------------------------------

int calculate_hour_offset(int original_hour, int gmt_offset) {
return ((original_hour + gmt_offset) % 24 + 24) % 24;
}

string_type format_time (struct tm time, int gmt_offset) {
char buffer[9];
int hours = calculate_hour_offset(time.tm_hour, gmt_offset);
snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d", hours, time.tm_min, time.tm_sec);

return std::string(buffer);
}

//------------------------------------------------------------------------------
//
// class FunTimeDiff
Expand Down
2 changes: 2 additions & 0 deletions tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ test_eval 'number("4")' '4'

# Date tests
test_eval 'current_date()' '"'$(date '+%Y-%m-%d')'"'
test_eval 'current_date(1)' '"'$(date '+%Y-%m-%d')'"'
test_eval 'current_date(-2)' '"'$(date '+%Y-%m-%d')'"'
test_eval 'daysdiff("2018-01-01", "2018-12-31")' '364'
test_eval 'daysdiff("2016-01-01", "2016-12-31")' '365'
test_eval 'daysdiff("2000-01-01", "2000-12-31")' '365'
Expand Down