sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #107 from afh/pull/time_colon

Browse source 
Add --time-colon option
This commit is contained in:
John Wiegley 2013-01-29 09:34:08 -08:00
commit ec7402fff8
5 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/amount.cc
View file

@ -195,7 +195,10 @@ namespace {
for (const char * p = buf; *p; p++) {
if (*p == '.') {
if (commodity_t::decimal_comma_by_default ||
if (commodity_t::time_colon_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))
out << ':';
else if (commodity_t::decimal_comma_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
out << ',';
else
@ -209,7 +212,10 @@ namespace {
out << *p;
if (integer_digits > 3 && --integer_digits % 3 == 0) {
if (commodity_t::decimal_comma_by_default ||
if (commodity_t::time_colon_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_TIME_COLON)))
out << ':';
else if (commodity_t::decimal_comma_by_default ||
(comm && comm->has_flags(COMMODITY_STYLE_DECIMAL_COMMA)))
out << '.';
else
@ -737,6 +743,16 @@ void amount_t::in_place_unreduce()
}
if (shifted) {
if ("h" == comm->symbol() && commodity_t::time_colon_by_default) {
amount_t floored = tmp.floored();
amount_t precision = tmp - floored;
if (precision < 0.0) {
precision += 1.0;
floored -= 1.0;
}
tmp = floored + (precision * (comm->smaller()->number() / 100.0));
}
*this = tmp;
commodity_ = comm;
}
@ -1090,6 +1106,9 @@ bool amount_t::parse(std::istream& in, const parse_flags_t& flags)
bool decimal_comma_style
= (commodity_t::decimal_comma_by_default ||
commodity().has_flags(COMMODITY_STYLE_DECIMAL_COMMA));
bool time_colon_style
= (commodity_t::time_colon_by_default ||
commodity().has_flags(COMMODITY_STYLE_TIME_COLON));
new_quantity->prec = 0;

1
src/commodity.cc
View file

@ -40,6 +40,7 @@
namespace ledger {
bool commodity_t::decimal_comma_by_default = false;
bool commodity_t::time_colon_by_default = false;
void commodity_t::add_price(const datetime_t& date, const amount_t& price,
const bool reflexive)

2
src/commodity.h
View file

@ -107,6 +107,7 @@ protected:
#define COMMODITY_SAW_ANNOTATED 0x200
#define COMMODITY_SAW_ANN_PRICE_FLOAT 0x400
#define COMMODITY_SAW_ANN_PRICE_FIXATED 0x800
#define COMMODITY_STYLE_TIME_COLON 0x1000
string symbol;
optional<std::size_t> graph_index;
@ -176,6 +177,7 @@ protected:
public:
static bool decimal_comma_by_default;
static bool time_colon_by_default;
virtual ~commodity_t() {
TRACE_DTOR(commodity_t);

4
src/session.cc
View file

@ -352,9 +352,11 @@ option_t<session_t> * session_t::lookup_option(const char * p)
case 's':
OPT(strict);
break;
case 't':
OPT(time_colon);
break;
case 'v':
OPT(value_expr_);
break;
}
return NULL;
}

5
src/session.h
View file

@ -100,6 +100,7 @@ public:
HANDLER(day_break).report(out);
HANDLER(download).report(out);
HANDLER(decimal_comma).report(out);
HANDLER(time_colon).report(out);
HANDLER(file_).report(out);
HANDLER(input_date_format_).report(out);
HANDLER(explicit).report(out);
@ -130,6 +131,10 @@ public:
commodity_t::decimal_comma_by_default = true;
});
OPTION_(session_t, time_colon, DO() {
commodity_t::time_colon_by_default = true;
});
OPTION__
(session_t, price_exp_, // -Z
CTOR(session_t, price_exp_) { value = "24"; });