Changeset 4a9ccc3 for src/Common

Timestamp:

Jan 24, 2017, 3:56:33 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:

ad6343e

Parents:

0bfaf80

Message:

propagate sized status through trait instances

File:

• src/Common/utility.h (modified) (2 diffs)

src/Common/utility.h

@@ -252 +252 @@
 
 template< typename T >
-struct reverseIterate_t {
+struct reverse_iterate_t {
         T& ref;
 
-        reverseIterate_t( T & ref ) : ref(ref) {}
+        reverse_iterate_t( T & ref ) : ref(ref) {}
 
         typedef typename T::reverse_iterator iterator;
@@ -263 +263 @@
 
 template< typename T >
-reverseIterate_t< T > reverseIterate( T & ref ) {
-        return reverseIterate_t< T >( ref );
-}
-
+reverse_iterate_t< T > reverseIterate( T & ref ) {
+        return reverse_iterate_t< T >( ref );
+}
+
+// -----------------------------------------------------------------------------
+// Helper struct and function to support
+// for ( val : group_iterate( container1, container2, ... ) ) {}
+// syntax to have a for each that iterates multiple containers of the same length
+// TODO: update to use variadic arguments
+
+template< typename T1, typename T2 >
+struct group_iterate_t {
+        group_iterate_t( const T1 & v1, const T2 & v2 ) : args(v1, v2) {
+                assertf(v1.size() == v2.size(), "group iteration requires containers of the same size.");
+        };
+
+        struct iterator {
+                typedef std::tuple<typename T1::value_type, typename T2::value_type> value_type;
+                typedef typename T1::iterator T1Iter;
+                typedef typename T2::iterator T2Iter;
+                typedef std::tuple<T1Iter, T2Iter> IterTuple;
+                IterTuple it;
+                iterator( T1Iter i1, T2Iter i2 ) : it( i1, i2 ) {}
+                iterator operator++() {
+                        return iterator( ++std::get<0>(it), ++std::get<1>(it) );
+                }
+                bool operator!=( const iterator &other ) const { return it != other.it; }
+                value_type operator*() const { return std::make_tuple( *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;
+};
+
+template< typename... Args >
+group_iterate_t<Args...> group_iterate( const Args &... args ) {
+        return group_iterate_t<Args...>(args...);
+}
 #endif // _UTILITY_H