Skip to content

Various fixes for 'using' #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
virtuald merged 2 commits into from
Jan 24, 2021
Merged

Various fixes for 'using' #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63afe03
Emit correct types when 'typename' is present
virtuald Jan 24, 2021
0bac482
Fix 'using' typealiases that end with ::N
virtuald Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions CppHeaderParser/CppHeaderParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@ def _split_namespace(namestack):
:rtype: Tuple[str, list]
"""
# TODO: this should be using tokens instead of nhack
typename = None
if namestack and namestack[0] == "typename":
typename = namestack[0]
namestack = namestack[1:]

last_colon = None
for i, n in enumerate(namestack):
Expand All @@ -296,6 +300,9 @@ def _split_namespace(namestack):
else:
ns = ""

if typename:
namestack = [typename] + namestack

return ns, namestack


Expand Down Expand Up @@ -1269,7 +1276,11 @@ def __init__(self, nameStack, doxygen, location, **kwargs):
# backwards compat; deprecate camelCase in dicts
self["defaultValue"] = default

elif is_fundamental(nameStack[-1]) or nameStack[-1] in [">", "<", ":", "."]:
elif (
is_fundamental(nameStack[-1])
or nameStack[-1] in [">", "<", ":", "."]
or (len(nameStack) > 2 and nameStack[-2] == "::")
):
# Un named parameter
self["type"] = " ".join(nameStack)
self["name"] = ""
Expand Down Expand Up @@ -3348,7 +3359,10 @@ def _evaluate_stack(self, token=None):
else:
atype["namespace"] = ns

atype["raw_type"] = ns + atype["type"]
if atype["type"].startswith("typename "):
atype["raw_type"] = "typename " + ns + atype["type"][9:]
else:
atype["raw_type"] = ns + atype["type"]

if self.curClass:
klass = self.classes[self.curClass]
Expand Down
28 changes: 28 additions & 0 deletions test/test_CppHeaderParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4010,5 +4010,33 @@ def test_fn(self):
self.assertEqual(False, c["methods"]["public"][1]["template"])


class UsingTypename(unittest.TestCase):
def setUp(self):
self.cppHeader = CppHeaderParser.CppHeader(
"""
template <class D> class P {
public:
using State = typename f::TP<D>::S;
P(State st);
};
""",
"string",
)

def test_fn(self):
c = self.cppHeader.classes["P"]
self.assertEqual("P", c["name"])
state = c["using"]["State"]
self.assertEqual(state["raw_type"], "typename f::TP<D >::S")
self.assertEqual(state["type"], "typename TP<D >::S")

m = c["methods"]["public"][0]
self.assertEqual(m["name"], "P")
self.assertEqual(m["parameters"][0]["namespace"], "f::")
self.assertEqual(m["parameters"][0]["name"], "st")
self.assertEqual(m["parameters"][0]["raw_type"], "typename f::TP<D >::S")
self.assertEqual(m["parameters"][0]["type"], "typename TP<D >::S")


if __name__ == "__main__":
unittest.main()