Changes in src/ResolvExpr/CurrentObject.cc [56e49b0:ea6332d]

File:

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

src/ResolvExpr/CurrentObject.cc

@@ -14 +14 @@
 //
 
-#include <stack>
-#include <iostream>
-
+#include <stddef.h>                    // for size_t
+#include <cassert>                     // for assertf, assert, safe_dynamic_...
+#include <iostream>                    // for ostream, operator<<, basic_ost...
+#include <stack>                       // for stack
+#include <string>                      // for string, operator<<, allocator
+
+#include "Common/Indenter.h"           // for Indenter, operator<<
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/utility.h"            // for toString
 #include "CurrentObject.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Initializer.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
+#include "SynTree/Constant.h"          // for Constant
+#include "SynTree/Declaration.h"       // for ObjectDecl, Declaration, Struc...
+#include "SynTree/Expression.h"        // for InitAlternative, VariableExpr
+#include "SynTree/Initializer.h"       // for Designation, operator<<
+#include "SynTree/Type.h"              // for Type, StructInstType, UnionIns...
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 
 #if 0
@@ -45 +52 @@
                         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, ' ');
         }