Changeset 67a67af for src/ResolvExpr

Timestamp:

Aug 11, 2017, 10:55:14 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

03321e4, f196351

Parents:

3b4571b (diff), 54cd58b0 (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

Location:

src/ResolvExpr

Files:

• CurrentObject.cc (modified) (2 diffs)
• CurrentObject.h (modified) (1 diff)

src/ResolvExpr/CurrentObject.cc

@@ -19 +19 @@
 #include "CurrentObject.h"
 
+#include "Common/Indenter.h"
+
 #include "SynTree/Declaration.h"
 #include "SynTree/Initializer.h"
@@ -45 +47 @@
                         assertf( false, "unhandled type on getConstValue %s", toString( constExpr->get_result() ).c_str() ); // xxx - might be semantic error
                 }
-        }
-
-        struct Indenter {
-                static const int amt = 2;
-                unsigned int indent = 0;
-
-                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; }
-                Indenter & operator++() { return *this += 1; }
-                Indenter & operator--() { return *this -= 1; }
-        };
-        std::ostream & operator<<( std::ostream & out, Indenter & indent ) {
-                return out << std::string(indent.indent, ' ');
         }
 

src/ResolvExpr/CurrentObject.h

@@ -24 +24 @@
         class MemberIterator;
 
+        // TODO: memory management of MemberIterators
         class CurrentObject {
         public: