Update dbl_list to add C++ specific macros

codegen/datatypes.py

@@ -211,6 +211,8 @@ class CFile:
     funcs: List[CFunc] = field(default_factory=list)
     decl_types: List[CStruct] = field(default_factory=list)
     macros: List[CMacro] = field(default_factory=list)
+    c_macros: List[CMacro] = field(default_factory=list)
+    cpp_macros: List[CMacro] = field(default_factory=list)
 
     def save(self, output_dir: Path):
         self.includes.extend(
@@ -259,6 +261,15 @@ class CHeader(CFile):
         if len(macros) > 0:
             macros += "\n"
 
+        if len(self.cpp_macros) > 0:
+            macros += "#ifdef WAPP_PLATFORM_CPP\n"
+            for macro in self.cpp_macros:
+                macros += str(macro)
+            macros += "#else\n"
+            for macro in self.c_macros:
+                macros += str(macro)
+            macros += "#endif // !WAPP_PLATFORM_CPP\n\n"
+
         forward_declarations = ""
         for _type in self.decl_types:
             forward_declarations += _type.declare()

codegen/dbl_list/make_dbl_list.py

@@ -139,7 +139,7 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             ],
         )
 
-        node_macro = CMacro(
+        node_cmacro = CMacro(
             name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
             value=__format_func_body(
                 filename=snippets_dir / "list_node",
@@ -151,6 +151,18 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             ),
         )
 
+        node_cppmacro = CMacro(
+            name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
+            value=__format_func_body(
+                filename=snippets_dir / "list_node_cpp",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
         get_func = CFunc(
             name=f"wapp_{type_string_lower}_list_get",
             ret_type=node,
@@ -307,7 +319,8 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
         )
 
         header.decl_types.extend(dbl_list_data.hdr_decl_types)
-        header.macros.append(node_macro)
+        header.c_macros.append(node_cmacro)
+        header.cpp_macros.append(node_cppmacro)
         header.types.extend([node, dl_list])
         header.funcs.extend([
             get_func,

codegen/dbl_list/snippets/list_node_cpp

@@ -0,0 +1 @@
+{NodeType}{{ITEM_PTR, nullptr, nullptr}}