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

(parse): The src_idx field on journal entries was being set

Browse source 
incorrectly.
This commit is contained in:
John Wiegley 2005-05-31 22:38:28 +00:00
parent 889014dedc
commit b800e4e2f8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
textual.cc
View file

@ -36,6 +36,7 @@ namespace ledger {
static std::string path; static std::string path;
static unsigned int linenum; static unsigned int linenum;
static unsigned int src_idx;
static accounts_map account_aliases; static accounts_map account_aliases;
#ifdef TIMELOG_SUPPORT #ifdef TIMELOG_SUPPORT
@ -375,6 +376,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
account_stack.push_front(master); account_stack.push_front(master);
path = journal->sources.back(); path = journal->sources.back();
src_idx = journal->sources.size() - 1;
linenum = 1; linenum = 1;
while (in.good() && ! in.eof()) { while (in.good() && ! in.eof()) {
@ -537,7 +539,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
if (parse_transactions(in, account_stack.front(), *ae, "automated")) { if (parse_transactions(in, account_stack.front(), *ae, "automated")) {
if (ae->finalize()) { if (ae->finalize()) {
journal->auto_entries.push_back(ae); journal->auto_entries.push_back(ae);
ae->src_idx = journal->sources.size() - 1; ae->src_idx = src_idx;
ae->beg_pos = beg_pos; ae->beg_pos = beg_pos;
ae->end_pos = in.tellg(); ae->end_pos = in.tellg();
} else { } else {
@ -558,7 +560,7 @@ unsigned int textual_parser_t::parse(std::istream& in,
if (pe->finalize()) { if (pe->finalize()) {
extend_entry_base(journal, *pe); extend_entry_base(journal, *pe);
journal->period_entries.push_back(pe); journal->period_entries.push_back(pe);
pe->src_idx = journal->sources.size() - 1; pe->src_idx = src_idx;
pe->beg_pos = beg_pos; pe->beg_pos = beg_pos;
pe->end_pos = in.tellg(); pe->end_pos = in.tellg();
} else { } else {
@ -574,8 +576,9 @@ unsigned int textual_parser_t::parse(std::istream& in,
*p++ = '\0'; *p++ = '\0';
std::string word(line + 1); std::string word(line + 1);
if (word == "include") { if (word == "include") {
push_var<unsigned int> save_linenum(linenum);
push_var<std::string> save_path(path); push_var<std::string> save_path(path);
push_var<unsigned int> save_src_idx(src_idx);
push_var<unsigned int> save_linenum(linenum);
path = skip_ws(p); path = skip_ws(p);
if (path[0] != '/' && path[0] != '\\') { if (path[0] != '/' && path[0] != '\\') {
@ -627,11 +630,10 @@ unsigned int textual_parser_t::parse(std::istream& in,
default: { default: {
unsigned int first_line = linenum; unsigned int first_line = linenum;
if (entry_t * entry = parse_entry(in, line, account_stack.front(), if (entry_t * entry = parse_entry(in, line, account_stack.front(),
*this)) { *this)) {
if (journal->add_entry(entry)) { if (journal->add_entry(entry)) {
entry->src_idx = journal->sources.size() - 1; entry->src_idx = src_idx;
entry->beg_pos = beg_pos; entry->beg_pos = beg_pos;
entry->end_pos = in.tellg(); entry->end_pos = in.tellg();
count++; count++;