Changeset 396ee0a for src/tests/.expect/declarationErrors.txt

Timestamp:

Feb 22, 2017, 2:42:11 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

131dbb3, 692de479

Parents:

0788b739 (diff), fc39193 (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

File:

• src/tests/.expect/declarationErrors.txt (modified) (1 diff)

src/tests/.expect/declarationErrors.txt

@@ -1 @@
-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