Skip to content
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

py_wrap: implement nested class definitions #4671

Merged
merged 6 commits into from
Oct 18, 2024
Merged

py_wrap: implement nested class definitions #4671

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b9c135
py_wrap: refactor nesting_delta
widlarizer Oct 16, 2024
86630bb
py_wrap: nested classes
widlarizer Oct 16, 2024
f219bb3
py_wrap: kinda fixed
widlarizer Oct 16, 2024
e9e67f3
rtlil: remove trailing comma as pyosys workaround
widlarizer Oct 16, 2024
d5aadea
py_wrap: remove some debug statements
widlarizer Oct 18, 2024
49d8a35
rtlil: appease py_wrap
widlarizer Oct 18, 2024
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
39 changes: 21 additions & 18 deletions misc/py_wrap_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@ def parse_header(source):
i = 0

namespaces = []
class_ = None
classes = []
private_segment = False

while i < len(source_text):
Expand Down Expand Up @@ -2015,7 +2015,7 @@ def parse_header(source):
i += 1
continue

if class_ == None and (str.startswith(ugly_line, "struct ") or str.startswith(ugly_line, "class")) and ugly_line.count(";") == 0:
if (str.startswith(ugly_line, "struct ") or str.startswith(ugly_line, "class")) and ugly_line.count(";") == 0:
# Opening a record declaration which isn't a forward declaration
struct_name = ugly_line.split(" ")[1].split("::")[-1]
impl_namespaces = ugly_line.split(" ")[1].split("::")[:-1]
Expand All @@ -2034,28 +2034,31 @@ def parse_header(source):
debug("\t " + struct_name + " is derived from " + base_class_name,2)
base_class = class_by_name(base_class_name)

class_ = (class_by_name(struct_name), ugly_line.count("{"))#calc_ident(line))
c = (class_by_name(struct_name), ugly_line.count("{"))#calc_ident(line))
debug(f"switch to {struct_name} in namespace {namespaces}", 2)
if struct_name in classnames:
class_[0].namespace = complete_namespace
class_[0].base_class = base_class
c[0].namespace = complete_namespace
povik marked this conversation as resolved.
Show resolved Hide resolved
c[0].base_class = base_class
classes.append(c)
i += 1
continue

if class_ != None:
class_ = (class_[0], class_[1] + nesting_delta(ugly_line))
debug(f"switch to uhh depth {class_[1]}", 2)
if class_[1] == 0:
if class_[0] == None:
if len(classes):
c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
debug(f"switch to uhh depth {c[1]}", 2)
if c[1] == 0:
if c[0] == None:
debug("\tExiting unknown class", 3)
else:
debug("\tExiting class " + class_[0].name, 3)
debug("\tExiting class " + c[0].name, 3)
debug(f"nevermind!", 2)
class_ = None
classes.pop()
private_segment = False
i += 1
continue

class_ = classes[-1] if classes else None

if class_ != None and (line.find("private:") != -1 or line.find("protected:") != -1):
private_segment = True
i += 1
Expand Down Expand Up @@ -2167,14 +2170,14 @@ def parse_header(source):
if namespaces[-1][1] == 0:
debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----",3)
namespaces.pop()
if class_ != None:
class_ = (class_[0] , class_[1] + nesting_delta(ugly_line))
if class_[1] == 0:
if class_[0] == None:
if len(classes):
c = (classes[-1][0] , classes[-1][1] + nesting_delta(ugly_line))
if c[1] == 0:
if c[0] == None:
debug("\tExiting unknown class", 3)
else:
debug("\tExiting class " + class_[0].name, 3)
class_ = None
debug("\tExiting class " + c[0].name, 3)
classes.pop()
private_segment = False
i += 1
else:
Expand Down