Changeset af1e8f56 for src/AST

Timestamp:

May 23, 2019, 4:22:58 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a16e246, f1ec88a

Parents:

20a5977 (diff), effe5b0 (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/AST

Files:

• Decl.cpp (modified) (1 diff)
• Decl.hpp (modified) (1 diff)
• Pass.proto.hpp (modified) (4 diffs)

src/AST/Decl.cpp

@@ -72 +72 @@
 // --- EnumDecl
 
-bool EnumDecl::valueOf( Decl* enumerator, long long& value ) const {
+bool EnumDecl::valueOf( const Decl * enumerator, long long& value ) const {
         if ( enumValues.empty() ) {
                 long long crntVal = 0;
-                for ( const Decl* member : members ) {
+                for ( const Decl * member : members ) {
                         const ObjectDecl* field = strict_dynamic_cast< const ObjectDecl* >( member );
                         if ( field->init ) {

src/AST/Decl.hpp

@@ -287 +287 @@
 
         /// gets the integer value for this enumerator, returning true iff value found
-        bool valueOf( Decl* enumerator, long long& value ) const;
+        bool valueOf( const Decl * enumerator, long long& value ) const;
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.proto.hpp

@@ -109 +109 @@
         };
 
+        /// "Short hand" to check if this is a valid previsit function
+        /// Mostly used to make the static_assert look (and print) prettier
         template<typename pass_t, typename node_t>
         struct is_valid_previsit {
@@ -117 +119 @@
         };
 
+        /// Used by previsit implementation
+        /// We need to reassign the result to 'node', unless the function
+        /// returns void, then we just leave 'node' unchanged
         template<bool is_void>
         struct __assign;
@@ -134 +139 @@
                         node = pass.previsit( node );
                         assertf(node, "Previsit must not return NULL");
+                }
+        };
+
+        /// Used by postvisit implementation
+        /// We need to return the result unless the function
+        /// returns void, then we just return the original node
+        template<bool is_void>
+        struct __return;
+
+        template<>
+        struct __return<true> {
+                template<typename pass_t, typename node_t>
+                static inline const node_t * result( pass_t & pass, const node_t * & node ) {
+                        pass.postvisit( node );
+                        return node;
+                }
+        };
+
+        template<>
+        struct __return<false> {
+                template<typename pass_t, typename node_t>
+                static inline auto result( pass_t & pass, const node_t * & node ) {
+                        return pass.postvisit( node );
                 }
         };
@@ -174 +202 @@
                 decltype( pass.postvisit( node ), node->accept( *(Visitor*)nullptr ) )
         {
-                return pass.postvisit( node );
+                return __return<
+                        std::is_void<
+                                decltype( pass.postvisit( node ) )
+                        >::value
+                >::result( pass, node );
         }