Skip to content

Add ImportC support via dmd -H. #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnms-me wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add ImportC support via dmd -H. #789

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
689639e
dsymbol/modulecache.d: Add ImportC support via dmd -H.
jnms-me Oct 26, 2025
8a632b3
docs(README): Mention parial ImportC support, and its dmd discovery.
jnms-me Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 47 additions & 7 deletions dsymbol/src/dsymbol/modulecache.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ struct ModuleCache
*/
DSymbol* cacheModule(string location)
{
import std.file : tempDir;
import std.process : execute;
import std.stdio : File;
import std.uuid : randomUUID;

assert (location !is null);

Expand All @@ -162,7 +165,29 @@ struct ModuleCache

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;
if (fileSize == 0)
return null;
Expand Down Expand Up @@ -301,13 +326,18 @@ struct ModuleCache
// no exact matches and no .di/package.d matches either
else if (!alternative.length)
{
string dotDi = buildPath(path, moduleName) ~ ".di";
string dotD = dotDi[0 .. $ - 1];
string withoutSuffix = dotDi[0 .. $ - 3];
string withoutSuffix = buildPath(path, moduleName);
string dotD = withoutSuffix ~ ".d";
string dotDi = dotD ~ "i";
string dotC = withoutSuffix ~ ".c";
string dotH = withoutSuffix ~ ".h";
string dotI = withoutSuffix ~ ".i";
if (existsAnd!isFile(dotD))
return istring(dotD); // return early for exactly matching .d files
else if (existsAnd!isFile(dotDi))
alternative = dotDi;
else if (existsAnd!isFile(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))
{
string packagePath = buildPath(withoutSuffix, "package.di");
Expand Down Expand Up @@ -402,7 +432,7 @@ private:
{
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;
cacheModule(f.name);
}
Expand Down Expand Up @@ -522,3 +552,13 @@ else version (Posix)
assert(!existsAnd!isFile(`/bin`));
}
}

private @safe
string dmd()
{
import std.process : environment;

if ("DMD" in environment)
return environment["DMD"];
Copy link
Copy Markdown
Member

@WebFreak001 WebFreak001 Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be documented in the README or other places where this might be relevant

return "dmd";
}
Loading