two major changes

Complete changed the way format strings are handled.  They are now
compiled first, which is far more efficient than what was being done
before.

Also, there is now a global ledger::commodity_t::commodities map,
which saves me from having to pass the current journal around to a
zillion different functions, for the sole purpose of making sure that
all commodity symbols that are parsed refer to the same commodity
object.

1 files changed, 6 insertions, 27 deletions

diff --git a/ledger.cc b/ledger.cc
index 6654ea1c..741dcbaf 100644
--- a/ledger.cc
+++ b/ledger.cc
@@ -12,11 +12,6 @@ ledger_t::~ledger_t()
 {
   delete master;
 
-  for (commodities_map::iterator i = commodities.begin();
-       i != commodities.end();
-       i++)
-    delete (*i).second;
-
   // Don't bother unhooking each entry's transactions from the
   // accounts they refer to, because all accounts are about to
   // be deleted.
@@ -26,22 +21,6 @@ ledger_t::~ledger_t()
     delete *i;
 }
 
-commodity_t * ledger_t::find_commodity(const std::string& symbol,
-				       bool auto_create)
-{
-  commodities_map::const_iterator i = commodities.find(symbol);
-  if (i != commodities.end())
-    return (*i).second;
-
-  if (auto_create) {
-    commodity_t * commodity = new commodity_t(symbol);
-    add_commodity(commodity);
-    return commodity;
-  }
-
-  return NULL;
-}
-
 bool ledger_t::add_entry(entry_t * entry)
 {
   entries.push_back(entry);
@@ -73,7 +52,7 @@ bool ledger_t::remove_entry(entry_t * entry)
   return true;
 }
 
-int parse_ledger_file(char * p, ledger_t * book)
+int parse_ledger_file(char * p, ledger_t * journal)
 {
   char * sep = std::strrchr(p, '=');
   if (sep) *sep++ = '\0';
@@ -82,11 +61,11 @@ int parse_ledger_file(char * p, ledger_t * book)
 
   account_t * master;
   if (sep)
-    master = book->find_account(sep);
+    master = journal->find_account(sep);
   else
-    master = book->master;
+    master = journal->master;
 
-  book->sources.push_back(p);
+  journal->sources.push_back(p);
 
   unsigned long magic;
   std::istream::pos_type start = stream.tellg();
@@ -94,9 +73,9 @@ int parse_ledger_file(char * p, ledger_t * book)
   stream.seekg(start);
 
   if (magic == magic_number)
-    return read_binary_ledger(stream, "", book, master);
+    return read_binary_ledger(stream, "", journal, master);
   else
-    return parse_textual_ledger(stream, book, master);
+    return parse_textual_ledger(stream, journal, master);
 }
 
 } // namespace ledger