mewin/cxxheaderparser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #29 from robotpy/allow-fn-typedef

Browse Source 
Allow typedefs of function definitions
This commit is contained in:
Dustin Spicuzza 2021-11-26 01:15:01 -05:00 committed by GitHub
commit 88dab86a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 128 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cxxheaderparser/parser.py
View File

@ -1645,6 +1645,7 @@ class CxxParser:
constructor: bool, constructor: bool,
destructor: bool, destructor: bool,
is_friend: bool, is_friend: bool,
is_typedef: bool,
) -> bool: ) -> bool:
""" """
Assumes the caller has already consumed the return type and name, this consumes the Assumes the caller has already consumed the return type and name, this consumes the
@ -1667,7 +1668,7 @@ class CxxParser:
params, vararg = self._parse_parameters() params, vararg = self._parse_parameters()
if is_class_block: if is_class_block and not is_typedef:
props.update(dict.fromkeys(mods.meths.keys(), True)) props.update(dict.fromkeys(mods.meths.keys(), True))
method: Method method: Method
@ -1723,8 +1724,38 @@ class CxxParser:
**props, **props,
) )
self._parse_fn_end(fn) self._parse_fn_end(fn)
self.visitor.on_function(state, fn)
if is_typedef:
if len(pqname.segments) != 1:
raise CxxParseError(
"typedef name may not be a nested-name-specifier"
)
if fn.constexpr:
raise CxxParseError("typedef function may not be constexpr")
if fn.extern:
raise CxxParseError("typedef function may not be extern")
if fn.static:
raise CxxParseError("typedef function may not be static")
if fn.inline:
raise CxxParseError("typedef function may not be inline")
if fn.has_body:
raise CxxParseError("typedef may not be a function definition")
if fn.template:
raise CxxParseError("typedef function may not have a template")
fntype = FunctionType(
fn.return_type,
fn.parameters,
fn.vararg,
fn.has_trailing_return,
noexcept=fn.noexcept,
)
typedef = Typedef(fntype, pqname.segments[0].name, self._current_access)
self.visitor.on_typedef(state, typedef)
return False
else:
self.visitor.on_function(state, fn)
return fn.has_body or fn.has_trailing_return return fn.has_body or fn.has_trailing_return
# #
@ -1988,9 +2019,6 @@ class CxxParser:
# if ( then it's a function/method # if ( then it's a function/method
if self.lex.token_if("("): if self.lex.token_if("("):
if is_typedef:
raise self._parse_error(None)
if not pqname: if not pqname:
raise self._parse_error(None) raise self._parse_error(None)
@ -2005,6 +2033,7 @@ class CxxParser:
constructor, constructor,
destructor, destructor,
is_friend, is_friend,
is_typedef,
) )
# anything else is a field/variable # anything else is a field/variable

6
cxxheaderparser/types.py
View File

@ -236,6 +236,8 @@ class FunctionType:
#: whatever the trailing return type was #: whatever the trailing return type was
has_trailing_return: bool = False has_trailing_return: bool = False
noexcept: typing.Optional[Value] = None
@dataclass @dataclass
class Type: class Type:
@ -550,13 +552,13 @@ class Typedef:
""" """
#: The aliased type #: The aliased type or function type
#: #:
#: .. code-block:: c++ #: .. code-block:: c++
#: #:
#: typedef type *pname; #: typedef type *pname;
#: ~~~~~~ #: ~~~~~~
type: DecoratedType type: typing.Union[DecoratedType, FunctionType]
#: The alias introduced for the specified type #: The alias introduced for the specified type
#: #:

89
tests/test_typedef.py
View File

@ -899,3 +899,92 @@ def test_volatile_typedef():
] ]
) )
) )
def test_function_typedef():
content = """
typedef void fn(int);
typedef auto fntype(int) -> int;
struct X {
typedef void fn(int);
};
"""
data = parse_string(content, cleandoc=True)
assert data == ParsedData(
namespace=NamespaceScope(
classes=[
ClassScope(
class_decl=ClassDecl(
typename=PQName(
segments=[NameSpecifier(name="X")], classkey="struct"
)
),
typedefs=[
Typedef(
type=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[
FundamentalSpecifier(name="int")
]
)
)
)
],
),
name="fn",
access="public",
)
],
)
],
typedefs=[
Typedef(
type=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
)
)
],
),
name="fn",
),
Typedef(
type=FunctionType(
return_type=Type(
typename=PQName(segments=[FundamentalSpecifier(name="int")])
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
)
)
],
has_trailing_return=True,
),
name="fntype",
),
],
)
)