Changes in src/ResolvExpr/CurrentObject.cc [f7cb0bc:9ff56e7]

File:

• src/ResolvExpr/CurrentObject.cc (modified) (3 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -19 +19 @@
 #include "CurrentObject.h"
 
-#include "Common/Indenter.h"
-
 #include "SynTree/Declaration.h"
 #include "SynTree/Initializer.h"
@@ -47 +45 @@
                         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, ' ');
         }
 
@@ -114 +127 @@
                 }
 
-                virtual void print( std::ostream & out, Indenter indent ) const {
+                virtual void print( std::ostream & out, __attribute__((unused)) Indenter indent ) const {
                         out << "SimpleIterator(" << type << ")";
                 }