Changeset d1969a6 for src/InitTweak/InitTweak.cc

Timestamp:

Sep 9, 2016, 9:20:33 AM (8 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:

b6fe7e6

Parents:

4563a95

Message:

check that assignment routines have a reasonable signature, add noreturn attribute to assert_fail_f to silence warnings

File:

• src/InitTweak/InitTweak.cc (modified) (4 diffs)

src/InitTweak/InitTweak.cc

@@ -358 +358 @@
                 template<typename CallExpr>
                 Expression *& callArg( CallExpr * callExpr, unsigned int pos ) {
-                        if ( pos >= callExpr->get_args().size() ) assert( false && "asking for argument that doesn't exist. Return NULL/throw exception?" );
+                        if ( pos >= callExpr->get_args().size() ) assertf( false, "asking for argument that doesn't exist. Return NULL/throw exception?" );
                         for ( Expression *& arg : callExpr->get_args() ) {
                                 if ( pos == 0 ) return arg;
@@ -373 +373 @@
                         return callArg( untypedExpr, pos );
                 } else {
-                        assert( false && "Unexpected expression type passed to getCallArg" );
+                        assertf( false, "Unexpected expression type passed to getCallArg" );
                 }
         }
@@ -388 +388 @@
                                 return memberExpr->get_member()->get_name();
                         } else {
-                                assert( false && "Unexpected expression type being called as a function in call expression" );
+                                assertf( false, "Unexpected expression type being called as a function in call expression" );
                         }
                 }
@@ -400 +400 @@
                 } else {
                         std::cerr << expr << std::endl;
-                        assert( false && "Unexpected expression type passed to getFunctionName" );
+                        assertf( false, "Unexpected expression type passed to getFunctionName" );
                 }
         }