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

Show file tree
Hide file tree
Changes from all commits
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
10 changes: 2 additions & 8 deletions kernel/rtlil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,9 @@ namespace RTLIL
CONST_FLAG_NONE = 0,
CONST_FLAG_STRING = 1,
CONST_FLAG_SIGNED = 2, // only used for parameters
CONST_FLAG_REAL = 4, // only used for parameters
CONST_FLAG_REAL = 4 // only used for parameters
};

// // Union discriminator. Values are exclusive
// enum ConstRepr : unsigned char {
// CONST_REPR_BITS = 1,
// CONST_REPR_STRING = 2,
// };

struct Const;
struct AttrObject;
struct Selection;
Expand Down Expand Up @@ -666,7 +660,7 @@ namespace RTLIL

struct RTLIL::Const
{
short flags;
short int flags;
private:
friend class KernelRtlilTest;
FRIEND_TEST(KernelRtlilTest, ConstStr);
Expand Down
56 changes: 33 additions & 23 deletions misc/py_wrap_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,10 @@ def assure_length(text, length, left = False):
if left:
return text + " "*(length - len(text))
return " "*(length - len(text)) + text


def nesting_delta(s):
return s.count("{") - s.count("}")

def parse_header(source):
debug("Parsing " + source.name + ".pyh",1)
source_file = open(source.name + ".pyh", "r")
Expand All @@ -1976,12 +1979,13 @@ def parse_header(source):
i = 0

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

while i < len(source_text):
line = source_text[i].replace("YOSYS_NAMESPACE_BEGIN", " namespace YOSYS_NAMESPACE{").replace("YOSYS_NAMESPACE_END"," }")
ugly_line = unpretty_string(line)
debug(f"READ:>> {line}", 2)

# for anonymous unions, ignore union enclosure by skipping start line and replacing end line with new line
if 'union {' in line:
Expand All @@ -2004,15 +2008,15 @@ def parse_header(source):
continue

if len(namespaces) != 0:
namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + ugly_line.count("{") - ugly_line.count("}"))
namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + nesting_delta(ugly_line))
if namespaces[-1][1] == 0:
debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----",3)
del namespaces[-1]
namespaces.pop()
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]
complete_namespace = concat_namespace(namespaces)
Expand All @@ -2030,25 +2034,30 @@ 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] + ugly_line.count("{") - ugly_line.count("}"))
if class_[1] == 0:
if class_[0] == None:
if len(classes):
c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
classes[-1] = c
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
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 @@ -2156,18 +2165,19 @@ def parse_header(source):
line = source_text[i].replace("YOSYS_NAMESPACE_BEGIN", " namespace YOSYS_NAMESPACE{").replace("YOSYS_NAMESPACE_END"," }")
ugly_line = unpretty_string(line)
if len(namespaces) != 0:
namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + ugly_line.count("{") - ugly_line.count("}"))
namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + nesting_delta(ugly_line))
if namespaces[-1][1] == 0:
debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----",3)
del namespaces[-1]
if class_ != None:
class_ = (class_[0] , class_[1] + ugly_line.count("{") - ugly_line.count("}"))
if class_[1] == 0:
if class_[0] == None:
namespaces.pop()
if len(classes):
c = (classes[-1][0] , classes[-1][1] + nesting_delta(ugly_line))
classes[-1] = c
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
Loading