Skip to content

Resolve forward declared variables correctly #58

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 1 commit into from
Jan 10, 2021
Merged

Resolve forward declared variables correctly #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions CppHeaderParser/CppHeaderParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ def initextra(self):
[]
) # full name stack, good idea to keep both stacks? (simple stack and full stack)
self._classes_brace_level = {} # class name : level
self._forward_decls = []
self._forward_decls = {} # name: namespace
self._template_typenames = [] # template<typename XXX>

def current_namespace(self):
Expand Down Expand Up @@ -1747,6 +1747,7 @@ def finalize_vars(self):

elif tag in self._forward_decls:
var["forward_declared"] = tag
var["namespace"] = self._forward_decls[tag]
var["ctypes_type"] = "ctypes.c_void_p"

elif tag in self.global_enums:
Expand Down Expand Up @@ -2599,7 +2600,7 @@ def evalute_forward_decl(self):
if self.curAccessSpecifier == "public":
klass._public_forward_declares.append(name)
else:
self._forward_decls.append(name)
self._forward_decls[name] = self.current_namespace()


# fmt: off
Expand Down
32 changes: 32 additions & 0 deletions test/test_CppHeaderParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3929,5 +3929,37 @@ def test_fn(self):
self.assertEqual(m["returns"], "int")


class ForwardDeclResolve(unittest.TestCase):
def setUp(self):
self.cppHeader = CppHeaderParser.CppHeader(
"""
namespace n1 {

class A;

namespace n2 {

class B {
public:
explicit B(const A &a);
};

}
""",
"string",
)

def test_fn(self):
c = self.cppHeader.classes["B"]
self.assertEqual("B", c["name"])

m = c["methods"]["public"][0]
self.assertEqual(m["name"], "B")
self.assertEqual(m["parameters"][0]["forward_declared"], "A")
self.assertEqual(m["parameters"][0]["namespace"], "n1::")
self.assertEqual(m["parameters"][0]["name"], "a")
self.assertEqual(m["parameters"][0]["raw_type"], "n1::A")


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