Update code generation to create one file for dbl_list

codegen/dbl_list/make_dbl_list.py

@@ -4,6 +4,7 @@ from codegen.constants import WAPP_SRC_ROOT
 from codegen.utils import load_func_body_from_file
 from codegen.datatypes import (
     CDataType,
+    CMacro,
     CStruct,
     CFunc,
     CHeader,
@@ -20,9 +21,6 @@ from codegen.datatypes import (
 
 @dataclass
 class DblListData:
-    out_dir: Path
-    hdr_includes: list[CInclude] = field(default_factory=list)
-    src_includes: list[CInclude] = field(default_factory=list)
     hdr_decl_types: list[CStruct] = field(default_factory=list)
     src_decl_types: list[CStruct] = field(default_factory=list)
 
@@ -36,10 +34,20 @@ def make_dbl_list(user_datatypes: dict[CDataType, DblListData] = {}):
             Tlower=type_string.lower(),
         )
 
+    out_dir = WAPP_SRC_ROOT / "containers" / "dbl_list"
+    out_dir.mkdir(parents=True, exist_ok=True)
+
     common_local_include_files = [
         (WAPP_SRC_ROOT / "common" / "aliases" / "aliases.h")
     ]
     common_includes: list[CInclude] = []
+    for local_file in common_local_include_files:
+        common_includes.append(
+            CInclude(
+                header=str(local_file.relative_to(out_dir, walk_up=True)),
+                local=True,
+            )
+        )
 
     common_decl_types: list[CStruct] = []
 
@@ -48,13 +56,32 @@ def make_dbl_list(user_datatypes: dict[CDataType, DblListData] = {}):
             hdr_decl_types=[
                 CStruct(name="str8", cargs=[], typedef_name="Str8"),
             ],
-            out_dir=WAPP_SRC_ROOT / "core" / "strings" / "str8",
         ),
     }
     datatypes.update(user_datatypes)
 
     snippets_dir = Path(__file__).parent / "snippets"
 
+    header = CHeader(
+        name="dbl_list",
+        decl_types=common_decl_types,
+        includes=[],
+        types=[],
+        funcs=[]
+    )
+
+    source = CSource(
+        name=header.name,
+        decl_types=common_decl_types,
+        includes=[CInclude(header, local=True, same_dir=True), CInclude(header="stddef.h")],
+        internal_funcs=[],
+        funcs=header.funcs
+    )
+
+    if len(common_includes) > 0:
+        header.includes.extend(common_includes)
+        source.includes.extend(common_includes)
+
     for _type, dbl_list_data in datatypes.items():
         type_string = get_datatype_string(_type)
 
@@ -78,13 +105,9 @@ def make_dbl_list(user_datatypes: dict[CDataType, DblListData] = {}):
             ],
         )
 
-        node_func = CFunc(
-            name=f"wapp_{type_string.lower()}_list_node",
-            ret_type=node,
-            args=[
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(snippets_dir / "list_node", type_string),
+        node_macro = CMacro(
+            name=f"wapp_{type_string.lower()}_list_node(ITEM_PTR)",
+            value=__format_func_body(snippets_dir / "list_node", type_string),
         )
 
         get_func = CFunc(
@@ -179,46 +202,23 @@ def make_dbl_list(user_datatypes: dict[CDataType, DblListData] = {}):
             qualifiers=[CQualifier.INTERNAL],
         )
 
-        header = CHeader(
-            name=f"{type_string.lower()}_list",
-            decl_types=common_decl_types + dbl_list_data.hdr_decl_types,
-            includes=[],
-            types=[node, dl_list],
-            funcs=[
-                node_func,
-                get_func,
-                push_front_func,
-                push_back_func,
-                insert_func,
-                pop_front_func,
-                pop_back_func,
-                remove_func,
-                empty_func,
-           ]
-        )
+        header.decl_types.extend(dbl_list_data.hdr_decl_types)
+        header.macros.append(node_macro)
+        header.types.extend([node, dl_list])
+        header.funcs.extend([
+            get_func,
+            push_front_func,
+            push_back_func,
+            insert_func,
+            pop_front_func,
+            pop_back_func,
+            remove_func,
+            empty_func,
+        ])
 
-        source = CSource(
-            name=header.name,
-            decl_types=common_decl_types + dbl_list_data.src_decl_types,
-            includes=[CInclude(header, local=True, same_dir=True), CInclude(header="stddef.h")],
-            internal_funcs=[node_to_list_func],
-            funcs=header.funcs
-        )
+        source.decl_types.extend(dbl_list_data.src_decl_types)
+        source.internal_funcs.append(node_to_list_func)
+        source.funcs = header.funcs
 
-        if len(common_includes) > 0:
-            header.includes.extend(common_includes)
-            source.includes.extend(common_includes)
-
-        for include_file in common_local_include_files:
-            include = CInclude(header=str(include_file.relative_to(dbl_list_data.out_dir, walk_up=True)), local=True)
-            header.includes.append(include)
-            source.includes.append(include)
-
-        if len(dbl_list_data.hdr_includes) > 0:
-            header.includes.extend(dbl_list_data.hdr_includes)
-
-        if len(dbl_list_data.src_includes) > 0:
-            source.includes.extend(dbl_list_data.src_includes)
-
-        header.save(dbl_list_data.out_dir)
-        source.save(dbl_list_data.out_dir)
+    header.save(out_dir)
+    source.save(out_dir)

codegen/dbl_list/snippets/list_node

@@ -1 +1 @@
-  return ({Ttitle}Node){{.item = item}};
+(({Ttitle}Node){{.item = ITEM_PTR}})