Changeset f1ee72e for src/tests/Constant0-1.c

Timestamp:

Jun 23, 2016, 12:23:00 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, 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:

4d3ca1d8

Parents:

c2931ea (diff), d56c05d0 (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

File:

• src/tests/Constant0-1.c (modified) (4 diffs)

src/tests/Constant0-1.c

@@ -1 @@
-//Constant test declaration
-// Cforall extension
+// Constant test declaration
 
 // value
@@ -6 +5 @@
 int 0;
 const int 0;
-static const int 0;
 int 1;
 const int 1;
-static const int 1;
-int 0, 1;
-const int 0, 1;
+struct { int i; } 0;
+const struct { int i; } 1;
+
+#ifdef DUPS
+
+int 0;
+const int 0;
+int 1;
+const int 1;
 int (0), (1);
 int ((0)), ((1));
-static const int 0, 1;
+const int 0, 1;
+const int (0), (1);
 struct { int i; } 0;
 const struct { int i; } 1;
-static const struct { int i; } 1;
+
+#endif // DUPS
+
+#ifndef NEWDECL
 
 // pointer
+
+int *0, *1;
+int * const (0), * const 1;
+struct { int i; } *0;
+const struct { int i; } *0;
+int (*(* const x)), **0;
+
+#ifdef DUPS
 
 int *0, *1;
@@ -28 +44 @@
 int (* const 0), (* const 1);
 int ((* const 0)), ((* const 1));
+int (*(* const x)), *(*0);
+int (*(* const x)), (*(*0));
 struct { int i; } *0;
+const struct { int i; } *0;
+int (*(* const x)), **0;
+
+#endif // DUPS
+
+#else
 
 // Cforall style
@@ -34 +58 @@
 * int x, 0;
 const * int x, 0;
-static const * int x, 0;
 * struct { int i; } 0;
 const * struct { int i; } 0;
-static const * struct { int i; } 0;
-static * int x, 0;
-static const * int x, 0;
 const * * int x, 0;
 
+#ifdef DUPS
+
+* int x, 0;
+const * int x, 0;
+
+#endif // DUPS
+
+#endif // NEWDECL
+
 int main() {
+#ifndef NEWDECL
     int 1, * 0;
+#else
     * int x, 0;
+#endif // NEWDECL
 }