Changes in src/Common/Indenter.h [4e5e6cc:50377a4]

File:

• src/Common/Indenter.h (modified) (2 diffs)

src/Common/Indenter.h

@@ -18 +18 @@
 
 struct Indenter {
-        static unsigned tabsize;  ///< default number of spaces in one level of indentation
+        static unsigned tabsize;
 
-        unsigned int indent;      ///< number of spaces to indent
-        unsigned int amt;         ///< spaces in one level of indentation
+        Indenter( unsigned int amt = tabsize, unsigned int indent = 0 ) : amt( amt ), indent( indent ) {}
+        unsigned int amt;  // amount 1 level increases indent by (i.e. how much to increase by in operator++)
+        unsigned int indent;
 
-        Indenter( unsigned int indent = 0, unsigned int amt = tabsize )
-        : indent( indent ), amt( amt ) {}
-
-        Indenter & operator+=(int nlevels) { indent += nlevels; return *this; }
-        Indenter & operator-=(int nlevels) { indent -= nlevels; return *this; }
+        Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
+        Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
         Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
         Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
@@ -35 +33 @@
 
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
-        return out << std::string(indent.indent * indent.amt, ' ');
+        return out << std::string(indent.indent, ' ');
 }