Fix c.fixincludes not detecting missing, custom headers

Author: GrieferAtWork

include/deemon/api.h

@@ -545,7 +545,7 @@ __pragma_GCC_diagnostic_ignored(Walloc_size_larger_than)
 #if (defined(__INTELLISENSE__) || defined(__VASSISTX_INSPECT__)) && defined(__cplusplus)
 /* Highlight invalid usage of `NULL' in functions returning `int' */
 #undef NULL
-#define NULL __NULLPTR
+#define NULL __NULLPTR /*!export-*/
 #endif /* __INTELLISENSE__ && __cplusplus */
 
 #ifndef Dee_BREAKPOINT

include/deemon/type.h

@@ -81,7 +81,7 @@
 /* To satisfy "fixincludes" (these includes are intentionally missing) */
 /*!fixincludes fake_include "alloc.h"  // CONFIG_FIXED_ALLOCATOR_S_IS_AUTO, DeeObject_Free, DeeObject_Malloc, DeeSlab_Invoke */
 /*!fixincludes fake_include "gc.h"     // DeeGCObject_Free, DeeGCObject_Malloc */
-/*!fixincludes fake_include "object.h" // DeeAssert_BadObjectType, DeeAssert_BadObjectTypeOpt, DeeObject_Check, Dee_Incref, Dee_buffer */
+/*!fixincludes fake_include "object.h" // DeeAssert_BadObjectType, DeeAssert_BadObjectTypeOpt, DeeObject_Check, Dee_Incref */
 /*!fixincludes fake_include "string.h" // DeeString_Hash, DeeString_STR */
 /*!fixincludes fake_include "tuple.h"  // DeeTuple_ELEM, DeeTuple_SIZE */
 

include/deemon/util/hash.h

@@ -27,6 +27,9 @@
 
 #include "../types.h" /* Dee_hash_t */
 
+#include <stddef.h> /* size_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, uintptr_t */
+
 #ifndef __INTELLISENSE__
 #ifdef CONFIG_NO_STRING_H
 #undef CONFIG_HAVE_STRING_H

include/deemon/util/weakref.h

@@ -30,8 +30,9 @@
 
 #include "../types.h" /* DREF, DeeObject, Dee_unlockinfo */
 
-#include <stdbool.h>
-#include <stddef.h>
+#include <stdbool.h> /* bool */
+#include <stddef.h>  /* NULL, size_t */
+#include <stdint.h>  /* uintptr_t */
 
 DECL_BEGIN
 

lib/c/fixincludes.dee

@@ -345,6 +345,18 @@ local final DEFAULT_HEADERS_BY_INCLUDE: {string: Header} = {
 #undef DEFAULT_HEADER
 }.frozen;
 
+local final DEFAULT_HEADERS_BY_EXPORT: {string: Set with {Header...}} = (() -> {
+	local byExport: {string: Set with {Header...}} = Dict();
+	for (local hdr: DEFAULT_HEADERS_BY_INCLUDE.values) {
+		for (local export: hdr.exports) {
+			local exp = byExport.get(export);
+			if (exp is none)
+				byExport[export] = exp = HashSet();
+			exp.insert({hdr});
+		}
+	}
+	return byExport.frozen;
+})();
 
 class SrcIncludeInfo {
 	this = default;
@@ -1475,7 +1487,8 @@ insert_first_include:
 				if (combination.any(e -> e.filename == filename))
 					goto next_keyword; /* Symbol is defined by the file we're trying to fix -> ignore */
 				if (combination.all(e -> (
-					(e.filename in includedFilenames)
+					(e.filename in includedFilenames) ||
+					(e.includes.any(includedSystemIncludes.operator contains))
 				))) {
 					goto next_keyword; /* Symbol is defined by the file we're trying to fix -> ignore */
 				}
@@ -1489,7 +1502,8 @@ insert_first_include:
 				for (local hdr: combination) {
 					local hdrFilename = hdr.filename;
 					if (hdrFilename !in includedFilenames &&
-					    hdrFilename !in missingByFilename)
+					    !hdr.includes.any(includedSystemIncludes.operator contains) &&
+					    (hdr.filename ?? hdr.shortestInclude) !in missingByFilename)
 						stillMissingIncludes += 2;
 					if (kwd in hdr.exportsFromAlwaysIncludes)
 						stillMissingIncludes += 1; /* Discourage this inclusion over the original header */
@@ -1502,10 +1516,10 @@ insert_first_include:
 			}
 			assert usedCombination !is none;
 			for (local hdr: usedCombination) {
-				local hdrFilename = hdr.filename;
-				local importedKeywords: (Set with string) | none = missingByFilename.get(hdrFilename);
+				local hdrIdent = hdr.filename ?? hdr.shortestInclude;
+				local importedKeywords: (Set with string) | none = missingByFilename.get(hdrIdent);
 				if (importedKeywords is none) {
-					missingByFilename[hdrFilename] = importedKeywords = HashSet();
+					missingByFilename[hdrIdent] = importedKeywords = HashSet();
 					missingHeaders.append(hdr);
 				}
 				importedKeywords.insert(kwd);
@@ -1514,7 +1528,7 @@ next_keyword:;
 		}
 		return (
 			for (local hdr: missingHeaders)
-				(hdr, missingByFilename[hdr.filename])
+				(hdr, missingByFilename[hdr.filename ?? hdr.shortestInclude])
 		);
 	}
 
@@ -1980,7 +1994,10 @@ class FixIncludes {
 	@@always included by other headers are replace with those other headers
 	@@in the returned sequence.
 	public function getHeaderByExport(keyword: string): Set with {Header...} {
-		return headersByExport.get(keyword, {});
+		local result: (Set with {Header...}) | none = headersByExport.get(keyword);
+		if (result is none)
+			result = DEFAULT_HEADERS_BY_EXPORT.get(keyword, Set());
+		return result;
 	}
 
 	@@Return the header specified by @dep and included by @base

src/deemon/runtime/hash-io.c

@@ -25,6 +25,8 @@
 #include <deemon/types.h>        /* Dee_hash_t */
 #include <deemon/util/hash-io.h> /* Dee_HASH_HIDXIO_COUNT, Dee_hash_* */
 
+#include <stddef.h> /* NULL */
+
 DECL_BEGIN
 
 /*DFUNDEF WUNUSED NONNULL((1)) Dee_hash_vidx_t DFCALL Dee_hash_gethidx8(union Dee_hash_htab *__restrict htab, Dee_hash_hidx_t index);*/