Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: rffi-parser-2
Changeset: r89608:edc637d97ac6
Date: 2017-01-16 14:56 +0000
http://bitbucket.org/pypy/pypy/changeset/edc637d97ac6/
Log: Rename ParsedSource to CTypeSpace
diff --git a/pypy/module/cpyext/cparser.py b/pypy/module/cpyext/cparser.py
--- a/pypy/module/cpyext/cparser.py
+++ b/pypy/module/cpyext/cparser.py
@@ -684,9 +684,8 @@
return "<struct {struct_name}>".format(**vars(self))
-class ParsedSource(object):
+class CTypeSpace(object):
def __init__(self, source, parser, definitions=None, macros=None,
headers=None):
- from pypy.module.cpyext.api import configure_eci
self.source = source
self.definitions = definitions if definitions is not None else {}
self.macros = macros if macros is not None else {}
@@ -823,7 +822,7 @@
def parse_source(source, includes=None, headers=None, configure_now=True):
ctx = Parser()
- src = ParsedSource(source, ctx, headers=headers)
+ src = CTypeSpace(source, ctx, headers=headers)
if includes is not None:
for header in includes:
src.include(header)
diff --git a/pypy/module/cpyext/test/test_cparser.py
b/pypy/module/cpyext/test/test_cparser.py
--- a/pypy/module/cpyext/test/test_cparser.py
+++ b/pypy/module/cpyext/test/test_cparser.py
@@ -11,8 +11,8 @@
double ob_fval;
} TestFloatObject;
"""
- res = parse_source(decl)
- TestFloatObject = res.definitions['TestFloatObject']
+ cts = parse_source(decl)
+ TestFloatObject = cts.definitions['TestFloatObject']
assert isinstance(TestFloatObject, lltype.Struct)
assert TestFloatObject.c_ob_refcnt == rffi.SSIZE_T
assert TestFloatObject.c_ob_pypy_link == rffi.SSIZE_T
@@ -20,8 +20,8 @@
def test_simple():
decl = "typedef ssize_t Py_ssize_t;"
- hdr = parse_source(decl)
- assert hdr.definitions == {'Py_ssize_t': rffi.SSIZE_T}
+ cts = parse_source(decl)
+ assert cts.definitions == {'Py_ssize_t': rffi.SSIZE_T}
def test_macro():
decl = """
@@ -36,9 +36,9 @@
double ob_fval;
} PyFloatObject;
"""
- hdr = parse_source(decl)
- assert 'PyFloatObject' in hdr.definitions
- assert 'PyObject_HEAD' in hdr.macros
+ cts = parse_source(decl)
+ assert 'PyFloatObject' in cts.definitions
+ assert 'PyObject_HEAD' in cts.macros
def test_include():
cdef1 = """
@@ -59,12 +59,12 @@
Type *type;
} Object;
"""
- hdr1 = parse_source(cdef1)
- Type = hdr1.definitions['Type']
+ cts1 = parse_source(cdef1)
+ Type = cts1.definitions['Type']
assert isinstance(Type, lltype.Struct)
- hdr2 = parse_source(cdef2, includes=[hdr1])
- assert 'Type' not in hdr2.definitions
- Object = hdr2.definitions['Object']
+ cts2 = parse_source(cdef2, includes=[cts1])
+ assert 'Type' not in cts2.definitions
+ Object = cts2.definitions['Object']
assert Object.c_type.TO is Type
def test_incomplete():
@@ -83,8 +83,8 @@
} Buffer;
"""
- foo_h = parse_source(cdef)
- Object = foo_h.gettype('Object')
+ cts = parse_source(cdef)
+ Object = cts.gettype('Object')
assert isinstance(Object, lltype.Struct)
def test_recursive():
@@ -106,8 +106,8 @@
Object *obj;
} Type;
"""
- foo_h = parse_source(cdef)
- Object = foo_h.definitions['Object']
+ cts = parse_source(cdef)
+ Object = cts.definitions['Object']
assert isinstance(Object, lltype.Struct)
hash(Object)
@@ -117,8 +117,8 @@
const char * const foo;
} bar;
"""
- hdr = parse_source(cdef)
- assert hdr.definitions['bar'].c_foo == rffi.CONST_CCHARP != rffi.CCHARP
+ cts = parse_source(cdef)
+ assert cts.definitions['bar'].c_foo == rffi.CONST_CCHARP != rffi.CCHARP
def test_gettype():
decl = """
@@ -133,9 +133,9 @@
double ob_fval;
} TestFloatObject;
"""
- res = parse_source(decl)
- assert res.gettype('Py_ssize_t') == rffi.SSIZE_T
- assert res.gettype('TestFloatObject *').TO.c_ob_refcnt == rffi.SSIZE_T
+ cts = parse_source(decl)
+ assert cts.gettype('Py_ssize_t') == rffi.SSIZE_T
+ assert cts.gettype('TestFloatObject *').TO.c_ob_refcnt == rffi.SSIZE_T
def test_parse_funcdecl():
decl = """
@@ -152,8 +152,8 @@
typedef TestFloatObject* (*func_t)(int, int);
"""
- res = parse_source(decl)
- name, FUNC = res.parse_func("func_t some_func(TestFloatObject*)")
+ cts = parse_source(decl)
+ name, FUNC = cts.parse_func("func_t some_func(TestFloatObject*)")
assert name == 'some_func'
- assert FUNC.RESULT == res.gettype('func_t')
- assert FUNC.ARGS == (res.gettype('TestFloatObject *'),)
+ assert FUNC.RESULT == cts.gettype('func_t')
+ assert FUNC.ARGS == (cts.gettype('TestFloatObject *'),)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
