Prepend a stdbool stub when invoking libclang on MEOS headers

parser/extractors.py

@@ -19,16 +19,18 @@ def _canonical_spelling(ty) -> str:
 _BOOL_SPELLINGS = {"bool", "_Bool"}
 
 
+_BOOL_TOKEN_RE = re.compile(r"\b_Bool\b")
+
+
 def _c_spelling(ty) -> str:
     # Return the declared C spelling, with ``_Bool`` normalised to ``"bool"``.
     # Two bool representations arise depending on which postgres_int_defs.h is
     # in play:
     # - PostgreSQL headers: ``typedef char bool``  -> spelling already ``"bool"``
     # - Stub header:        ``#define bool _Bool`` -> spelling is ``"_Bool"``
-    spelling = ty.spelling
-    if spelling == "_Bool":
-        return "bool"
-    return spelling
+    # Compound types preserve the inner spelling, so ``bool *`` arrives as
+    # ``_Bool *``; substitute on the token rather than the whole string.
+    return _BOOL_TOKEN_RE.sub("bool", ty.spelling)
 
 
 def _canonical_c_spelling(ty) -> str:

parser/parser.py

@@ -94,8 +94,26 @@ def _dedup(items: list) -> list:
     return resolve_idl_types(idl, mappings_path)
 
 
+# Minimal stand-in for system headers so libclang does not fall back to
+# treating undeclared identifiers as int.  stdbool.h is the load-bearing one:
+# without it every `bool`-returning function is parsed with result_type
+# TypeKind.INT.
+_SYSTEM_HEADER_STUBS = """
+#ifndef bool
+#define bool _Bool
+#endif
+#ifndef true
+#define true 1
+#endif
+#ifndef false
+#define false 0
+#endif
+typedef unsigned long size_t;
+"""
+
+
 def build_entry_point(headers_dir: Path) -> str:
-    lines = []
+    lines = [_SYSTEM_HEADER_STUBS]
     for h in sorted(headers_dir.glob("**/*.h")):
         lines.append(f'#include "{h.resolve()}"')
     return "\n".join(lines)