Index: src/tests/.expect/castError.txt =================================================================== --- src/tests/.expect/castError.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/castError.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,3 +1,3 @@ -Error: Can't choose between 3 alternatives for expression Cast of: +castError.c:7 error: Can't choose between 3 alternatives for expression Cast of: Name: f Index: src/tests/.expect/completeTypeError.txt =================================================================== --- src/tests/.expect/completeTypeError.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/completeTypeError.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,3 +1,3 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:34 error: No reasonable alternatives for expression Applying untyped: Name: *? ...to: @@ -5,5 +5,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:36 error: No reasonable alternatives for expression Applying untyped: Name: baz ...to: @@ -11,5 +11,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:37 error: No reasonable alternatives for expression Applying untyped: Name: quux ...to: @@ -17,5 +17,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:58 error: No reasonable alternatives for expression Applying untyped: Name: baz ...to: @@ -23,5 +23,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:59 error: No reasonable alternatives for expression Applying untyped: Name: quux ...to: @@ -29,5 +29,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:60 error: No reasonable alternatives for expression Applying untyped: Name: *? ...to: @@ -35,5 +35,5 @@ -Error: No reasonable alternatives for expression Applying untyped: +completeTypeError.c:72 error: No reasonable alternatives for expression Applying untyped: Name: baz ...to: Index: src/tests/.expect/constant0-1DP.txt =================================================================== --- src/tests/.expect/constant0-1DP.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/constant0-1DP.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,33 +1,33 @@ -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for 0: pointer to signed int -Error: duplicate object definition for 1: pointer to signed int -Error: duplicate object definition for 0: pointer to signed int -Error: duplicate object definition for 1: pointer to signed int -Error: duplicate object definition for 0: pointer to signed int -Error: duplicate object definition for 1: pointer to signed int -Error: duplicate object definition for 0: pointer to signed int -Error: duplicate object definition for 1: pointer to signed int -Error: duplicate object definition for 0: const pointer to signed int -Error: duplicate object definition for 1: const pointer to signed int -Error: duplicate object definition for 0: const pointer to signed int -Error: duplicate object definition for 1: const pointer to signed int -Error: duplicate object definition for 0: const pointer to signed int -Error: duplicate object definition for 1: const pointer to signed int -Error: duplicate object definition for x: const pointer to pointer to signed int -Error: duplicate object definition for 0: pointer to pointer to signed int -Error: duplicate object definition for x: const pointer to pointer to signed int -Error: duplicate object definition for 0: pointer to pointer to signed int -Error: duplicate object definition for x: const pointer to pointer to signed int -Error: duplicate object definition for 0: pointer to pointer to signed int +constant0-1.c:14 error: duplicate object definition for 0: signed int +constant0-1.c:15 error: duplicate object definition for 0: const signed int +constant0-1.c:16 error: duplicate object definition for 1: signed int +constant0-1.c:17 error: duplicate object definition for 1: const signed int +constant0-1.c:18 error: duplicate object definition for 0: signed int +constant0-1.c:18 error: duplicate object definition for 1: signed int +constant0-1.c:19 error: duplicate object definition for 0: signed int +constant0-1.c:19 error: duplicate object definition for 1: signed int +constant0-1.c:20 error: duplicate object definition for 0: const signed int +constant0-1.c:20 error: duplicate object definition for 1: const signed int +constant0-1.c:21 error: duplicate object definition for 0: const signed int +constant0-1.c:21 error: duplicate object definition for 1: const signed int +constant0-1.c:39 error: duplicate object definition for 0: pointer to signed int +constant0-1.c:39 error: duplicate object definition for 1: pointer to signed int +constant0-1.c:40 error: duplicate object definition for 0: pointer to signed int +constant0-1.c:40 error: duplicate object definition for 1: pointer to signed int +constant0-1.c:41 error: duplicate object definition for 0: pointer to signed int +constant0-1.c:41 error: duplicate object definition for 1: pointer to signed int +constant0-1.c:42 error: duplicate object definition for 0: pointer to signed int +constant0-1.c:42 error: duplicate object definition for 1: pointer to signed int +constant0-1.c:43 error: duplicate object definition for 0: const pointer to signed int +constant0-1.c:43 error: duplicate object definition for 1: const pointer to signed int +constant0-1.c:44 error: duplicate object definition for 0: const pointer to signed int +constant0-1.c:44 error: duplicate object definition for 1: const pointer to signed int +constant0-1.c:45 error: duplicate object definition for 0: const pointer to signed int +constant0-1.c:45 error: duplicate object definition for 1: const pointer to signed int +constant0-1.c:46 error: duplicate object definition for x: const pointer to pointer to signed int +constant0-1.c:46 error: duplicate object definition for 0: pointer to pointer to signed int +constant0-1.c:47 error: duplicate object definition for x: const pointer to pointer to signed int +constant0-1.c:47 error: duplicate object definition for 0: pointer to pointer to signed int +constant0-1.c:50 error: duplicate object definition for x: const pointer to pointer to signed int +constant0-1.c:50 error: duplicate object definition for 0: pointer to pointer to signed int make: *** [constant0-1DP] Error 1 Index: src/tests/.expect/constant0-1NDDP.txt =================================================================== --- src/tests/.expect/constant0-1NDDP.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/constant0-1NDDP.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,17 +1,17 @@ -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 0: signed int -Error: duplicate object definition for 1: signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for 0: const signed int -Error: duplicate object definition for 1: const signed int -Error: duplicate object definition for x: pointer to signed int -Error: duplicate object definition for 0: pointer to signed int -Error: duplicate object definition for x: const pointer to signed int -Error: duplicate object definition for 0: const pointer to signed int +constant0-1.c:14 error: duplicate object definition for 0: signed int +constant0-1.c:15 error: duplicate object definition for 0: const signed int +constant0-1.c:16 error: duplicate object definition for 1: signed int +constant0-1.c:17 error: duplicate object definition for 1: const signed int +constant0-1.c:18 error: duplicate object definition for 0: signed int +constant0-1.c:18 error: duplicate object definition for 1: signed int +constant0-1.c:19 error: duplicate object definition for 0: signed int +constant0-1.c:19 error: duplicate object definition for 1: signed int +constant0-1.c:20 error: duplicate object definition for 0: const signed int +constant0-1.c:20 error: duplicate object definition for 1: const signed int +constant0-1.c:21 error: duplicate object definition for 0: const signed int +constant0-1.c:21 error: duplicate object definition for 1: const signed int +constant0-1.c:66 error: duplicate object definition for x: pointer to signed int +constant0-1.c:66 error: duplicate object definition for 0: pointer to signed int +constant0-1.c:67 error: duplicate object definition for x: const pointer to signed int +constant0-1.c:67 error: duplicate object definition for 0: const pointer to signed int make: *** [constant0-1NDDP] Error 1 Index: src/tests/.expect/declarationErrors.txt =================================================================== --- src/tests/.expect/declarationErrors.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/declarationErrors.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,66 +1,66 @@ -Error: duplicate static in declaration of x1: static const volatile short int +declarationErrors.c:16 error: duplicate static in declaration of x1: static const volatile short int -Error: conflicting extern & static in declaration of x2: extern const volatile short int +declarationErrors.c:17 error: conflicting extern & static in declaration of x2: extern const volatile short int -Error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int +declarationErrors.c:18 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int -Error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0 +declarationErrors.c:19 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0 with members with body -Error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1 +declarationErrors.c:20 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1 with members with body -Error: duplicate static in declaration of x6: static const volatile instance of type Int +declarationErrors.c:22 error: duplicate static in declaration of x6: static const volatile instance of type Int -Error: duplicate const in declaration of f01: static inline function +declarationErrors.c:24 error: duplicate const in declaration of f01: static inline function with no parameters returning const volatile int -Error: duplicate volatile in declaration of f02: static inline function +declarationErrors.c:25 error: duplicate volatile in declaration of f02: static inline function with no parameters returning const volatile int -Error: duplicate const in declaration of f03: static inline function +declarationErrors.c:26 error: duplicate const in declaration of f03: static inline function with no parameters returning const volatile int -Error: duplicate volatile in declaration of f04: static inline function +declarationErrors.c:27 error: duplicate volatile in declaration of f04: static inline function with no parameters returning const volatile int -Error: duplicate const in declaration of f05: static inline function +declarationErrors.c:28 error: duplicate const in declaration of f05: static inline function with no parameters returning const volatile int -Error: duplicate volatile in declaration of f06: static inline function +declarationErrors.c:29 error: duplicate volatile in declaration of f06: static inline function with no parameters returning const volatile int -Error: duplicate const in declaration of f07: static inline function +declarationErrors.c:30 error: duplicate const in declaration of f07: static inline function with no parameters returning const volatile int -Error: duplicate const, duplicate volatile in declaration of f08: static inline function +declarationErrors.c:31 error: duplicate const, duplicate volatile in declaration of f08: static inline function with no parameters returning const volatile int -Error: duplicate const, duplicate volatile in declaration of f09: static inline function +declarationErrors.c:33 error: duplicate const, duplicate volatile in declaration of f09: static inline function with no parameters returning const volatile int -Error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function +declarationErrors.c:34 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function with no parameters returning const restrict volatile _Atomic int Index: src/tests/.expect/dtor-early-exit-ERR1.txt =================================================================== --- src/tests/.expect/dtor-early-exit-ERR1.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/dtor-early-exit-ERR1.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,3 +1,3 @@ -Error: jump to label 'L1' crosses initialization of y Branch (Goto) +dtor-early-exit.c:142 error: jump to label 'L1' crosses initialization of y Branch (Goto) make: *** [dtor-early-exit-ERR1] Error 1 Index: src/tests/.expect/dtor-early-exit-ERR2.txt =================================================================== --- src/tests/.expect/dtor-early-exit-ERR2.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/dtor-early-exit-ERR2.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,3 +1,3 @@ -Error: jump to label 'L2' crosses initialization of y Branch (Goto) +dtor-early-exit.c:142 error: jump to label 'L2' crosses initialization of y Branch (Goto) make: *** [dtor-early-exit-ERR2] Error 1 Index: src/tests/.expect/memberCtors-ERR1.txt =================================================================== --- src/tests/.expect/memberCtors-ERR1.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/memberCtors-ERR1.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,2 +1,2 @@ -Error: in void ?{}(struct B *b), field a2 used before being constructed +error: in void ?{}(struct B *b), field a2 used before being constructed make: *** [memberCtors-ERR1] Error 1 Index: src/tests/.expect/scopeErrors.txt =================================================================== --- src/tests/.expect/scopeErrors.txt (revision 138e29ecafd7b7c16c01bc5bf07aa51231168aa0) +++ src/tests/.expect/scopeErrors.txt (revision 9bb90a86e8103e3d4b363220e7618cf60fb1ba50) @@ -1,4 +1,4 @@ -Error: duplicate object definition for thisIsAnError: signed int -Error: duplicate function definition for butThisIsAnError: function +scopeErrors.c:2 error: duplicate object definition for thisIsAnError: signed int +scopeErrors.c:20 error: duplicate function definition for butThisIsAnError: function with parameters double