Changeset e7b2559 for src/tests

Timestamp:

Aug 2, 2016, 9:30:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

155cce0f

Parents:

e21c72d (diff), 79f64f1 (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

Conflicts:

src/tests/test.py

File:

• src/tests/switch.c (modified) (4 diffs)

src/tests/switch.c

@@ -10 +10 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:02:23 2016
-// Update Count     : 22
+// Last Modified On : Sat Jul 30 14:41:32 2016
+// Update Count     : 30
 // 
 
@@ -33 +33 @@
         } // switch
 
-        // switch (3 ) {
-        //      int j;
-        //   case 3:
-        //      break;
-        //   case 4:
-        //      j = 0;
-        // }
+        switch ( 3 ) {
+                int j;
+          case 3:
+                break;
+          case 4:
+                j = 0;
+        }
 
         switch ( i ) {
@@ -49 +49 @@
           default:
                 i = 3;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4:
+          case 1 ... 6:
+          case 20, 30:
                 j = 3;
                 f( 3 );
@@ -78 +78 @@
                 struct S { int i; };
                 S s;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4, 7:
+          case 0 ... 6:
+          case 20, 30, 40:
                 i = 3;
                 f( 3 );