Changeset 4a7d895 for src/tests/.expect/declarationErrors.txt

Timestamp:

Aug 20, 2016, 5:33:07 AM (10 years ago)

Author:

Aaron Moss <bruceiv@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

80722d0

Parents:

7b1bfc5 (diff), 2037f82 (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 plg2.cs.uwaterloo.ca: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 static volatile const short int 
+Error: invalid combination of storage classes in declaration of x9: static volatile const short int 
 
-Error: invalid combination of storage classes in declaration of x18: static static const volatile instance of struct __anonymous0
+Error: invalid combination of storage classes in declaration of x18: static const volatile instance of struct __anonymous0
   with members 
-    i: int 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x19: static static const volatile volatile instance of struct __anonymous1
+Error: invalid combination of storage classes in declaration of x19: static const volatile volatile instance of struct __anonymous1
   with members 
-    i: int 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
+Error: invalid combination of storage classes in declaration of x28: static volatile const instance of type Int
 
 make: *** [declarationErrors] Error 1