forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dsymbol/modulecache.d: Add ImportC support via dmd -H.

This commit is contained in:
Jonas Meeuws 2025-10-26 21:34:33 +01:00
parent 1498ef1c1c
commit 689639eef1
No known key found for this signature in database
GPG Key ID: BC0C864CF04D9AC4
1 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dsymbol/src/dsymbol/modulecache.d
View File

@ -148,7 +148,10 @@ struct ModuleCache
*/ */
DSymbol* cacheModule(string location) DSymbol* cacheModule(string location)
{ {
import std.file : tempDir;
import std.process : execute;
import std.stdio : File; import std.stdio : File;
import std.uuid : randomUUID;
assert (location !is null); assert (location !is null);
@ -162,7 +165,29 @@ struct ModuleCache
recursionGuard.insert(&cachedLocation.data[0]); recursionGuard.insert(&cachedLocation.data[0]);
File f = File(cachedLocation); string generatedHeaderFile;
scope (exit)
{
if (generatedHeaderFile.length && generatedHeaderFile.exists)
generatedHeaderFile.remove;
}
const bool isImportC = cachedLocation.extension.among(".c", ".h", ".i") > 0;
if (isImportC)
{
generatedHeaderFile = buildPath(tempDir, "dcd_" ~ randomUUID.toString ~ ".di");
const dmdResult = execute([dmd, "-o-", "-Hf" ~ generatedHeaderFile, cachedLocation]);
if (dmdResult.status != 0)
{
warningf(
"Generating .di file for ImportC file \"%s\" failed with status code %d: %s",
cachedLocation, dmdResult.status, dmdResult.output,
);
return null;
}
}
File f = File(isImportC ? generatedHeaderFile : cachedLocation);
immutable fileSize = cast(size_t) f.size; immutable fileSize = cast(size_t) f.size;
if (fileSize == 0) if (fileSize == 0)
return null; return null;
@ -301,13 +326,18 @@ struct ModuleCache
// no exact matches and no .di/package.d matches either // no exact matches and no .di/package.d matches either
else if (!alternative.length) else if (!alternative.length)
{ {
string dotDi = buildPath(path, moduleName) ~ ".di"; string withoutSuffix = buildPath(path, moduleName);
string dotD = dotDi[0 .. $ - 1]; string dotD = withoutSuffix ~ ".d";
string withoutSuffix = dotDi[0 .. $ - 3]; string dotDi = dotD ~ "i";
string dotC = withoutSuffix ~ ".c";
string dotH = withoutSuffix ~ ".h";
string dotI = withoutSuffix ~ ".i";
if (existsAnd!isFile(dotD)) if (existsAnd!isFile(dotD))
return istring(dotD); // return early for exactly matching .d files return istring(dotD); // return early for exactly matching .d files
else if (existsAnd!isFile(dotDi)) else if (existsAnd!isFile(dotDi)) alternative = dotDi;
alternative = dotDi; else if (existsAnd!isFile(dotC)) alternative = dotC;
else if (existsAnd!isFile(dotH)) alternative = dotH;
else if (existsAnd!isFile(dotI)) alternative = dotI;
else if (existsAnd!isDir(withoutSuffix)) else if (existsAnd!isDir(withoutSuffix))
{ {
string packagePath = buildPath(withoutSuffix, "package.di"); string packagePath = buildPath(withoutSuffix, "package.di");
@ -402,7 +432,7 @@ private:
{ {
if (f.name.existsAnd!isFile) if (f.name.existsAnd!isFile)
{ {
if (!f.name.extension.among(".d", ".di") || f.name.baseName.startsWith(".#")) if (!f.name.extension.among(".d", ".di", ".c", ".h", ".i") || f.name.baseName.startsWith(".#"))
continue; continue;
cacheModule(f.name); cacheModule(f.name);
} }
@ -522,3 +552,13 @@ else version (Posix)
assert(!existsAnd!isFile(`/bin`)); assert(!existsAnd!isFile(`/bin`));
} }
} }
private @safe
string dmd()
{
import std.process : environment;
if ("DMD" in environment)
return environment["DMD"];
return "dmd";
}