Changeset bae0d35 for src

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

Files:

• AST/Pass.proto.hpp (modified) (1 diff)
• AST/Type.hpp (modified) (3 diffs)
• AST/TypeEnvironment.cpp (modified) (1 diff)
• CodeTools/ResolvProtoDump.cc (modified) (1 diff)
• main.cc (modified) (3 diffs)

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 } );
         }

src/CodeTools/ResolvProtoDump.cc

@@ -746 +746 @@
                         // print child scopes
                         ++indent;
-                        for ( const PassVisitor<ProtoDump>& s : subs ) {
+                        for ( const ProtoDump & s : subs ) {
                                 std::cout << tab << '{' << std::endl;
-                                s.pass.print( indent );
+                                s.print( indent );
                                 std::cout << tab << '}' << std::endl;
                         }

src/main.cc

@@ -160 +160 @@
 #define SIGPARMS int sig __attribute__(( unused )), siginfo_t * sfp __attribute__(( unused )), ucontext_t * cxt __attribute__(( unused ))
 
-static void Signal( int sig, void (* handler)(SIGPARMS), int flags ) {
-        struct sigaction act;
-
-        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
+static void _Signal(struct sigaction & act, int sig, int flags ) {
         act.sa_flags = flags;
 
@@ -170 +167 @@
             _exit( EXIT_FAILURE );
         } // if
+}
+
+static void Signal( int sig, void (* handler)(SIGPARMS), int flags ) {
+        struct sigaction act;
+        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
+        _Signal(act, sig, flags);
+} // Signal
+
+static void Signal( int sig, void (* handler)(int), int flags ) {
+        struct sigaction act;
+        act.sa_handler = handler;
+        _Signal(act, sig, flags);
 } // Signal
 
@@ -202 +211 @@
 static void sigAbortHandler( SIGPARMS ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
-        Signal( SIGABRT, (void (*)(SIGPARMS))SIG_DFL, SA_SIGINFO );     // reset default signal handler
+        Signal( SIGABRT, SIG_DFL, SA_SIGINFO ); // reset default signal handler
         raise( SIGABRT );                                                                       // reraise SIGABRT
 } // sigAbortHandler