Changeset 3f7e12cb for src/Common/utility.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/utility.h (modified) (5 diffs)

src/Common/utility.h

@@ -18 +18 @@
 #include <cctype>
 #include <algorithm>
+#include <functional>
 #include <iostream>
 #include <iterator>
@@ -27 +28 @@
 
 #include <cassert>
+
+#include "Common/Indenter.h"
 
 template< typename T >
@@ -75 +78 @@
 
 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 +354 @@
 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 +375 @@
                 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;
 };