Changeset 10e90cb for src/Common/Assert.cc

Timestamp:

Jun 6, 2017, 2:50:57 PM (7 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:

c6d2e93

Parents:

8ca3a72 (diff), c5ac6d5 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Common/Assert.cc (modified) (2 diffs)

src/Common/Assert.cc

@@ -21 +21 @@
 extern const char * __progname;                                                 // global name of running executable (argv[0])
 
-#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+#define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
 // called by macro assert in assert.h
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-        fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
         abort();
 }
@@ -31 +31 @@
 // called by macro assertf
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-        fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
         va_list args;
         va_start( args, fmt );