[pypy-commit] creflect default: Fix 005d

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r38:bd7d04b35494
Date: 2014-09-15 19:50 +0200
http://bitbucket.org/cffi/creflect/changeset/bd7d04b35494/

Log:	Fix 005d

diff --git a/creflect/codegen.py b/creflect/codegen.py
--- a/creflect/codegen.py
+++ b/creflect/codegen.py
@@ -33,10 +33,10 @@
         if extra:
             assert extralength is not None, "specify 'extralength' explicitly"
             if self.sprintfright_extra[0]:
-                extra = ', ' + extra
-            extra = self.sprintfright_extra[0] + extra
-            extralength = self.sprintfright_extra[1] + extralength
-            self.sprintfright_extra = (extra, extralength)
+                extra += ', '
+            self.sprintfright_extra = (
+                extra + self.sprintfright_extra[0],
+                extralength + self.sprintfright_extra[1])
 
     def sprintf_add_both_sides(self, marker):
         i = marker.index('&')
diff --git a/creflect/model.py b/creflect/model.py
--- a/creflect/model.py
+++ b/creflect/model.py
@@ -192,13 +192,13 @@
             block.writeline("    r1 = -1;")
             block.writeline("    goto %s;" % block.get_skip_label())
             block.writeline("}")
-            block.sprintf_add_right('[%lld]',
-                extra='(long long)(sizeof(%s) / sizeof(*%s))' % (
-                    star_p1, star_p1),
-                extralength=20)
         inspect.levels.append('[]')
         inspect.after_star_p1_assignment.append(after)
         self.item.inspect_type(block, inspect)
+        block.sprintf_add_right('[%lld]',
+            extra='(long long)(sizeof(%s) / sizeof(*%s))' % (
+                star_p1, star_p1),
+            extralength=20)
 
 
 class StructOrUnionOrEnum(BaseTypeByIdentity):