Changeset 049ead9

Timestamp:

Nov 8, 2017, 4:38:49 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7543dec

Parents:

4ee36bf0

Message:

Restore multiDimension test

File:

• src/tests/multiDimension.c (modified) (1 diff)

src/tests/multiDimension.c

@@ -32 +32 @@
 }
 
-// X global[10][10] = {
-//   { 1, { 2 }, { 3 }, { 4 }, 5, 6, 7, 8, 9, 10, 11, 12 },
-//   { 1, 2, 3, 4 },
-//   { { 1234567 } }
-// };
+X global[10][10] = {
+  { 1, { 2 }, { 3 }, { 4 }, 5, 6, 7, 8, 9, 10, 11, 12 },
+  { 1, 2, 3, 4 },
+  { { 1234567 } }
+};
 
-// X global2[3][3][3] = {
-//   {
-//     { 1, 2, 3 },
-//     { 4, 5, 6 },
-//     { 7, 8, 9 },
-//     { 10, 11, 12 }
-//   },
-//   {
-//     { 0, 0, 0 }
-//   }
-// };
+X global2[3][3][3] = {
+  {
+    { 1, 2, 3 },
+    { 4, 5, 6 },
+    { 7, 8, 9 },
+    { 10, 11, 12 }
+  },
+  {
+    { 0, 0, 0 }
+  }
+};
 
-// int foo() {
-//   static X abc[3][3] = {
-//     { 11, 22, 33, 44 },
-//     { 55, 66 },
-//     { 77 },
-//     { 88, 99, 1010 }
-//   };
-// }
+int foo() {
+  static X abc[3][3] = {
+    { 11, 22, 33, 44 },
+    { 55, 66 },
+    { 77 },
+    { 88, 99, 1010 }
+  };
+}
 
 // ensure constructed const arrays continue to compile
-// const int global[1] = { -2 };
+const int global[1] = { -2 };
 
 int main() {
-  X a;
-  X abc[2];
-  // X abc[4]/*[4]*/ = {
-  //   /*{*/ 999, 1111 /*}*/,
-  //   // { 1, 2, 3, 4, 5 },
-  //   // {},
-  //   // { 0 },
-  //   // { 88 }
-  // };
+  X abc[4][4] = {
+    { 999, 1111 },
+    { 1, 2, 3, 4, 5 },
+    {},
+    { 0 },
+    { 88 }
+  };
 
-  // foo();
-  // foo();
+  foo();
+  foo();
 }