aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/dmodule.d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2024-02-24 10:26:09 +0100
committerIain Buclaw <ibuclaw@gdcproject.org>2024-02-26 00:06:22 +0100
commit94687d17ba79cdb9fd01c87b2b40b63512471569 (patch)
treedb4abf352a61c392db2c4c512dc9a8c061541f22 /gcc/d/dmd/dmodule.d
parent3f58f96a4e8255e222953f9856bcd6c25f7b33cd (diff)
downloadgcc-94687d17ba79cdb9fd01c87b2b40b63512471569.zip
gcc-94687d17ba79cdb9fd01c87b2b40b63512471569.tar.gz
gcc-94687d17ba79cdb9fd01c87b2b40b63512471569.tar.bz2
Merge dmd, druntime ceff48bf7d, phobos dcbfbd43a
D front-end changes: - Import latest fixes from dmd v2.107.1-rc.1. D runtime changes: - Import latest fixes from druntime v2.107.1-rc.1. Phobos changes: - Import latest fixes from phobos v2.107.1-rc.1. gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd ceff48bf7d. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime ceff48bf7d. * libdruntime/Makefile.am (DRUNTIME_DSOURCES_FREEBSD): Add core/sys/freebsd/net/if_.d. * libdruntime/Makefile.in: Regenerate. * src/MERGE: Merge upstream phobos dcbfbd43a.
Diffstat (limited to 'gcc/d/dmd/dmodule.d')
-rw-r--r--gcc/d/dmd/dmodule.d32
1 files changed, 19 insertions, 13 deletions
diff --git a/gcc/d/dmd/dmodule.d b/gcc/d/dmd/dmodule.d
index 07d5077..a77e4f3 100644
--- a/gcc/d/dmd/dmodule.d
+++ b/gcc/d/dmd/dmodule.d
@@ -16,12 +16,14 @@ module dmd.dmodule;
import core.stdc.stdio;
import core.stdc.stdlib;
import core.stdc.string;
+
import dmd.aggregate;
import dmd.arraytypes;
import dmd.astcodegen;
import dmd.astenums;
+import dmd.common.outbuffer;
import dmd.compiler;
-import dmd.gluelayer;
+import dmd.cparse;
import dmd.dimport;
import dmd.dmacro;
import dmd.doc;
@@ -35,25 +37,37 @@ import dmd.expressionsem;
import dmd.file_manager;
import dmd.func;
import dmd.globals;
+import dmd.gluelayer;
import dmd.id;
import dmd.identifier;
import dmd.location;
import dmd.parse;
-import dmd.cparse;
import dmd.root.array;
import dmd.root.file;
import dmd.root.filename;
-import dmd.common.outbuffer;
import dmd.root.port;
import dmd.root.rmem;
-import dmd.rootobject;
import dmd.root.string;
+import dmd.rootobject;
import dmd.semantic2;
import dmd.semantic3;
import dmd.target;
import dmd.utils;
import dmd.visitor;
+version (Windows)
+{
+ import core.sys.windows.winbase : getpid = GetCurrentProcessId;
+ enum PathSeparator = '\\';
+}
+else version (Posix)
+{
+ import core.sys.posix.unistd : getpid;
+ enum PathSeparator = '/';
+}
+else
+ static assert(0);
+
version (IN_GCC) {}
else version (IN_LLVM) {}
else version = MARS;
@@ -141,11 +155,7 @@ private const(char)[] getFilename(Identifier[] packages, Identifier ident) nothr
buf.writestring(p);
if (modAliases.length)
checkModFileAlias(p);
- version (Windows)
- enum FileSeparator = '\\';
- else
- enum FileSeparator = '/';
- buf.writeByte(FileSeparator);
+ buf.writeByte(PathSeparator);
}
buf.writestring(filename);
if (modAliases.length)
@@ -558,10 +568,6 @@ extern (C++) final class Module : Package
OutBuffer buf;
if (arg == "__stdin.d")
{
- version (Posix)
- import core.sys.posix.unistd : getpid;
- else version (Windows)
- import core.sys.windows.winbase : getpid = GetCurrentProcessId;
buf.printf("__stdin_%d.d", getpid());
arg = buf[];
}