amount_t::print and value_t::print now use flags

1 files changed, 14 insertions, 16 deletions

diff --git a/src/value.cc b/src/value.cc
index e9313f0c..7af2fd1e 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -1681,18 +1681,17 @@ value_t value_t::strip_annotations(const keep_details_t& what_to_keep) const
   return NULL_VALUE;
 }
 
-void value_t::print(std::ostream& out,
-		    const int	  first_width,
-		    const int     latter_width,
-		    const bool    right_justify,
-		    const bool    colorize) const
+void value_t::print(std::ostream&       out,
+		    const int	        first_width,
+		    const int           latter_width,
+		    const uint_least8_t flags) const
 {
   if (first_width > 0 &&
       (! is_amount() || as_amount().is_zero()) &&
       ! is_balance() && ! is_string()) {
     out.width(first_width);
 
-    if (right_justify)
+    if (flags & AMOUNT_PRINT_RIGHT_JUSTIFY)
       out << std::right;
     else
       out << std::left;
@@ -1716,8 +1715,9 @@ void value_t::print(std::ostream& out,
     break;
 
   case INTEGER:
-    if (colorize && as_long() < 0)
-      justify(out, to_string(), first_width, right_justify, true);
+    if (flags & AMOUNT_PRINT_COLORIZE && as_long() < 0)
+      justify(out, to_string(), first_width,
+	      flags & AMOUNT_PRINT_RIGHT_JUSTIFY, true);
     else
       out << as_long();
     break;
@@ -1727,21 +1727,20 @@ void value_t::print(std::ostream& out,
       out << 0;
     } else {
       std::ostringstream buf;
-      buf << as_amount();
-      justify(out, buf.str(), first_width, right_justify,
-	      colorize && as_amount().sign() < 0);
+      as_amount().print(buf, flags & AMOUNT_PRINT_NO_COMPUTED_ANNOTATIONS);
+      justify(out, buf.str(), first_width, flags & AMOUNT_PRINT_RIGHT_JUSTIFY,
+	      flags & AMOUNT_PRINT_COLORIZE && as_amount().sign() < 0);
     }
     break;
   }
 
   case BALANCE:
-    as_balance().print(out, first_width, latter_width, right_justify,
-		       colorize);
+    as_balance().print(out, first_width, latter_width, flags);
     break;
 
   case STRING:
     if (first_width > 0)
-      justify(out, as_string(), first_width, right_justify);
+      justify(out, as_string(), first_width, flags & AMOUNT_PRINT_RIGHT_JUSTIFY);
     else
       out << as_string();
     break;
@@ -1759,8 +1758,7 @@ void value_t::print(std::ostream& out,
       else
 	out << ", ";
 
-      value.print(out, first_width, latter_width, right_justify,
-		  colorize);
+      value.print(out, first_width, latter_width, flags);
     }
     out << ')';
     break;