[pypy-commit] cffi default: Finish the fix for issue #91.
arigo
noreply at buildbot.pypy.org
Wed Jun 19 10:29:55 CEST 2013
Author: Armin Rigo <arigo at tunes.org>
Branch:
Changeset: r1275:1d4ca4f4914a
Date: 2013-06-19 10:29 +0200
http://bitbucket.org/cffi/cffi/changeset/1d4ca4f4914a/
Log: Finish the fix for issue #91.
diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -4459,13 +4459,12 @@
Py_CLEAR(dict2);
Py_CLEAR(dict1);
- name_size = strlen("enum ") + strlen(ename) + 1;
+ name_size = strlen(ename) + 1;
td = ctypedescr_new(name_size);
if (td == NULL)
goto error;
- memcpy(td->ct_name, "enum ", strlen("enum "));
- memcpy(td->ct_name + strlen("enum "), ename, name_size - strlen("enum "));
+ memcpy(td->ct_name, ename, name_size);
td->ct_stuff = combined;
td->ct_size = basetd->ct_size;
td->ct_length = basetd->ct_length; /* alignment */
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -1288,26 +1288,27 @@
def test_enum_type():
BUInt = new_primitive_type("unsigned int")
BEnum = new_enum_type("foo", (), (), BUInt)
- assert repr(BEnum) == "<ctype 'enum foo'>"
+ assert repr(BEnum) == "<ctype 'foo'>"
assert BEnum.kind == "enum"
- assert BEnum.cname == "enum foo"
+ assert BEnum.cname == "foo"
assert BEnum.elements == {}
#
BInt = new_primitive_type("int")
- BEnum = new_enum_type("foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
+ BEnum = new_enum_type("enum foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
assert BEnum.kind == "enum"
+ assert BEnum.cname == "enum foo"
assert BEnum.elements == {-20: 'ab', 0: 'def', 1: 'c'}
# 'elements' is not the real dict, but merely a copy
BEnum.elements[2] = '??'
assert BEnum.elements == {-20: 'ab', 0: 'def', 1: 'c'}
#
- BEnum = new_enum_type("bar", ('ab', 'cd'), (5, 5), BUInt)
+ BEnum = new_enum_type("enum bar", ('ab', 'cd'), (5, 5), BUInt)
assert BEnum.elements == {5: 'ab'}
assert BEnum.relements == {'ab': 5, 'cd': 5}
def test_cast_to_enum():
BInt = new_primitive_type("int")
- BEnum = new_enum_type("foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
+ BEnum = new_enum_type("enum foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
assert sizeof(BEnum) == sizeof(BInt)
e = cast(BEnum, 0)
assert repr(e) == "<cdata 'enum foo' 0: def>"
@@ -1321,26 +1322,26 @@
assert string(cast(BEnum, -242 + 2**128)) == '-242'
#
BUInt = new_primitive_type("unsigned int")
- BEnum = new_enum_type("bar", ('def', 'c', 'ab'), (0, 1, 20), BUInt)
+ BEnum = new_enum_type("enum bar", ('def', 'c', 'ab'), (0, 1, 20), BUInt)
e = cast(BEnum, -1)
assert repr(e) == "<cdata 'enum bar' 4294967295>" # unsigned int
#
BLong = new_primitive_type("long")
- BEnum = new_enum_type("baz", (), (), BLong)
+ BEnum = new_enum_type("enum baz", (), (), BLong)
assert sizeof(BEnum) == sizeof(BLong)
e = cast(BEnum, -1)
assert repr(e) == "<cdata 'enum baz' -1>"
def test_enum_with_non_injective_mapping():
BInt = new_primitive_type("int")
- BEnum = new_enum_type("foo", ('ab', 'cd'), (7, 7), BInt)
+ BEnum = new_enum_type("enum foo", ('ab', 'cd'), (7, 7), BInt)
e = cast(BEnum, 7)
assert repr(e) == "<cdata 'enum foo' 7: ab>"
assert string(e) == 'ab'
def test_enum_in_struct():
BInt = new_primitive_type("int")
- BEnum = new_enum_type("foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
+ BEnum = new_enum_type("enum foo", ('def', 'c', 'ab'), (0, 1, -20), BInt)
BStruct = new_struct_type("struct bar")
BStructPtr = new_pointer_type(BStruct)
complete_struct_or_union(BStruct, [('a1', BEnum, -1)])
diff --git a/cffi/backend_ctypes.py b/cffi/backend_ctypes.py
--- a/cffi/backend_ctypes.py
+++ b/cffi/backend_ctypes.py
@@ -934,7 +934,7 @@
#
class CTypesEnum(CTypesInt):
__slots__ = []
- _reftypename = 'enum %s &' % name
+ _reftypename = '%s &' % name
def _get_own_repr(self):
value = self._value
diff --git a/cffi/model.py b/cffi/model.py
--- a/cffi/model.py
+++ b/cffi/model.py
@@ -244,6 +244,10 @@
self.forcename = forcename
self.build_c_name_with_marker()
+ def get_official_name(self):
+ assert self.c_name_with_marker.endswith('&')
+ return self.c_name_with_marker[:-1]
+
class StructOrUnion(StructOrUnionOrEnum):
fixedlayout = None
@@ -357,8 +361,9 @@
def build_backend_type(self, ffi, finishlist):
self.check_not_partial()
finishlist.append(self)
+
return global_cache(self, ffi, 'new_struct_type',
- 'struct ' + self.name, key=self)
+ self.get_official_name(), key=self)
class UnionType(StructOrUnion):
@@ -367,7 +372,7 @@
def build_backend_type(self, ffi, finishlist):
finishlist.append(self)
return global_cache(self, ffi, 'new_union_type',
- 'union ' + self.name, key=self)
+ self.get_official_name(), key=self)
class EnumType(StructOrUnionOrEnum):
@@ -390,7 +395,8 @@
def build_backend_type(self, ffi, finishlist):
self.check_not_partial()
base_btype = self.build_baseinttype(ffi, finishlist)
- return global_cache(self, ffi, 'new_enum_type', self.name,
+ return global_cache(self, ffi, 'new_enum_type',
+ self.get_official_name(),
self.enumerators, self.enumvalues,
base_btype, key=self)
diff --git a/testing/backend_tests.py b/testing/backend_tests.py
--- a/testing/backend_tests.py
+++ b/testing/backend_tests.py
@@ -989,7 +989,7 @@
assert f.a == 12345
assert b.b == b"B"
assert b.c == b"C"
- assert repr(b).startswith("<cdata 'struct $bar_t *'")
+ assert repr(b).startswith("<cdata 'bar_t *'")
def test_struct_with_two_usages(self):
for name in ['foo_s', '']: # anonymous or not
@@ -1299,9 +1299,9 @@
ffi = FFI(backend=self.Backend())
ffi.cdef("typedef enum { Value0 = 0 } e, *pe;\n"
"typedef enum { Value1 = 1 } e1;")
- assert ffi.getctype("e*") == 'enum $e *'
- assert ffi.getctype("pe") == 'enum $e *'
- assert ffi.getctype("e1*") == 'enum $e1 *'
+ assert ffi.getctype("e*") == 'e *'
+ assert ffi.getctype("pe") == 'e *'
+ assert ffi.getctype("e1*") == 'e1 *'
def test_new_ctype(self):
ffi = FFI(backend=self.Backend())
diff --git a/testing/test_ffi_backend.py b/testing/test_ffi_backend.py
--- a/testing/test_ffi_backend.py
+++ b/testing/test_ffi_backend.py
@@ -178,3 +178,9 @@
'ffi.cdef("struct s2 { char x:0; };"); ffi.new("struct s2 *")')
py.test.raises(TypeError,
'ffi.cdef("struct s3 { char x:9; };"); ffi.new("struct s3 *")')
+
+ def test_struct_with_typedef(self):
+ ffi = FFI()
+ ffi.cdef("typedef struct { float x; } foo_t;")
+ p = ffi.new("foo_t *", [5.2])
+ assert repr(p).startswith("<cdata 'foo_t *' ")
diff --git a/testing/test_verify.py b/testing/test_verify.py
--- a/testing/test_verify.py
+++ b/testing/test_verify.py
@@ -1441,7 +1441,7 @@
"foo_t myfunc(void) { foo_t x = { 42 }; return x; }")
assert str(e.value) in [
"function myfunc: 'foo_t' is used as result type, but is opaque",
- "function myfunc: result type 'struct $foo_t' is opaque"]
+ "function myfunc: result type 'foo_t' is opaque"]
def test_include():
ffi1 = FFI()
More information about the pypy-commit
mailing list