Changeset 32a2a99 for src/tests/.expect

Timestamp:

Aug 30, 2016, 4:25:55 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

90e2334, fa463f1

Parents:

a2a8d2a6 (diff), ced2e989 (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/tests/.expect/declarationErrors.txt (modified) (1 diff)

src/tests/.expect/declarationErrors.txt

@@ -1 +1 @@
 CFA Version 1.0.0 (debug)
-Error: invalid combination of storage classes in declaration of x9: static volatile const short int 
+Error: invalid combination of storage classes in declaration of x9: static const volatile short int 
 
-Error: invalid combination of storage classes in declaration of x18: static const volatile instance of struct __anonymous0
+Error: invalid combination of storage classes in declaration of x18: static const volatile instance of const volatile struct __anonymous0
   with members 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x19: static const volatile volatile instance of struct __anonymous1
+Error: duplicate qualifier volatile in declaration of x19: static const volatile instance of const volatile struct __anonymous1
   with members 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x28: static volatile const instance of type Int
+Error: invalid combination of storage classes in declaration of x28: static const volatile instance of type Int
+
+Error: duplicate qualifier const in declaration of f01: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier volatile in declaration of f02: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const in declaration of f03: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier volatile in declaration of f04: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const in declaration of f05: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier volatile in declaration of f06: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const in declaration of f07: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const, volatile in declaration of f08: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const, volatile in declaration of f09: static inline function
+  with no parameters 
+  returning const volatile int 
+
+
+Error: duplicate qualifier const, volatile in declaration of f09: static inline function
+  with no parameters 
+  returning const volatile int 
+
 
 make: *** [declarationErrors] Error 1