Changeset bae0d35 for src/AST

Timestamp:

Jun 7, 2021, 2:09:12 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

5a46e09

Parents:

82f4063 (diff), 53692b3 (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:

• Pass.proto.hpp (modified) (1 diff)
• Type.hpp (modified) (3 diffs)
• TypeEnvironment.cpp (modified) (1 diff)

src/AST/Pass.proto.hpp

@@ -119 +119 @@
         template<typename core_t, typename node_t>
         struct is_valid_previsit {
-                using ret_t = decltype( ((core_t*)nullptr)->previsit( (const node_t *)nullptr ) );
+                using ret_t = decltype( std::declval<core_t*>()->previsit( std::declval<const node_t *>() ) );
 
                 static constexpr bool value = std::is_void< ret_t >::value ||

src/AST/Type.hpp

@@ -402 +402 @@
 
         // compact representation used for map lookups.
-        struct TypeEnvKey { 
-                const TypeDecl * base;
-                int formal_usage;
-                int expr_id;
+        struct TypeEnvKey {
+                const TypeDecl * base = nullptr;
+                int formal_usage = 0;
+                int expr_id = 0;
 
                 TypeEnvKey() = default;
@@ -440 +440 @@
         const Type * accept( Visitor & v ) const override { return v.visit( this ); }
 
-        std::string typeString() const { 
-                if (formal_usage > 0) return std::string("_") + std::to_string(formal_usage) + "_" + std::to_string(expr_id) + "_" + name; 
+        std::string typeString() const {
+                if (formal_usage > 0) return std::string("_") + std::to_string(formal_usage) + "_" + std::to_string(expr_id) + "_" + name;
                 else return name;
         }
@@ -548 +548 @@
                         res = p * res + x.expr_id;
                         return res;
-                } 
+                }
         };
 }

src/AST/TypeEnvironment.cpp

@@ -115 +115 @@
 
 void TypeEnvironment::add( const TypeSubstitution & sub ) {
-        for ( const auto p : sub ) {
+        for ( const auto & p : sub ) {
                 add( EqvClass{ p.first, p.second } );
         }