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

Adding option --no-aliases to completely disable alias expansion

Browse source
This commit is contained in:
Peter Feigl 2014-02-26 23:50:50 +01:00
parent ee36a33a19
commit ecd5097d51
6 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ledger.1
View file

@ -381,6 +381,8 @@ See
.It Fl \-meta Ar EXPR .It Fl \-meta Ar EXPR
.It Fl \-meta-width Ar INT .It Fl \-meta-width Ar INT
.It Fl \-monthly Pq Fl M .It Fl \-monthly Pq Fl M
.It Fl \-no-aliases
Aliases are completely ignored.
.It Fl \-no-color .It Fl \-no-color
.It Fl \-no-pager .It Fl \-no-pager
.It Fl \-no-rounding .It Fl \-no-rounding

5
doc/ledger3.texi
View file

@ -2175,6 +2175,8 @@ alias Checking=Assets:Credit Union:Joint Checking Account
Checking Checking
@end smallexample @end smallexample
The option @option{--no-aliases} completely disables alias expansion.
@item assert @item assert
@c instance_t::assert_directive @c instance_t::assert_directive
An assertion can throw an error if a condition is not met during An assertion can throw an error if a condition is not met during
@ -5788,6 +5790,9 @@ $ ledger -f drewr3.dat bal --no-total --master-account HUMBUG
$ 200.00 Mortgage:Principal $ 200.00 Mortgage:Principal
@end smallexample @end smallexample
@item --no-aliases
Ledger does not expand any aliases if this option is specified.
@item --pedantic @item --pedantic
FIX THIS ENTRY @c FIXME thdox FIX THIS ENTRY @c FIXME thdox

3
src/journal.cc
View file

@ -173,6 +173,9 @@ account_t * journal_t::expand_aliases(string name) {
// prevent infinite excursion. Each alias may only be expanded at most once. // prevent infinite excursion. Each alias may only be expanded at most once.
account_t * result = NULL; account_t * result = NULL;
if(no_aliases)
return result;
bool keep_expanding = true; bool keep_expanding = true;
std::list<string> already_seen; std::list<string> already_seen;
// loop until no expansion can be found // loop until no expansion can be found

1
src/journal.h
View file

@ -132,6 +132,7 @@ public:
bool check_payees; bool check_payees;
bool day_break; bool day_break;
bool recursive_aliases; bool recursive_aliases;
bool no_aliases;
payee_mappings_t payee_mappings; payee_mappings_t payee_mappings;
account_mappings_t account_mappings; account_mappings_t account_mappings;
accounts_map account_aliases; accounts_map account_aliases;

5
src/session.cc
View file

@ -115,6 +115,8 @@ std::size_t session_t::read_data(const string& master_account)
if (HANDLED(recursive_aliases)) if (HANDLED(recursive_aliases))
journal->recursive_aliases = true; journal->recursive_aliases = true;
if (HANDLED(no_aliases))
journal->no_aliases = true;
if (HANDLED(permissive)) if (HANDLED(permissive))
journal->checking_style = journal_t::CHECK_PERMISSIVE; journal->checking_style = journal_t::CHECK_PERMISSIVE;
@ -347,6 +349,9 @@ option_t<session_t> * session_t::lookup_option(const char * p)
case 'm': case 'm':
OPT(master_account_); OPT(master_account_);
break; break;
case 'n':
OPT(no_aliases);
break;
case 'p': case 'p':
OPT(price_db_); OPT(price_db_);
else OPT(price_exp_); else OPT(price_exp_);

2
src/session.h
View file

@ -110,6 +110,7 @@ public:
HANDLER(price_db_).report(out); HANDLER(price_db_).report(out);
HANDLER(price_exp_).report(out); HANDLER(price_exp_).report(out);
HANDLER(recursive_aliases).report(out); HANDLER(recursive_aliases).report(out);
HANDLER(no_aliases).report(out);
HANDLER(strict).report(out); HANDLER(strict).report(out);
HANDLER(value_expr_).report(out); HANDLER(value_expr_).report(out);
} }
@ -166,6 +167,7 @@ public:
OPTION(session_t, strict); OPTION(session_t, strict);
OPTION(session_t, value_expr_); OPTION(session_t, value_expr_);
OPTION(session_t, recursive_aliases); OPTION(session_t, recursive_aliases);
OPTION(session_t, no_aliases);
}; };
/** /**