diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-03-01 03:31:28 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-03-01 03:31:28 -0600 |
| commit | 944e580825f0d9ce060b6dcdffe8990b6c2cca20 (patch) | |
| tree | e2651b0df622d9b8d3831f35743e7dbd31c16897 /src/generate.cc | |
| parent | e2afc783db0dff1927b00dc506390353d9e3bbd2 (diff) | |
| download | fork-ledger-944e580825f0d9ce060b6dcdffe8990b6c2cca20.tar.gz fork-ledger-944e580825f0d9ce060b6dcdffe8990b6c2cca20.tar.bz2 fork-ledger-944e580825f0d9ce060b6dcdffe8990b6c2cca20.zip | |
Refactored the notion of "the current parsing context"
Diffstat (limited to 'src/generate.cc')
| -rw-r--r-- | src/generate.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/generate.cc b/src/generate.cc index bf9a8036..edd58632 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -360,9 +360,15 @@ void generate_posts_iterator::increment() DEBUG("generate.post", "The post we intend to parse:\n" << buf.str()); - std::istringstream in(buf.str()); try { - if (session.journal->parse(in, session) != 0) { + shared_ptr<std::istringstream> in(new std::istringstream(buf.str())); + + parse_context_stack_t parsing_context; + parsing_context.push(in); + parsing_context.get_current().journal = session.journal.get(); + parsing_context.get_current().scope = &session; + + if (session.journal->read(parsing_context) != 0) { VERIFY(session.journal->xacts.back()->valid()); posts.reset(*session.journal->xacts.back()); post = *posts++; |