reorganized report.cc into item.cc, expr.cc and format.cc

10 files changed, 172 insertions, 159 deletions

diff --git a/constraint.cc b/constraint.cc
index 1248c2b1..0af49502 100644
--- a/constraint.cc
+++ b/constraint.cc
@@ -1,9 +1,16 @@
 #include "constraint.h"
+#include "expr.h"
 
 #include <pcre.h>
 
 namespace ledger {
 
+constraints_t::~constraints_t()
+{
+  if (predicate)  delete predicate;
+  if (sort_order) delete sort_order;
+}
+
 mask_t::mask_t(const std::string& pat) : exclude(false)
 {
   const char * p = pat.c_str();
@@ -183,14 +190,13 @@ bool constraints_t::operator ()(const entry_t * entry) const
 
 bool constraints_t::operator ()(const item_t * item) const
 {
-  if (predicate && ! predicate->compute(begin(), end(), item))
+  if (predicate && ! predicate->compute(item, begin(), end()))
     return false;
 
   if (! matches_date_range(item->date))
     return false;
 
-  if (! payee_masks.empty() &&
-      ! (matches(payee_masks, item->payee)))
+  if (! payee_masks.empty() && ! matches(payee_masks, item->payee))
     return false;
 
 #if 0
diff --git a/constraint.h b/constraint.h
index 700a9e25..f7ecef62 100644
--- a/constraint.h
+++ b/constraint.h
@@ -81,7 +81,7 @@ bool matches(const masks_list& regexps, const std::string& str,
 	     bool * by_exclusion = NULL);
 
 
-struct item_t;
+struct node_t;
 
 enum periodicity_t {
   PERIOD_NONE,
@@ -137,10 +137,7 @@ class constraints_t
     sort_order     = NULL;
   }
 
-  ~constraints_t() {
-    if (predicate)  delete predicate;
-    if (sort_order) delete sort_order;
-  }
+  ~constraints_t();
 
   std::time_t begin() const {
     return have_beginning ? begin_date : 0;
diff --git a/expr.cc b/expr.cc
index 7318e903..73597a4a 100644
--- a/expr.cc
+++ b/expr.cc
@@ -1,10 +1,11 @@
 #include "expr.h"
+#include "textual.h"
 
 namespace ledger {
 
-balance_t node_t::compute(const std::time_t begin,
-			  const std::time_t end,
-			  const item_t *    item) const
+balance_t node_t::compute(const item_t *    item,
+			  const std::time_t begin,
+			  const std::time_t end) const
 {
   balance_t temp;
 
@@ -56,18 +57,18 @@ balance_t node_t::compute(const std::time_t begin,
 
   case F_ARITH_MEAN:
     assert(left);
-    temp = left->compute(begin, end, item);
+    temp = left->compute(item, begin, end);
     temp /= amount_t(item->index + 1);
     break;
 
   case F_NEG:
     assert(left);
-    temp = left->compute(begin, end, item).negated();
+    temp = left->compute(item, begin, end).negated();
     break;
 
   case F_ABS:
     assert(left);
-    temp = abs(left->compute(begin, end, item));
+    temp = abs(left->compute(item, begin, end));
     break;
 
   case F_REGEXP:
@@ -78,7 +79,7 @@ balance_t node_t::compute(const std::time_t begin,
 
   case F_VALUE: {
     assert(left);
-    temp = left->compute(begin, end, item);
+    temp = left->compute(item, begin, end);
 
     std::time_t moment = -1;
     if (right) {
@@ -94,15 +95,15 @@ balance_t node_t::compute(const std::time_t begin,
   }
 
   case O_NOT:
-    temp = left->compute(begin, end, item) ? 0 : 1;
+    temp = left->compute(item, begin, end) ? 0 : 1;
     break;
 
   case O_QUES:
-    temp = left->compute(begin, end, item);
+    temp = left->compute(item, begin, end);
     if (temp)
-      temp = right->left->compute(begin, end, item);
+      temp = right->left->compute(item, begin, end);
     else
-      temp = right->right->compute(begin, end, item);
+      temp = right->right->compute(item, begin, end);
     break;
 
   case O_AND:
@@ -118,8 +119,8 @@ balance_t node_t::compute(const std::time_t begin,
   case O_DIV: {
     assert(left);
     assert(right);
-    balance_t left_bal  = left->compute(begin, end, item);
-    balance_t right_bal = right->compute(begin, end, item);
+    balance_t left_bal  = left->compute(item, begin, end);
+    balance_t right_bal = right->compute(item, begin, end);
     switch (type) {
     case O_AND: temp = (left_bal && right_bal) ? 1 : 0; break;
     case O_OR:  temp = (left_bal || right_bal) ? 1 : 0; break;
diff --git a/expr.h b/expr.h
index 15fe85e4..5abff910 100644
--- a/expr.h
+++ b/expr.h
@@ -1,9 +1,9 @@
-#ifndef _REPORT_H
-#define _REPORT_H
+#ifndef _EXPR_H
+#define _EXPR_H
 
 #include "ledger.h"
-#include "constraint.h"
 #include "balance.h"
+#include "constraint.h"
 
 namespace ledger {
 
@@ -76,11 +76,6 @@ struct node_t
   balance_t compute(const item_t * item,
 		    const std::time_t begin = -1,
 		    const std::time_t end   = -1) const;
-
-  balance_t compute(const item_t * item,
-		    const constraint_t& constraints) const {
-    return compute(item, constraints.begin(), constraints.end());
-  }
 };
 
 node_t * parse_expr(std::istream& in, ledger_t * ledger);
diff --git a/format.cc b/format.cc
index a68852af..1c7bf12d 100644
--- a/format.cc
+++ b/format.cc
@@ -24,24 +24,18 @@ std::string maximal_account_name(const item_t * item,
   return name;
 }
 
-std::string format_string(const item_t * item, const format_t& format,
-			  const item_t * displayed_parent)
+std::string format_t::report_line(const item_t * item,
+				  const item_t * displayed_parent) const
 {
   std::string result;
 
-  for (const char * p = format.format_string.c_str(); *p; p++) {
+  for (const char * p = format_string.c_str(); *p; p++) {
     if (*p == '%') {
       bool leftalign	= false;
-      bool ignore	= false;
       int  width	= 0;
       int  strict_width = 0;
 
       ++p;
-      if (*p == '?') {
-	ignore = false; //subsequent_line;
-	++p;
-      }
-
       if (*p == '-') {
 	leftalign = true;
 	++p;
@@ -75,12 +69,6 @@ std::string format_string(const item_t * item, const format_t& format,
       if (width > 0)
 	out.width(width);
 
-      if (ignore) {
-	out << " ";
-	result += out.str();
-	continue;
-      }
-
       switch (*p) {
       case '%':
 	out << "%";
@@ -94,8 +82,9 @@ std::string format_string(const item_t * item, const format_t& format,
 	assert(*p == ')');
 
 	node_t *  style = parse_expr(num, NULL);
-	balance_t value = style->compute(format.begin(), format.end(), item);
+	balance_t value = style->compute(item);
 	value.write(out, width, strict_width > 0 ? strict_width : width);
+	delete style;
 	break;
       }
 
@@ -122,7 +111,7 @@ std::string format_string(const item_t * item, const format_t& format,
 	  std::strftime(buf, 31, "%Y/%m/%d", std::gmtime(&item->date));
 	  out << (strict_width == 0 ? buf : truncated(buf, strict_width));
 	} else {
-	out << " ";
+	  out << " ";
 	}
 	break;
       }
@@ -151,15 +140,15 @@ std::string format_string(const item_t * item, const format_t& format,
 	break;
 
       case 't':
-	if (format.value_style) {
-	  balance_t value = format.compute_value(item);
+	if (value_style) {
+	  balance_t value = compute_value(item);
 	  value.write(out, width, strict_width > 0 ? strict_width : width);
 	}
 	break;
 
       case 'T':
-	if (format.total_style) {
-	  balance_t value = format.compute_total(item);
+	if (total_style) {
+	  balance_t value = compute_total(item);
 	  value.write(out, width, strict_width > 0 ? strict_width : width);
 	}
 	break;
diff --git a/format.h b/format.h
index 3e66dc7b..298715cb 100644
--- a/format.h
+++ b/format.h
@@ -1,9 +1,10 @@
-#ifndef _REPORT_H
-#define _REPORT_H
+#ifndef _FORMAT_H
+#define _FORMAT_H
 
 #include "ledger.h"
-#include "constraint.h"
 #include "balance.h"
+#include "constraint.h"
+#include "expr.h"
 
 namespace ledger {
 
@@ -12,8 +13,6 @@ std::string maximal_account_name(const item_t * item, const item_t * parent);
 
 struct format_t
 {
-  constraints_t constraints;
-
   std::string	format_string;
   node_t *	value_style;
   node_t *	total_style;
@@ -28,22 +27,40 @@ struct format_t
     if (total_style) delete total_style;
   }
 
+#if 1
   balance_t compute_value(const item_t * item) const {
     if (value_style)
-      return value_style->compute(begin(), end(), item);
+      return value_style->compute(item);
     else
       return balance_t();
   }
 
   balance_t compute_total(const item_t * item) const {
     if (total_style)
-      return total_style->compute(begin(), end(), item);
+      return total_style->compute(item);
+    else
+      return balance_t();
+  }
+#else
+  balance_t compute_value(const item_t * item,
+			  const constraints_t& constraints) const {
+    if (value_style)
+      return value_style->compute(item, constraints.begin(), constraints.end());
+    else
+      return balance_t();
+  }
+
+  balance_t compute_total(const item_t * item,
+			  const constraints_t& constraints) const {
+    if (total_style)
+      return total_style->compute(item, constraints.begin(), constraints.end());
     else
       return balance_t();
   }
+#endif
 
   std::string report_line(const item_t * item,
-			  const item_t * displayed_parent = NULL);
+			  const item_t * displayed_parent = NULL) const;
 };
 
 } // namespace ledger
diff --git a/item.cc b/item.cc
index 7e45ab07..37242659 100644
--- a/item.cc
+++ b/item.cc
@@ -1,4 +1,6 @@
 #include "item.h"
+#include "constraint.h"
+#include "expr.h"
 
 namespace ledger {
 
@@ -11,7 +13,7 @@ item_t * walk_accounts(const account_t *    account,
 {
   item_t * item = new item_t;
   item->account = account;
-  item->date    = end_date(constraints);
+  item->date    = constraints.end();
 
   for (constrained_transactions_list_const_iterator
 	 i(account->transactions.begin(),
@@ -85,8 +87,7 @@ item_t * walk_items(const item_t *       top,
 
 item_t * walk_entries(entries_list::const_iterator begin,
 		      entries_list::const_iterator end,
-		      const constraints_t&	   constraints,
-		      const format_t&		   format)
+		      const constraints_t&	   constraints)
 {
 #if 0
   int          last_mon = -1;
@@ -113,7 +114,7 @@ item_t * walk_entries(entries_list::const_iterator begin,
 	item->payee = (*i)->payee;
       }
 
-      if (! format.show_inverted) {
+      if (! constraints.show_inverted) {
 	item_t * subitem = new item_t;
 	subitem->parent  = item;
 	subitem->date    = item->date;
@@ -122,7 +123,7 @@ item_t * walk_entries(entries_list::const_iterator begin,
 	item->subitems.push_back(subitem);
       }
 
-      if (format.show_related)
+      if (constraints.show_related)
 	for (transactions_list::iterator k = (*i)->transactions.begin();
 	     k != (*i)->transactions.end();
 	     k++)
@@ -132,7 +133,7 @@ item_t * walk_entries(entries_list::const_iterator begin,
 	    subitem->date    = item->date;
 	    subitem->account = (*k)->account;
 	    subitem->value   = *(*k);
-	    if (format.show_inverted)
+	    if (constraints.show_inverted)
 	      subitem->value.negate();
 	    item->subitems.push_back(subitem);
 	  }
diff --git a/item.h b/item.h
index f14e7f8e..f1b9b2f0 100644
--- a/item.h
+++ b/item.h
@@ -1,5 +1,5 @@
-#ifndef _REPORT_H
-#define _REPORT_H
+#ifndef _ITEM_H
+#define _ITEM_H
 
 #include "ledger.h"
 #include "balance.h"
@@ -49,8 +49,7 @@ item_t * walk_items(const item_t *	 top,
 
 item_t * walk_entries(entries_list::const_iterator begin,
 		      entries_list::const_iterator end,
-		      const constraints_t&	   constraints,
-		      const format_t&		   format);
+		      const constraints_t& constraints);
 
 } // namespace report
 
diff --git a/ledger.cc b/ledger.cc
index 7c782336..6654ea1c 100644
--- a/ledger.cc
+++ b/ledger.cc
@@ -1,10 +1,8 @@
 #include "ledger.h"
-#include "report.h"
 #include "textual.h"
 #include "binary.h"
 
 #include <fstream>
-#include <deque>
 
 namespace ledger {
 
diff --git a/main.cc b/main.cc
index 70a3f015..78afc938 100644
--- a/main.cc
+++ b/main.cc
@@ -1,9 +1,11 @@
 #include "ledger.h"
-#include "constraint.h"
+#include "balance.h"
 #include "textual.h"
 #include "binary.h"
-#include "balance.h"
-#include "report.h"
+#include "constraint.h"
+#include "item.h"
+#include "expr.h"
+#include "format.h"
 
 #include <fstream>
 #include <cstring>
@@ -20,23 +22,20 @@ namespace ledger {
 
 static const std::string bal_fmt = "%20T%2_%-n\n";
 
-void show_balances(std::ostream&	   out,
-		   report::items_deque&    items,
-		   const constraints_t&    constraints,
-		   const report::format_t& format,
-		   const report::item_t *  displayed_parent)
+void show_balances(std::ostream&	out,
+		   items_deque&		items,
+		   const constraints_t& constraints,
+		   const format_t&	format,
+		   const item_t *	displayed_parent)
 {
-  if (format.sort_order)
-    std::sort(items.begin(), items.end(), report::cmp_items(format));
-
-  for (report::items_deque::const_iterator i = items.begin();
+  for (items_deque::const_iterator i = items.begin();
        i != items.end();
        i++) {
-    const report::item_t * parent = displayed_parent;
+    const item_t * parent = displayed_parent;
 
     bool by_exclusion = false;
     std::string name  = maximal_account_name(*i, parent);
-    const bool  match = (format.show_expanded ||
+    const bool  match = (constraints.show_expanded ||
 			 (! constraints.account_masks.empty() &&
 			  matches(constraints.account_masks, name,
 				  &by_exclusion) &&
@@ -45,27 +44,33 @@ void show_balances(std::ostream&	   out,
 			 (constraints.account_masks.empty() &&
 			  displayed_parent->parent == NULL));
 
-    if (match && reportable(format, *i, true) &&
+    if (match && constraints(*i) &&
 	((*i)->subitems.size() != 1 ||
 	 (*i)->total != (*i)->subitems[0]->total)) {
-      out << format_string(*i, format, parent);
+      out << format.report_line(*i, parent);
       parent = *i;
     }
 
+    if (constraints.sort_order)
+      (*i)->sort(constraints.sort_order);
+
     show_balances(out, (*i)->subitems, constraints, format, parent);
   }
 }
 
 void balance_report(std::ostream&	    out,
-		    report::item_t *	    top,
+		    item_t *	    top,
 		    const constraints_t&    constraints,
-		    const report::format_t& format)
+		    const format_t& format)
 {
+  if (constraints.sort_order)
+    top->sort(constraints.sort_order);
+
   show_balances(out, top->subitems, constraints, format, top);
 
-  if (format.show_subtotals && top->subitems.size() > 1 && top->total)
+  if (constraints.show_subtotals && top->subitems.size() > 1 && top->total)
     std::cout << "--------------------\n"
-	      << report::format_string(top, format);
+	      << format.report_line(top);
 }
 
 
@@ -75,7 +80,7 @@ void balance_report(std::ostream&	    out,
 //
 
 static const std::string reg_fmt
-  = "%?10d %?-.20p %/%-.22N %12.66t %12.80T\n";
+  = "%10d %-.20p %/%-.22N %12.66t %12.80T\n";
 
 static bool show_commodities_revalued      = false;
 static bool show_commodities_revalued_only = false;
@@ -84,7 +89,8 @@ static void report_value_change(std::ostream&         out,
 				const std::time_t     date,
 				const balance_pair_t& balance,
 				const balance_pair_t& prev_balance,
-				report::format_t&     format,
+				const constraints_t&  constraints,
+				const format_t&	      format,
 				const std::string&    first_line_format,
 				const std::string&    next_lines_format)
 {
@@ -95,7 +101,7 @@ static void report_value_change(std::ostream&         out,
     return;
   }
 
-  report::item_t temp;
+  item_t temp;
   temp.date  = prev_date;
   temp.total = prev_balance;
   balance_t prev_bal = format.compute_total(&temp);
@@ -109,26 +115,33 @@ static void report_value_change(std::ostream&         out,
     temp.total = balance;
     temp.payee = "Commodities revalued";
 
-    if (reportable(format, &temp)) {
-      format.format_string = first_line_format;
-      out << format_string(&temp, format, NULL);
+    if (constraints(&temp)) {
+      format_t copy = format;
+
+      copy.format_string = first_line_format;
+      out << copy.report_line(&temp);
+
+      copy.format_string = next_lines_format;
+      out << copy.report_line(&temp);
 
-      format.format_string = next_lines_format;
-      out << format_string(&temp, format, NULL);
+      // Prevent double-deletion
+      copy.value_style = NULL;
+      copy.total_style = NULL;
     }
   }
 
   prev_date = date;
 }
 
-void register_report(std::ostream& out, report::item_t * top,
-		     const report::format_t& format)
+void register_report(std::ostream&	  out,
+		     item_t *		  top,
+		     const constraints_t& constraints,
+		     const format_t&	  format)
 {
-  if (format.sort_order)
-    std::sort(top->subitems.begin(), top->subitems.end(),
-	      report::cmp_items(format));
+  if (constraints.sort_order)
+    top->sort(constraints.sort_order);
 
-  report::format_t copy = format;
+  format_t copy = format;
 
   std::string first_line_format;
   std::string next_lines_format;
@@ -146,53 +159,55 @@ void register_report(std::ostream& out, report::item_t * top,
   balance_pair_t last_reported;
   account_t      splits(NULL, "<Total>");
 
-  for (report::items_deque::const_iterator i = top->subitems.begin();
+  for (items_deque::const_iterator i = top->subitems.begin();
        i != top->subitems.end();
        i++) {
     copy.format_string = first_line_format;
 
-    std::string  header     = format_string(*i, copy, top);
+    std::string  header     = copy.report_line(*i, top);
     unsigned int header_len = header.length();
 
     copy.format_string = next_lines_format;
 
     bool first = true;
 
-    if ((*i)->subitems.size() > 1 && ! format.show_expanded) {
-      report::item_t summary;
+    if ((*i)->subitems.size() > 1 && ! constraints.show_expanded) {
+      item_t summary;
       summary.date    = (*i)->date;
       summary.parent  = *i;
       summary.account = &splits;
 
-      for (report::items_deque::const_iterator j = (*i)->subitems.begin();
+      for (items_deque::const_iterator j = (*i)->subitems.begin();
 	   j != (*i)->subitems.end();
 	   j++)
 	summary.value += (*j)->value;
       summary.total = balance + summary.value;
 
-      bool show = reportable(format, &summary);
+      bool show = constraints(&summary);
       if (show && show_commodities_revalued)
-	report_value_change(out, summary.date, balance, last_reported, copy,
-			    first_line_format, next_lines_format);
+	report_value_change(out, summary.date, balance, last_reported,
+			    constraints, copy, first_line_format,
+			    next_lines_format);
 
       balance += summary.value;
 
       if (show) {
 	if (! show_commodities_revalued_only)
-	  out << header << format_string(&summary, copy, *i);
+	  out << header << copy.report_line(&summary, *i);
 	if (show_commodities_revalued)
 	  last_reported = balance;
       }
     } else {
-      for (report::items_deque::const_iterator j = (*i)->subitems.begin();
+      for (items_deque::const_iterator j = (*i)->subitems.begin();
 	   j != (*i)->subitems.end();
 	   j++) {
 	(*j)->total = balance + (*j)->value;
 
-	bool show = reportable(format, *j);
+	bool show = constraints(*j);
 	if (show && first && show_commodities_revalued) {
-	  report_value_change(out, (*i)->date, balance, last_reported, copy,
-			      first_line_format, next_lines_format);
+	  report_value_change(out, (*i)->date, balance, last_reported,
+			      constraints, copy, first_line_format,
+			      next_lines_format);
 	  if (show_commodities_revalued_only)
 	    first = false;
 	}
@@ -208,7 +223,7 @@ void register_report(std::ostream& out, report::item_t * top,
 	      out.width(header_len);
 	      out << " ";
 	    }
-	    out << format_string(*j, copy, *i);
+	    out << copy.report_line(*j, *i);
 	  }
 	  if (show_commodities_revalued)
 	    last_reported = balance;
@@ -218,12 +233,11 @@ void register_report(std::ostream& out, report::item_t * top,
   }
 
   if (show_commodities_revalued)
-    report_value_change(out, copy.end(), balance, last_reported, copy,
-			first_line_format, next_lines_format);
+    report_value_change(out, constraints.end(), balance, last_reported,
+			constraints, copy, first_line_format,
+			next_lines_format);
 
   // To stop these from getting deleted when copy goes out of scope
-  copy.predicate   = NULL;
-  copy.sort_order  = NULL;
   copy.value_style = NULL;
   copy.total_style = NULL;
 }
@@ -493,7 +507,7 @@ int main(int argc, char * argv[])
   std::list<std::string>   files;
   ledger::ledger_t *	   book = NULL;
   ledger::constraints_t    constraints;
-  ledger::report::format_t format;
+  ledger::format_t format;
 
   std::string sort_order;
   std::string value_style = "a";
@@ -623,19 +637,19 @@ int main(int argc, char * argv[])
       break;
 
     case 'M':
-      format.period = ledger::report::PERIOD_MONTHLY;
+      constraints.period = ledger::PERIOD_MONTHLY;
       break;
 
     case 'E':
-      format.show_empty = true;
+      constraints.show_empty = true;
       break;
 
     case 'n':
-      format.show_subtotals = false;
+      constraints.show_subtotals = false;
       break;
 
     case 's':
-      format.show_expanded = true;
+      constraints.show_expanded = true;
       break;
 
     case 'S':
@@ -643,11 +657,11 @@ int main(int argc, char * argv[])
       break;
 
     case 'o':
-      format.show_related = true;
+      constraints.show_related = true;
       break;
 
     case 'l':
-      format.predicate = ledger::report::parse_expr(optarg, book);
+      constraints.predicate = ledger::parse_expr(optarg, book);
       break;
 
     // Commodity reporting
@@ -791,20 +805,18 @@ int main(int argc, char * argv[])
   // Copy the constraints to the format object, and compile the value
   // and total style strings
 
-  format.constraints = constraints;
   if (! sort_order.empty())
-    format.sort_order = ledger::report::parse_expr(sort_order, book);
-  format.value_style = ledger::report::parse_expr(value_style, book);
-  format.total_style = ledger::report::parse_expr(total_style, book);
+    constraints.sort_order = ledger::parse_expr(sort_order, book);
+  format.value_style = ledger::parse_expr(value_style, book);
+  format.total_style = ledger::parse_expr(total_style, book);
 
   // Now handle the command that was identified above.
 
   if (command == "print") {
 #if 0
-    ledger::report::item_t * top
-      = ledger::report::walk_entries(book->entries.begin(),
-				     book->entries.end(),
-				     constraints, format);
+    ledger::item_t * top
+      = ledger::walk_entries(book->entries.begin(), book->entries.end(),
+			     constraints, format);
     ledger::entry_report(std::cout, top, format);
 #ifdef DEBUG
     delete top;
@@ -813,9 +825,9 @@ int main(int argc, char * argv[])
   }
   else if (command == "equity") {
 #if 0
-    ledger::report::item_t * top
-      = ledger::report::walk_accounts(book->master, constraints,
-				      format.show_subtotals);
+    ledger::item_t * top
+      = ledger::walk_accounts(book->master, constraints,
+			      constraints.show_subtotals);
 
     ledger::entry_report(std::cout, top, constraints, format);
 
@@ -824,15 +836,15 @@ int main(int argc, char * argv[])
 #endif
 #endif
   }
-  else if (format.period == ledger::report::PERIOD_NONE &&
-	   ! format.sort_order && ! format.show_related &&
+  else if (constraints.period == ledger::PERIOD_NONE &&
+	   ! constraints.sort_order && ! constraints.show_related &&
 	   (command == "balance"  || command == "bal")) {
     if (format.format_string.empty())
       format.format_string = ledger::bal_fmt;
 
-    if (ledger::report::item_t * top
-	  = ledger::report::walk_accounts(book->master, constraints,
-					  format.show_subtotals)) {
+    if (ledger::item_t * top
+	  = ledger::walk_accounts(book->master, constraints,
+				  constraints.show_subtotals)) {
       ledger::balance_report(std::cout, top, constraints, format);
 #ifdef DEBUG
       delete top;
@@ -843,13 +855,12 @@ int main(int argc, char * argv[])
     if (format.format_string.empty())
       format.format_string = ledger::bal_fmt;
 
-    if (ledger::report::item_t * list
-	  = ledger::report::walk_entries(book->entries.begin(),
-					 book->entries.end(),
-					 constraints, format))
-      if (ledger::report::item_t * top
-	    = ledger::report::walk_items(list, book->master, constraints,
-					 format.show_subtotals)) {
+    if (ledger::item_t * list
+	  = ledger::walk_entries(book->entries.begin(),
+				 book->entries.end(), constraints))
+      if (ledger::item_t * top
+	    = ledger::walk_items(list, book->master, constraints,
+				 constraints.show_subtotals)) {
 	ledger::balance_report(std::cout, top, constraints, format);
 #ifdef DEBUG
 	delete top;
@@ -861,14 +872,13 @@ int main(int argc, char * argv[])
     if (format.format_string.empty())
       format.format_string = ledger::reg_fmt;
 
-    if (format.show_related)
-      format.show_inverted = true;
+    if (constraints.show_related)
+      constraints.show_inverted = true;
 
-    if (ledger::report::item_t * top
-	  = ledger::report::walk_entries(book->entries.begin(),
-					 book->entries.end(),
-					 constraints, format)) {
-      ledger::register_report(std::cout, top, format);
+    if (ledger::item_t * top
+	  = ledger::walk_entries(book->entries.begin(),
+				 book->entries.end(), constraints)) {
+      ledger::register_report(std::cout, top, constraints, format);
 #ifdef DEBUG
       delete top;
 #endif