added ARGN to CMakeLists function call and reformatted __NOEXCEPT

llvm · Jul 17, 2024 · 50da8f0 · aaryanshukla · Jul 17, 2024 · 50da8f0
1 parent 3ffc0ee
commit 50da8f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
@@ -25,13 +25,15 @@ macro(add_header_macro TARGET_NAME YAML_FILE DEF_FILE GEN_HDR DEPENDS)
       DEF_FILE ${DEF_FILE}
       GEN_HDR ${GEN_HDR}
       ${DEPENDS}
+      ${ARGN}
     )
   else()
     add_gen_header(
       ${TARGET_NAME}
       DEF_FILE ${DEF_FILE}
       GEN_HDR ${GEN_HDR}
       ${DEPENDS}
+      ${ARGN}
     )
   endif()
 endmacro()

diff --git a/libc/newhdrgen/class_implementation/classes/function.py b/libc/newhdrgen/class_implementation/classes/function.py
@@ -26,7 +26,7 @@ def __str__(self):
         attributes_str = " ".join(self.attributes)
         arguments_str = ", ".join(self.arguments)
         if attributes_str == "":
-            result = f"{self.return_type} {self.name}({arguments_str});"
+            result = f"{self.return_type} {self.name}({arguments_str}) __NOEXCEPT;"
         else:
-            result = f"{attributes_str} {self.return_type} {self.name}({arguments_str})"
+            result = f"{attributes_str} {self.return_type} {self.name}({arguments_str}) __NOEXCEPT;"
         return result
diff --git a/libc/newhdrgen/header.py b/libc/newhdrgen/header.py
@@ -60,24 +60,24 @@ def __str__(self):
         current_guard = None
         for function in self.functions:
             if function.guard == None:
-                content.append(str(function) + " __NOEXCEPT;")
+                content.append(str(function))
                 content.append("")
             else:
                 if current_guard == None:
                     current_guard = function.guard
                     content.append(f"#ifdef {current_guard}")
-                    content.append(str(function) + " __NOEXCEPT;")
+                    content.append(str(function))
                     content.append("")
                 elif current_guard == function.guard:
-                    content.append(str(function) + " __NOEXCEPT;")
+                    content.append(str(function))
                     content.append("")
                 else:
                     content.pop()
                     content.append(f"#endif // {current_guard}")
                     content.append("")
                     current_guard = function.guard
                     content.append(f"#ifdef {current_guard}")
-                    content.append(str(function) + " __NOEXCEPT;")
+                    content.append(str(function))
                     content.append("")
         if current_guard != None:
             content.pop()