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

Added "bucket" directive, as alt for A

Browse source
This commit is contained in:
John Wiegley 2009-11-10 01:28:42 -05:00
parent a5f0b6e5dc
commit 3e39329eff
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/textual.cc
View file

@ -119,7 +119,7 @@ namespace {
void period_xact_directive(char * line); void period_xact_directive(char * line);
void xact_directive(char * line, std::streamsize len); void xact_directive(char * line, std::streamsize len);
void include_directive(char * line); void include_directive(char * line);
void account_directive(char * line); void master_account_directive(char * line);
void end_directive(char * line); void end_directive(char * line);
void alias_directive(char * line); void alias_directive(char * line);
void tag_directive(char * line); void tag_directive(char * line);
@ -643,7 +643,7 @@ void instance_t::include_directive(char * line)
count += instance.count; count += instance.count;
} }
void instance_t::account_directive(char * line) void instance_t::master_account_directive(char * line)
{ {
if (account_t * acct = account_stack.front()->find_account(line)) if (account_t * acct = account_stack.front()->find_account(line))
account_stack.push_front(acct); account_stack.push_front(acct);
@ -710,7 +710,7 @@ bool instance_t::general_directive(char * line)
switch (*p) { switch (*p) {
case 'a': case 'a':
if (std::strcmp(p, "account") == 0) { if (std::strcmp(p, "account") == 0) {
account_directive(next_element(line)); master_account_directive(next_element(line));
return true; return true;
} }
else if (std::strcmp(p, "alias") == 0) { else if (std::strcmp(p, "alias") == 0) {
@ -719,8 +719,15 @@ bool instance_t::general_directive(char * line)
} }
break; break;
case 'b':
if (std::strcmp(p, "bucket") == 0) {
default_account_directive(next_element(line));
return true;
}
break;
case 'd': case 'd':
if (std::strcmp(p, "def") == 0) { if (std::strcmp(p, "def") == 0 || std::strcmp(p, "define") == 0) {
define_directive(next_element(line)); define_directive(next_element(line));
return true; return true;
} }
@ -983,8 +990,8 @@ post_t * instance_t::parse_post(char * line,
<< "POST assign: parsed amt = " << *post->assigned_amount); << "POST assign: parsed amt = " << *post->assigned_amount);
amount_t& amt(*post->assigned_amount); amount_t& amt(*post->assigned_amount);
value_t account_total(post->account->amount(false) value_t account_total
.strip_annotations(keep_details_t())); (post->account->amount(false).strip_annotations(keep_details_t()));
DEBUG("post.assign", DEBUG("post.assign",
"line " << linenum << ": " "account balance = " << account_total); "line " << linenum << ": " "account balance = " << account_total);