Changeset 7dc09294 for src/Common

Timestamp:

Sep 13, 2017, 7:27:12 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

982832e

Parents:

ada0eb06 (diff), 4639b0d (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

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (1 diff)
• utility.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -145 +145 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl ) override final;
         virtual Declaration* mutate( TraitDecl *aggregateDecl ) override final;
-        virtual TypeDecl* mutate( TypeDecl *typeDecl ) override final;
+        virtual Declaration* mutate( TypeDecl *typeDecl ) override final;
         virtual Declaration* mutate( TypedefDecl *typeDecl ) override final;
         virtual AsmDecl* mutate( AsmDecl *asmDecl ) override final;

src/Common/PassVisitor.impl.h

@@ -976 +976 @@
 
 template< typename pass_type >
-TypeDecl * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
-        MUTATE_BODY( TypeDecl, node );
+Declaration * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
+        MUTATE_BODY( Declaration, node );
 }
 

src/Common/utility.h

@@ -370 +370 @@
 }
 
+// -----------------------------------------------------------------------------
+// Helper struct and function to support
+// for ( val : lazy_map( container1, f ) ) {}
+// syntax to have a for each that iterates a container, mapping each element by applying f
+template< typename T, typename Func >
+struct lambda_iterate_t {
+        const T & ref;
+        std::function<Func> f;
+
+        struct iterator {
+                typedef decltype(begin(ref)) Iter;
+                Iter it;
+                std::function<Func> f;
+                iterator( Iter it, std::function<Func> f ) : it(it), f(f) {}
+                iterator & operator++() {
+                        ++it; return *this;
+                }
+                bool operator!=( const iterator &other ) const { return it != other.it; }
+                auto operator*() const -> decltype(f(*it)) { return f(*it); }
+        };
+
+        lambda_iterate_t( const T & ref, std::function<Func> f ) : ref(ref), f(f) {}
+
+        auto begin() const -> decltype(iterator(std::begin(ref), f)) { return iterator(std::begin(ref), f); }
+        auto end() const   -> decltype(iterator(std::end(ref), f)) { return iterator(std::end(ref), f); }
+};
+
+template< typename... Args >
+lambda_iterate_t<Args...> lazy_map( const Args &... args ) {
+        return lambda_iterate_t<Args...>( args...);
+}
+
+
+
 // Local Variables: //
 // tab-width: 4 //