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

Compare commits

base: mewin:main
Branches Tags
mewin:main
mewin:1.3.0-4
mewin:1.3.0-3
mewin:1.3.0-2
mewin:1.3.0-1
mewin:1.3.0
mewin:1.2.2
mewin:1.2.1
mewin:1.2.0
mewin:1.1.0
mewin:1.0.0
mewin:0.0.0
..
compare: mewin:1.3.0
Branches Tags
mewin:main
mewin:1.3.0-4
mewin:1.3.0-3
mewin:1.3.0-2
mewin:1.3.0-1
mewin:1.3.0
mewin:1.2.2
mewin:1.2.1
mewin:1.2.0
mewin:1.1.0
mewin:1.0.0
mewin:0.0.0

No commits in common. "main" and "1.3.0" have entirely different histories.
main ... 1.3.0

5 changed files with 26 additions and 400 deletions
Show Stats Expand all files Collapse all files

2
cxxheaderparser/lexer.py
View File

@ -86,8 +86,6 @@ class PlyLexer:
"concept",
"const",
"constexpr",
"consteval",
"constinit",
"const_cast",
"continue",
"decltype",

54
cxxheaderparser/parser.py
View File

@ -43,7 +43,6 @@ from .types import (
Parameter,
PQName,
Pointer,
PointerToMember,
Reference,
TemplateArgument,
TemplateDecl,
@ -1599,7 +1598,6 @@ class CxxParser:
fn_ok: bool = False,
compound_ok: bool = False,
fund_ok: bool = False,
ptr_to_member_ok: bool = False,
) -> typing.Tuple[PQName, typing.Optional[str]]:
"""
Parses a possibly qualified function name or a type name, returns when
@ -1727,12 +1725,7 @@ class CxxParser:
if not self.lex.token_if("DBL_COLON"):
break
tok = self._next_token_must_be("NAME", "operator", "template", "decltype", "*")
if tok.value == '*':
if not ptr_to_member_ok:
raise self._parse_error(tok)
return name, 'PTR_TO_MEMBER'
tok = self._next_token_must_be("NAME", "operator", "template", "decltype")
pqname = PQName(segments, classkey, has_typename)
@ -1799,31 +1792,10 @@ class CxxParser:
toks = self._consume_balanced_tokens(tok)
self.lex.return_tokens(toks[1:-1])
# optional name
tok = self.lex.token_if("NAME", "final", "DBL_COLON")
tok = self.lex.token_if("NAME", "final")
if tok:
pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
while op == 'PTR_TO_MEMBER':
dtype = PointerToMember(base_type=Type(typename=pqname), ptr_to=dtype, const=dtype.const, volatile=dtype.volatile)
# dtype = self._parse_cv_ptr(dtype)
tok = self.lex.token_if("NAME", "final", "DBL_COLON")
if tok:
pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
else:
pqname = None
op = None
if pqname:
if len(pqname.segments) != 1:
raise self._parse_error(None)
param_name = pqname.segments[0].name
if self.lex.token_if("("):
if isinstance(dtype, PointerToMember):
params, vararg, at_params = self._parse_parameters(False)
dtype.ptr_to = FunctionType(return_type=dtype.ptr_to, parameters=params, vararg=vararg)
else:
assert(False) # TODO
param_name = tok.value
# optional array parameter
tok = self.lex.token_if("[")
@ -2148,8 +2120,6 @@ class CxxParser:
if fn.constexpr:
raise CxxParseError("typedef function may not be constexpr")
if fn.consteval:
raise CxxParseError("typedef function may not be consteval")
if fn.extern:
raise CxxParseError("typedef function may not be extern")
if fn.static:
@ -2320,7 +2290,7 @@ class CxxParser:
return dtype
# Applies to variables and return values
_type_kwd_both = {"const", "consteval", "constexpr", "constinit", "extern", "inline", "static"}
_type_kwd_both = {"const", "constexpr", "extern", "inline", "static"}
# Only found on methods
_type_kwd_meth = {"explicit", "virtual"}
@ -2507,17 +2477,7 @@ class CxxParser:
tok = self.lex.token_if_in_set(self._pqname_start_tokens)
if tok:
pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
while op == 'PTR_TO_MEMBER':
dtype = PointerToMember(base_type=Type(typename=pqname), ptr_to=dtype, const=dtype.const, volatile=dtype.volatile)
# dtype = self._parse_cv_ptr(dtype)
tok = self.lex.token_if_in_set(self._pqname_start_tokens)
if tok:
pqname, op = self._parse_pqname(tok, fn_ok=True, ptr_to_member_ok=True)
else:
pqname = None
op = None
pqname, op = self._parse_pqname(tok, fn_ok=True)
# TODO: "type fn(x);" is ambiguous here. Because this is a header
# parser, we assume it's a function, not a variable declaration
@ -2528,10 +2488,6 @@ class CxxParser:
if not pqname:
raise self._parse_error(None)
if isinstance(dtype, PointerToMember):
params, vararg, at_params = self._parse_parameters(False)
dtype.ptr_to = FunctionType(return_type=dtype.ptr_to, parameters=params, vararg=vararg)
else:
return self._parse_function(
mods,
dtype,

46
cxxheaderparser/types.py
View File

@ -306,7 +306,7 @@ class Array:
"""
#: The type that this is an array of
array_of: typing.Union["Array", "Pointer", "PointerToMember", Type]
array_of: typing.Union["Array", "Pointer", Type]
#: Size of the array
#:
@ -332,7 +332,7 @@ class Pointer:
"""
#: Thing that this points to
ptr_to: typing.Union[Array, FunctionType, "Pointer", "PointerToMember", Type]
ptr_to: typing.Union[Array, FunctionType, "Pointer", Type]
const: bool = False
volatile: bool = False
@ -356,39 +356,6 @@ class Pointer:
else:
return f"{ptr_to.format()}*{c}{v} {name}"
@dataclass
class PointerToMember:
"""
Pointer to a class member. (``Class::* int``)
"""
#: Thing that this points to
base_type: Type
ptr_to: typing.Union[Array, FunctionType, "Pointer", "PointerToMember", Type]
const: bool = False
volatile: bool = False
def format(self) -> str:
c = " const" if self.const else ""
v = " volatile" if self.volatile else ""
ptr_to = self.ptr_to
if isinstance(ptr_to, (Array, FunctionType)):
return ptr_to.format_decl(f"({self.base_type.format()}::*{c}{v})")
else:
return f"{ptr_to.format()} {self.base_type.format()}::*{c}{v}"
def format_decl(self, name: str):
"""Format as a named declaration"""
c = " const" if self.const else ""
v = " volatile" if self.volatile else ""
ptr_to = self.ptr_to
if isinstance(ptr_to, (Array, FunctionType)):
return ptr_to.format_decl(f"({self.base_type.format()}::*{c}{v} {name})")
else:
return f"{ptr_to.format()} {self.base_type.format()}::*{c}{v} {name}"
@dataclass
class Reference:
@ -396,7 +363,7 @@ class Reference:
A lvalue (``&``) reference
"""
ref_to: typing.Union[Array, FunctionType, Pointer, PointerToMember, Type]
ref_to: typing.Union[Array, FunctionType, Pointer, Type]
def format(self) -> str:
ref_to = self.ref_to
@ -421,7 +388,7 @@ class MoveReference:
An rvalue (``&&``) reference
"""
moveref_to: typing.Union[Array, FunctionType, Pointer, PointerToMember, Type]
moveref_to: typing.Union[Array, FunctionType, Pointer, Type]
def format(self) -> str:
return f"{self.moveref_to.format()}&&"
@ -435,7 +402,7 @@ class MoveReference:
#:
#: .. note:: There can only be one of FunctionType or Type in a DecoratedType
#: chain
DecoratedType = typing.Union[Array, Pointer, PointerToMember, MoveReference, Reference, Type]
DecoratedType = typing.Union[Array, Pointer, MoveReference, Reference, Type]
@dataclass
@ -721,7 +688,6 @@ class Function:
doxygen: typing.Optional[str] = None
constexpr: bool = False
consteval: bool = False
extern: typing.Union[bool, str] = False
static: bool = False
inline: bool = False
@ -858,7 +824,6 @@ class Variable:
value: typing.Optional[Value] = None
constexpr: bool = False
constinit: bool = False
extern: typing.Union[bool, str] = False
static: bool = False
inline: bool = False
@ -885,7 +850,6 @@ class Field:
bits: typing.Optional[int] = None
constexpr: bool = False
constinit: bool = False
mutable: bool = False
static: bool = False
inline: bool = False

104
tests/test_constinit_consteval.py
View File

@ -1,104 +0,0 @@
def test_constinit_consteval() -> None:
content = """
struct S
{
static constinit int i = 5;
static consteval int func(int i) { return i*i; }
};
template<std::size_t numBits>
consteval auto getUintType()
{
if constexpr (numBits == 8) {
return std::uint8_t{};
}
else if constexpr (numBits == 16) {
return std::uint16_t{};
}
else if constexpr (numBits == 32) {
return std::uint32_t{};
}
else if constexpr (numBits == 64) {
return std::uint64_t{};
}
}
"""
data = parse_string(content, cleandoc=True)
assert data == ParsedData(
namespace=NamespaceScope(
classes=[
ClassScope(
class_decl=ClassDecl(
typename=PQName(
segments=[NameSpecifier(name="S")], classkey="struct"
)
),
fields=[
Field(
access="public",
type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
),
name="i",
value=Value(tokens=[Token(value="5")]),
constinit=True,
static=True,
)
],
methods=[
Method(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
),
name=PQName(segments=[NameSpecifier(name="func")]),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
),
name="i",
)
],
consteval=True,
static=True,
has_body=True,
access="public",
)
],
)
],
functions=[
Function(
return_type=Type(typename=PQName(segments=[AutoSpecifier()])),
name=PQName(segments=[NameSpecifier(name="getUintType")]),
parameters=[],
consteval=True,
has_body=True,
template=TemplateDecl(
params=[
TemplateNonTypeParam(
type=Type(
typename=PQName(
segments=[
NameSpecifier(name="std"),
NameSpecifier(name="size_t"),
]
)
),
name="numBits",
)
]
),
)
],
)
)

188
tests/test_pointer_to_member.py
View File

@ -1,188 +0,0 @@
def test_pointer_to_member() -> None:
content = """
class Class
{
};
int Class::* intPtr;
int (Class::* intReturnFuncPtr)();
void (Class::* intParamFuncPtr)(int);
void (Class::* varargFuncPtr)(...);
template<typename... TArgs>
int takesFunc(void (*func)(TArgs...));
template<typename TObject, typename... TArgs>
int takesMemberFunc(TObject& object, void (TObject::* func)(TArgs...));
"""
data = parse_string(content, cleandoc=True)
assert data == ParsedData(
namespace=NamespaceScope(
classes=[
ClassScope(
class_decl=ClassDecl(
typename=PQName(
segments=[NameSpecifier(name="Class")], classkey="class"
)
)
)
],
functions=[
Function(
return_type=Type(
typename=PQName(segments=[FundamentalSpecifier(name="int")])
),
name=PQName(segments=[NameSpecifier(name="takesFunc")]),
parameters=[
Parameter(
type=Pointer(
ptr_to=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[
NameSpecifier(name="TArgs")
]
)
),
param_pack=True,
)
],
)
),
name="func",
)
],
template=TemplateDecl(
params=[
TemplateTypeParam(
typekey="typename", name="TArgs", param_pack=True
)
]
),
),
Function(
return_type=Type(
typename=PQName(segments=[FundamentalSpecifier(name="int")])
),
name=PQName(segments=[NameSpecifier(name="takesMemberFunc")]),
parameters=[
Parameter(
type=Reference(
ref_to=Type(
typename=PQName(
segments=[NameSpecifier(name="TObject")]
)
)
),
name="object",
),
Parameter(
type=PointerToMember(
base_type=Type(typename=NameSpecifier(name="TObject")),
ptr_to=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[
NameSpecifier(name="TArgs")
]
)
),
param_pack=True,
)
],
),
),
name="func",
),
],
template=TemplateDecl(
params=[
TemplateTypeParam(typekey="typename", name="TObject"),
TemplateTypeParam(
typekey="typename", name="TArgs", param_pack=True
),
]
),
),
],
variables=[
Variable(
name=PQName(segments=[NameSpecifier(name="intPtr")]),
type=PointerToMember(
base_type=Type(typename=NameSpecifier(name="Class")),
ptr_to=Type(
typename=PQName(segments=[FundamentalSpecifier(name="int")])
),
),
),
Variable(
name=PQName(segments=[NameSpecifier(name="intReturnFuncPtr")]),
type=PointerToMember(
base_type=Type(typename=NameSpecifier(name="Class")),
ptr_to=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
),
parameters=[],
),
),
),
Variable(
name=PQName(segments=[NameSpecifier(name="intParamFuncPtr")]),
type=PointerToMember(
base_type=Type(typename=NameSpecifier(name="Class")),
ptr_to=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[
Parameter(
type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="int")]
)
)
)
],
),
),
),
Variable(
name=PQName(segments=[NameSpecifier(name="varargFuncPtr")]),
type=PointerToMember(
base_type=Type(typename=NameSpecifier(name="Class")),
ptr_to=FunctionType(
return_type=Type(
typename=PQName(
segments=[FundamentalSpecifier(name="void")]
)
),
parameters=[],
vararg=True,
),
),
),
],
)
)