Changeset 3f7e12cb for src/Common/Indenter.h

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

954908d

Parents:

78315272 (diff), e35f30a (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

@@ -18 +18 @@
 
 struct Indenter {
-        Indenter( unsigned int amt = 2 ) : amt( amt ) {}
-        unsigned int amt = 2;  // amount 1 level increases indent by (i.e. how much to increase by in operator++)
-        unsigned int indent = 0;
+        static unsigned tabsize;
+
+        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 & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
@@ -30 +32 @@
 };
 
-inline std::ostream & operator<<( std::ostream & out, Indenter & indent ) {
+inline std::ostream & operator<<( std::ostream & out, const Indenter & indent ) {
         return out << std::string(indent.indent, ' ');
 }