IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Extract Scheme date handling functions and apply them.

Browse Source 
Including in RelativeDatePeriodVec typemap, making it work correctly.
This commit is contained in:
John Ralls 2021-03-08 11:13:26 -08:00
parent 63502900f3
commit 693e966bf9
1 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libgnucash/app-utils/gnc-optiondb.i
View File

@ -329,11 +329,11 @@ gnc_option_test_book_destroy(QofBook* book)
%typemap(in) RelativeDatePeriodVec& (RelativeDatePeriodVec period_set) %typemap(in) RelativeDatePeriodVec& (RelativeDatePeriodVec period_set)
{ {
auto len = scm_to_size_t(scm_length($input)); auto len = scm_is_true($input) ? scm_to_size_t(scm_length($input)) : 0;
for (std::size_t i = 0; i < len; ++i) for (std::size_t i = 0; i < len; ++i)
{ {
SCM s_reldateperiod = scm_list_ref($input, scm_from_size_t(i)); SCM s_reldateperiod = scm_list_ref($input, scm_from_size_t(i));
period_set.push_back((RelativeDatePeriod)scm_to_int(s_reldateperiod)); period_set.push_back(scm_relative_date_get_period(s_reldateperiod));
} }
$1 = &period_set; $1 = &period_set;
} }
@ -517,8 +517,9 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
%typemap(out) GncOption* "$result = ($1) ? scm_from_pointer($1, nullptr) : SCM_BOOL_F;" %typemap(out) GncOption* "$result = ($1) ? scm_from_pointer($1, nullptr) : SCM_BOOL_F;"
%header %{ %header %{
static const SCM get_reldate_values() {
inline static RelativeDatePeriod scm_relative_date_get_period(SCM date)
{
static SCM reldate_values = SCM_BOOL_F; static SCM reldate_values = SCM_BOOL_F;
if (scm_is_false(reldate_values)) if (scm_is_false(reldate_values))
@ -556,8 +557,32 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
"(start-accounting-period RelativeDatePeriod-START-ACCOUNTING-PERIOD)" "(start-accounting-period RelativeDatePeriod-START-ACCOUNTING-PERIOD)"
"(end-accounting-period RelativeDatePeriod-END-ACCOUNTING-PERIOD))"); "(end-accounting-period RelativeDatePeriod-END-ACCOUNTING-PERIOD))");
return reldate_values; auto reldate_scm{scm_is_pair(date) ? scm_cdr(date) : date};
auto reldate{scm_primitive_eval(scm_assq_ref(reldate_values,
reldate_scm))};
return static_cast<RelativeDatePeriod>(scm_to_int(reldate));
}
inline static bool scm_date_absolute(SCM date)
{
if (scm_is_pair(date))
{
auto car{scm_to_utf8_string(scm_symbol_to_string(scm_car(date)))};
if (strcmp(car, "relative") == 0)
return false;
} }
return true;
}
inline static time64 scm_absolute_date_to_time64(SCM date)
{
if (scm_date_absolute(date))
return scm_to_int64(scm_is_pair(date) ? scm_cdr(date) : date);
return gnc_relative_date_to_time64(scm_relative_date_get_period(date));
}
%} %}
%ignore GncOptionMultichoiceKeyType; %ignore GncOptionMultichoiceKeyType;
@ -684,28 +709,14 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
{ {
if (!$self) if (!$self)
return; return;
auto reldate_values{get_reldate_values()}; std::visit([new_value](auto& option) {
std::visit([new_value, reldate_values](auto& option) {
if constexpr (std::is_same_v<std::decay_t<decltype(option)>, if constexpr (std::is_same_v<std::decay_t<decltype(option)>,
GncOptionDateValue>) GncOptionDateValue>)
{ {
if (scm_is_pair(new_value)) if (scm_date_absolute(new_value))
{ option.set_value(scm_absolute_date_to_time64(new_value));
auto car{scm_to_utf8_string(scm_symbol_to_string(scm_car(new_value)))};
if (strcmp(car, "relative") == 0)
{
auto lookup{scm_assq_ref(reldate_values,
scm_cdr(new_value))};
auto reldate{scm_primitive_eval(lookup)};
option.set_value(static_cast<RelativeDatePeriod>(scm_to_int(reldate)));
}
else
{
option.set_value(scm_to_int64(scm_cdr(new_value)));
}
}
else else
option.set_value(scm_to_int64(new_value)); option.set_value(scm_relative_date_get_period(new_value));
return; return;
} }
if constexpr (std::is_same_v<std::decay_t<decltype(option)>, if constexpr (std::is_same_v<std::decay_t<decltype(option)>,
@ -743,28 +754,14 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
{ {
if (!$self) if (!$self)
return; return;
auto reldate_values{get_reldate_values()}; std::visit([new_value](auto& option) {
std::visit([new_value, reldate_values](auto& option) {
if constexpr (std::is_same_v<std::decay_t<decltype(option)>, if constexpr (std::is_same_v<std::decay_t<decltype(option)>,
GncOptionDateValue>) GncOptionDateValue>)
{ {
if (scm_is_pair(new_value)) if (scm_date_absolute(new_value))
{ option.set_default_value(scm_absolute_date_to_time64(new_value));
auto car{scm_to_utf8_string(scm_symbol_to_string(scm_car(new_value)))};
if (strcmp(car, "relative") == 0)
{
auto lookup{scm_assq_ref(reldate_values,
scm_cdr(new_value))};
auto reldate{scm_primitive_eval(lookup)};
option.set_default_value(static_cast<RelativeDatePeriod>(scm_to_int(reldate)));
}
else
{
option.set_value(scm_to_int64(scm_cdr(new_value)));
}
}
else else
option.set_default_value(scm_to_int64(new_value)); option.set_default_value(scm_relative_date_get_period(new_value));
return; return;
} }
if constexpr (std::is_same_v<std::decay_t<decltype(option)>, if constexpr (std::is_same_v<std::decay_t<decltype(option)>,