Changeset 50377a4 for src/Common

Timestamp:

Oct 2, 2017, 4:39:42 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

bf4b4cf

Parents:

a8555c5

Message:

Refactor tree print code to use Indenter

Location:

src/Common

Files:

• Indenter.h (modified) (2 diffs)
• utility.h (modified) (4 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, ' ');
 }

src/Common/utility.h

@@ -28 +28 @@
 #include <cassert>
 
+#include "Common/Indenter.h"
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -75 +77 @@
 
 template< typename Container >
-void printAll( const Container &container, std::ostream &os, int indent = 0 ) {
+void printAll( const Container &container, std::ostream &os, Indenter indent = {} ) {
         for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
                 if ( *i ) {
-                        os << std::string( indent,  ' ' );
-                        (*i)->print( os, indent + 2 );
+                        os << indent;
+                        (*i)->print( os, indent );
                         // need an endl after each element because it's not easy to know when each individual item should end
                         os << std::endl;
@@ -351 +353 @@
 template< typename T1, typename T2 >
 struct group_iterate_t {
+private:
+        std::tuple<T1, T2> args;
+public:
         group_iterate_t( bool skipBoundsCheck, const T1 & v1, const T2 & v2 ) : args(v1, v2) {
                 assertf(skipBoundsCheck || v1.size() == v2.size(), "group iteration requires containers of the same size: <%zd, %zd>.", v1.size(), v2.size());
         };
 
+        typedef std::tuple<decltype(*std::get<0>(args).begin()), decltype(*std::get<1>(args).begin())> value_type;
+        typedef decltype(std::get<0>(args).begin()) T1Iter;
+        typedef decltype(std::get<1>(args).begin()) T2Iter;
+
         struct iterator {
-                typedef typename std::remove_reference<T1>::type T1val;
-                typedef typename std::remove_reference<T2>::type T2val;
-                typedef std::tuple<typename T1val::value_type &, typename T2val::value_type &> value_type;
-                typedef typename T1val::iterator T1Iter;
-                typedef typename T2val::iterator T2Iter;
                 typedef std::tuple<T1Iter, T2Iter> IterTuple;
                 IterTuple it;
@@ -370 +374 @@
                 value_type operator*() const { return std::tie( *std::get<0>(it), *std::get<1>(it) ); }
         };
+
         iterator begin() { return iterator( std::get<0>(args).begin(), std::get<1>(args).begin() ); }
         iterator end() { return iterator( std::get<0>(args).end(), std::get<1>(args).end() ); }
-
-private:
-        std::tuple<T1, T2> args;
 };