Changeset 05d55ff for src/Common/Indenter.h

Timestamp:

Jun 7, 2019, 4:15:03 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2d11663, 46438e4

Parents:

60aaa51d (diff), be8518f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Common/Indenter.h

@@ -23 +23 @@
         unsigned int amt;         ///< spaces in one level of indentation
 
-        Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
-        : indent( indent*amt ), amt( amt ) {}
-        
-        Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
-        Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
+        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) { Indenter indenter = *this; return indenter += nlevels; }
         Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
@@ -35 +35 @@
 
 inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
-        return out << std::string(indent.indent, ' ');
+        return out << std::string(indent.indent * indent.amt, ' ');
 }