[sourcegen] Roll back some changes

ischoegl · Aug 21, 2024 · 51ab8ae · 51ab8ae
1 parent ba79a66
commit 51ab8ae
Showing 1 changed file with 66 additions and 61 deletions.
diff --git a/interfaces/sourcegen/sourcegen/_HeaderFileParser.py b/interfaces/sourcegen/sourcegen/_HeaderFileParser.py
@@ -20,9 +20,9 @@
 
 class HeaderFileParser:
 
-    @classmethod
-    def _parse_func(cls, func_comment: tuple[str, str]) -> Func:
-        return Func.from_str(*func_comment)
+    # @classmethod
+    # def _parse_func(cls, func_comment: tuple[str, str]) -> Func:
+    #     return Func.from_str(*func_comment)
 
     def __init__(self, path: Path, ignore_funcs: List[str] = None):
         self._path = path
@@ -69,56 +69,61 @@ def parse_h(cls, ignore_files, ignore_funcs) -> List[HeaderFile]:
     def _parse_h(self) -> HeaderFile:
         ct = self._path.read_text()
 
-        def parse_with_doxygen(text):
-            # a primitive doxygen parser for existing Cantera CLib header files
-            regex = re.compile((
-                r"(?P<blank>\n\s*\n)|"  # blank line
-                r"(?P<head>(?=//! )[^\n]*)|"  # leading doxygen comment
-                r"(?P<func>(?=CANTERA_CAPI)[^;]*;)|"  # CLib function
-                r"(?P<tail>(?=//!< )[^\n]*)"))  # trailing doxygen comment
-            matches = re.finditer(regex, text)
-
-            pairs = []
-            function = None
-            comments = []
-            for m in matches:
-                if function:
-                    if m.group("func"):
-                        # new function: flush buffers
-                        pairs.append((function, "\n".join(comments)))
-                        comments = []
-                        function = m.group("func").replace("CANTERA_CAPI ", "")
-                    elif m.group("head"):
-                        # new heading comment: flush buffers
-                        pairs.append((function, "\n".join(comments)))
-                        comments = [m.group("head")]
-                        function = None
-                    elif m.group("tail"):
-                        # trailing comment: append to buffer
-                        comments.append(m.group("tail"))
-                    else:  # m.group("blank"):
-                        # blank line: flush buffers
-                        pairs.append((function, "\n".join(comments)))
-                        comments = []
-                        function = None
-                else:
-                    if m.group("blank"):
-                        # blank line: clear buffer
-                        comments = []
-                    elif m.group("head"):
-                        # new heading comment: buffer
-                        comments.append(m.group("head"))
-                    elif m.group("func"):
-                        # new function: buffer
-                        function = m.group("func").replace("CANTERA_CAPI ", "")
-            return pairs
-
-        c_functions = parse_with_doxygen(ct)
+        matches = re.finditer(r"CANTERA_CAPI.*?;", ct, re.DOTALL)
+        c_functions = [re.sub(r"\s+", " ", m.group()).replace("CANTERA_CAPI ", "")
+                       for m in matches]
+
+        # def parse_with_doxygen(text):
+        #     # a primitive doxygen parser for existing Cantera CLib header files
+        #     regex = re.compile((
+        #         r"(?P<blank>\n\s*\n)|"  # blank line
+        #         r"(?P<head>(?=//! )[^\n]*)|"  # leading doxygen comment
+        #         r"(?P<func>(?=CANTERA_CAPI)[^;]*;)|"  # CLib function
+        #         r"(?P<tail>(?=//!< )[^\n]*)"))  # trailing doxygen comment
+        #     matches = re.finditer(regex, text)
+
+        #     pairs = []
+        #     function = None
+        #     comments = []
+        #     for m in matches:
+        #         if function:
+        #             if m.group("func"):
+        #                 # new function: flush buffers
+        #                 pairs.append((function, "\n".join(comments)))
+        #                 comments = []
+        #                 function = m.group("func").replace("CANTERA_CAPI ", "")
+        #             elif m.group("head"):
+        #                 # new heading comment: flush buffers
+        #                 pairs.append((function, "\n".join(comments)))
+        #                 comments = [m.group("head")]
+        #                 function = None
+        #             elif m.group("tail"):
+        #                 # trailing comment: append to buffer
+        #                 comments.append(m.group("tail"))
+        #             else:  # m.group("blank"):
+        #                 # blank line: flush buffers
+        #                 pairs.append((function, "\n".join(comments)))
+        #                 comments = []
+        #                 function = None
+        #         else:
+        #             if m.group("blank"):
+        #                 # blank line: clear buffer
+        #                 comments = []
+        #             elif m.group("head"):
+        #                 # new heading comment: buffer
+        #                 comments.append(m.group("head"))
+        #             elif m.group("func"):
+        #                 # new function: buffer
+        #                 function = m.group("func").replace("CANTERA_CAPI ", "")
+        #     return pairs
+
+        # c_functions = parse_with_doxygen(ct)
 
         if not c_functions:
             return
 
-        parsed = map(self._parse_func, c_functions)
+        parsed = map(Func.from_str, c_functions)
+        # parsed = map(self._parse_func, c_functions)
 
         logger.info(f"  parsing {self._path.name}")
         if self._ignore_funcs:
@@ -132,15 +137,15 @@ def parse_with_doxygen(text):
         return HeaderFile(self._path, parsed)
 
 
-def doxygen_func(tag: str, text: str) -> str:
-    """Extract function signature from doxygen tag if it exists."""
-    regex = re.compile(rf"(?<={tag} ).*[^\(\n]|((?<={tag} )(.*?)\))")
-    matched = list(re.finditer(regex, text))
-    if not matched:
-        return ""
-    if len(matched) > 1:
-        msg = f"Found more than one {tag!r} annotation; returning first."
-        logging.warning(msg)
-        signatures = '\n  - '.join([""] + [_[0] for _ in matched])
-        logging.debug("Found instances:%s", signatures)
-    return matched[0][0]
+# def doxygen_func(tag: str, text: str) -> str:
+#     """Extract function signature from doxygen tag if it exists."""
+#     regex = re.compile(rf"(?<={tag} ).*[^\(\n]|((?<={tag} )(.*?)\))")
+#     matched = list(re.finditer(regex, text))
+#     if not matched:
+#         return ""
+#     if len(matched) > 1:
+#         msg = f"Found more than one {tag!r} annotation; returning first."
+#         logging.warning(msg)
+#         signatures = '\n  - '.join([""] + [_[0] for _ in matched])
+#         logging.debug("Found instances:%s", signatures)
+#     return matched[0][0]