[pypy-commit] creflect default: Move the size, align comment before the '{'

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r46:d6f83b05a000
Date: 2014-09-16 15:37 +0200
http://bitbucket.org/cffi/creflect/changeset/d6f83b05a000/

Log:	Move the size,align comment before the '{'

diff --git a/creflect/model.py b/creflect/model.py
--- a/creflect/model.py
+++ b/creflect/model.py
@@ -371,11 +371,11 @@
         if include_alignment:
             extra2 = ("(long long)(((char *)&((struct{char a; %s b;} *)0)->b)"
                     " - (char *)0)" % (realtp,))          # alignment
-            funcblock.sprintf(tp + r" {/*%lld,%lld*/\n",
+            funcblock.sprintf(tp + r" /*%lld,%lld*/{\n",
                               extra="%s, %s" % (extra1, extra2),
                               extralength=40)
         else:
-            funcblock.sprintf(tp + r" {/*%lld*/\n",
+            funcblock.sprintf(tp + r" /*%lld*/{\n",
                               extra=extra1,
                               extralength=20)
         #
diff --git a/test/codegen/struct-001.c b/test/codegen/struct-001.c
--- a/test/codegen/struct-001.c
+++ b/test/codegen/struct-001.c
@@ -9,7 +9,7 @@
 {
     if (!r)
         return 69 + 30 + 18 + 6 + 30 + 18 + 6 + 4;
-    r += sprintf(r, "struct foo_s {/*%lld,%lld*/\n", (long long)sizeof(struct foo_s), (long long)(((char *)&((struct{char a; struct foo_s b;} *)0)->b) - (char *)0));
+    r += sprintf(r, "struct foo_s /*%lld,%lld*/{\n", (long long)sizeof(struct foo_s), (long long)(((char *)&((struct{char a; struct foo_s b;} *)0)->b) - (char *)0));
     {
         struct foo_s *p1;
         long long o = ((char *)&((struct foo_s *)0)->aa) - (char *)0;  /* check that 'struct foo_s::aa' is not an array */
diff --git a/test/codegen/struct-005.c b/test/codegen/struct-005.c
--- a/test/codegen/struct-005.c
+++ b/test/codegen/struct-005.c
@@ -6,7 +6,7 @@
 {
     if (!r)
         return 70 + 30 + 18 + 6 + 4 + 30;
-    r += sprintf(r, "struct $foo_t {/*%lld,%lld*/\n", (long long)sizeof(foo_t), (long long)(((char *)&((struct{char a; foo_t b;} *)0)->b) - (char *)0));
+    r += sprintf(r, "struct $foo_t /*%lld,%lld*/{\n", (long long)sizeof(foo_t), (long long)(((char *)&((struct{char a; foo_t b;} *)0)->b) - (char *)0));
     {
         foo_t *p1;
         long long o = ((char *)&((foo_t *)0)->aa) - (char *)0;  /* check that 'foo_t::aa' is not an array */
diff --git a/test/codegen/struct-005b.c b/test/codegen/struct-005b.c
--- a/test/codegen/struct-005b.c
+++ b/test/codegen/struct-005b.c
@@ -6,7 +6,7 @@
 {
     if (!r)
         return 46 + 30 + 18 + 6 + 4 + 32;
-    r += sprintf(r, "struct $$foo_p {/*%lld*/\n", (long long)sizeof(*(foo_p)0));
+    r += sprintf(r, "struct $$foo_p /*%lld*/{\n", (long long)sizeof(*(foo_p)0));
     {
         foo_p p1;
         long long o = ((char *)&((foo_p)0)->aa) - (char *)0;  /* check that '*foo_p::aa' is not an array */