Commit c9c04899 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

tools: ynl-gen: factor out the annotation of pure nested struct 



We're about to add some code here for sub-messages.
Factor out the nest-related logic to make the code readable.
No functional change.

Reviewed-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20250515231650.1325372-3-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dc3f63bc

tools/net/ynl/pyynl/ynl_gen_c.py

+22 −17
Original line number Diff line number Diff line
@@ -1239,22 +1239,9 @@ class Family(SpecFamily): 
            else:

                pns_key_list.append(name)



    def _load_nested_sets(self):

        attr_set_queue = list(self.root_sets.keys())

        attr_set_seen = set(self.root_sets.keys())



        while len(attr_set_queue):

            a_set = attr_set_queue.pop(0)

            for attr, spec in self.attr_sets[a_set].items():

                if 'nested-attributes' not in spec:

                    continue



                nested = spec['nested-attributes']

                if nested not in attr_set_seen:

                    attr_set_queue.append(nested)

                    attr_set_seen.add(nested)



    def _load_nested_set_nest(self, spec):

        inherit = set()

        nested = spec['nested-attributes']

        if nested not in self.root_sets:

            if nested not in self.pure_nested_structs:

                self.pure_nested_structs[nested] = Struct(self, nested, inherited=inherit)
@@ -1269,6 +1256,24 @@ class Family(SpecFamily): 
            inherit.add('idx')

        self.pure_nested_structs[nested].set_inherited(inherit)



        return nested



    def _load_nested_sets(self):

        attr_set_queue = list(self.root_sets.keys())

        attr_set_seen = set(self.root_sets.keys())



        while len(attr_set_queue):

            a_set = attr_set_queue.pop(0)

            for attr, spec in self.attr_sets[a_set].items():

                if 'nested-attributes' in spec:

                    nested = self._load_nested_set_nest(spec)

                else:

                    continue



                if nested not in attr_set_seen:

                    attr_set_queue.append(nested)

                    attr_set_seen.add(nested)



        for root_set, rs_members in self.root_sets.items():

            for attr, spec in self.attr_sets[root_set].items():

                if 'nested-attributes' in spec: