Changeset 4819cac for src/tests

Timestamp:

Aug 4, 2016, 4:11:11 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, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4e2a1137

Parents:

f9cebb5 (diff), cf37a8e (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/tests/switch.c (modified) (2 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 : Sat Jul 30 14:41:32 2016
-// Update Count     : 30
+// Last Modified On : Thu Aug  4 11:44:29 2016
+// Update Count     : 31
 // 
 
@@ -39 +39 @@
           case 4:
                 j = 0;
+        }
+
+        switch ( i ) {
+          case 1, 2, 3:
+                switch ( i ) {
+                  case 2, 3, 4:
+                        7;
+                }
         }