diff --git a/CODEOWNERS b/CODEOWNERS index 45d602b3c6..7d114c3daa 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -10,31 +10,31 @@ # when someone opens a pull request that modifies code that they own. # Later matches take precedence. -src/ddmd/access.d @MartinNowak -src/ddmd/astbase* @RazvanN7 -src/ddmd/astcodegen.d @RazvanN7 -src/ddmd/asttypename.d @UplinkCoder -src/ddmd/builtin.d @klickvebot @WalterBright -src/ddmd/cond.d @mathias-lang-sociomantic @Geod24 -src/ddmd/console.d @CyberShadow -src/ddmd/cppmangle.d @ibuclaw -src/ddmd/ctfeexpr.d @UplinkCoder -src/ddmd/doc.d @andralex @jacob-carlborg -src/ddmd/hdrgen.d @UplinkCoder @WalterBright -src/ddmd/mars.d @MartinNowak @mathias-lang-sociomantic @Geod24 @rainers @UplinkCoder @WalterBright -src/ddmd/objc* @jacob-carlborg -src/ddmd/permissivevisitor.d @RazvanN7 -src/ddmd/target.d @ibuclaw @MartinNowak -src/ddmd/transitivevisitor.d @RazvanN7 -src/ddmd/vcbuild @rainers +src/dmd/access.d @MartinNowak +src/dmd/astbase* @RazvanN7 +src/dmd/astcodegen.d @RazvanN7 +src/dmd/asttypename.d @UplinkCoder +src/dmd/builtin.d @klickvebot @WalterBright +src/dmd/cond.d @mathias-lang-sociomantic @Geod24 +src/dmd/console.d @CyberShadow +src/dmd/cppmangle.d @ibuclaw +src/dmd/ctfeexpr.d @UplinkCoder +src/dmd/doc.d @andralex @jacob-carlborg +src/dmd/hdrgen.d @UplinkCoder @WalterBright +src/dmd/mars.d @MartinNowak @mathias-lang-sociomantic @Geod24 @rainers @UplinkCoder @WalterBright +src/dmd/objc* @jacob-carlborg +src/dmd/permissivevisitor.d @RazvanN7 +src/dmd/target.d @ibuclaw @MartinNowak +src/dmd/transitivevisitor.d @RazvanN7 +src/dmd/vcbuild @rainers # GitHub's implementation of the CODEOWNERS format is buggy, so this might not work -src/ddmd/*.h @ibuclaw +src/dmd/*.h @ibuclaw -src/ddmd/* @WalterBright -src/ddmd/backend/* @WalterBright -src/ddmd/root/* @WalterBright -src/ddmd/tk/* @WalterBright +src/dmd/* @WalterBright +src/dmd/backend/* @WalterBright +src/dmd/root/* @WalterBright +src/dmd/tk/* @WalterBright # CI & automation posix.mak @CyberShadow @MartinNowak @wilzbach diff --git a/dub.sdl b/dub.sdl index c2076a5f63..feeb263728 100644 --- a/dub.sdl +++ b/dub.sdl @@ -10,7 +10,7 @@ dependency ":parser" version="*" subPackage { name "root" targetType "library" - sourcePaths "src/ddmd/root" + sourcePaths "src/dmd/root" } subPackage { @@ -19,15 +19,15 @@ subPackage { sourcePaths sourceFiles \ - "src/ddmd/console.d" \ - "src/ddmd/entity.d" \ - "src/ddmd/errors.d" \ - "src/ddmd/globals.d" \ - "src/ddmd/id.d" \ - "src/ddmd/identifier.d" \ - "src/ddmd/lexer.d" \ - "src/ddmd/tokens.d" \ - "src/ddmd/utf.d" + "src/dmd/console.d" \ + "src/dmd/entity.d" \ + "src/dmd/errors.d" \ + "src/dmd/globals.d" \ + "src/dmd/id.d" \ + "src/dmd/identifier.d" \ + "src/dmd/lexer.d" \ + "src/dmd/tokens.d" \ + "src/dmd/utf.d" preGenerateCommands `cd "$${DUB_PACKAGE_DIR}" && ./config.sh generated/dub VERSION /etc` stringImportPaths "generated/dub" @@ -41,11 +41,11 @@ subPackage { sourcePaths sourceFiles \ - "src/ddmd/astbase.d" \ - "src/ddmd/parse.d" \ - "src/ddmd/transitivevisitor.d" \ - "src/ddmd/permissivevisitor.d" \ - "src/ddmd/strictvisitor.d" + "src/dmd/astbase.d" \ + "src/dmd/parse.d" \ + "src/dmd/transitivevisitor.d" \ + "src/dmd/permissivevisitor.d" \ + "src/dmd/strictvisitor.d" dependency "dmd:lexer" version="*" } diff --git a/src/posix.mak b/src/posix.mak index a52615934b..44be46a1fd 100644 --- a/src/posix.mak +++ b/src/posix.mak @@ -70,7 +70,7 @@ SYSCONFDIR=/etc TMP?=/tmp PGO_DIR=$(abspath pgo) -D = ddmd +D = dmd C=$D/backend TK=$D/tk @@ -630,10 +630,10 @@ HTMLS=$(addprefix $(DOC_OUTPUT_DIR)/, \ $(call D2HTML, $(SRC_DOCUMENTABLES))) # For each module, define a rule e.g.: -# ../web/phobos/ddmd_mars.html : ddmd/mars.d $(STDDOC) ; ... +# ../web/phobos/dmd_mars.html : dmd/mars.d $(STDDOC) ; ... $(foreach p,$(SRC_DOCUMENTABLES),$(eval \ $(DOC_OUTPUT_DIR)/$(call D2HTML,$p) : $p $(STDDOC) $(HOST_DMD_PATH) ;\ - $(HOST_DMD_RUN) -of- $(MODEL_FLAG) -J$G -J../res -c -Dd$(DOCSRC) -Iddmd\ + $(HOST_DMD_RUN) -of- $(MODEL_FLAG) -J$G -J../res -c -Dd$(DOCSRC) -Idmd\ $(DFLAGS) project.ddoc $(STDDOC) -Df$$@ $$<)) $(DOC_OUTPUT_DIR) : diff --git a/src/vcbuild/dmd.visualdproj b/src/vcbuild/dmd.visualdproj index 061b7bb8b0..b076736b1a 100644 --- a/src/vcbuild/dmd.visualdproj +++ b/src/vcbuild/dmd.visualdproj @@ -412,156 +412,156 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/vcbuild/dmd_backend.vcxproj b/src/vcbuild/dmd_backend.vcxproj index 3a21194156..7a6675a3f1 100644 --- a/src/vcbuild/dmd_backend.vcxproj +++ b/src/vcbuild/dmd_backend.vcxproj @@ -55,7 +55,7 @@ - $(IntDir)generated\ddmd;$(IntDir)generated;..\ddmd\root;..\ddmd\tk;..\ddmd\backend;.;.;..;%(AdditionalIncludeDirectories) + $(IntDir)generated\dmd;$(IntDir)generated;..\dmd\root;..\dmd\tk;..\dmd\backend;.;.;..;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;TARGET_WINDOS%(PreprocessorDefinitions) TARGET_WINDOS;%(PreprocessorDefinitions) MultiThreadedDebug @@ -85,160 +85,160 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true - + true - + true - + true - - - + + + Building and running $(IntDir)%(Filename).exe - cl /TP /I..\ddmd\tk /I..\ddmd\root /I. /I.. /FIwarnings.h /Fo"$(IntDir)%(Filename).obj" /Fe"$(IntDir)generated\%(Filename).exe" "%(FullPath)" + cl /TP /I..\dmd\tk /I..\dmd\root /I. /I.. /FIwarnings.h /Fo"$(IntDir)%(Filename).obj" /Fe"$(IntDir)generated\%(Filename).exe" "%(FullPath)" if errorlevel 1 exit /B %ERRORLEVEL% pushd $(IntDir)generated "%(Filename).exe" if errorlevel 1 exit /B %ERRORLEVEL% popd $(IntDir)generated\optab.c;$(IntDir)generated\debtab.c;$(IntDir)generated\cdxxx.c;$(IntDir)generated\elxxx.c;$(IntDir)generated\tytab.c;$(IntDir)generated\\fltables.c;%(Outputs) - ..\ddmd\backend\cc.h;..\ddmd\backend\oper.h;%(AdditionalInputs) + ..\dmd\backend\cc.h;..\dmd\backend\oper.h;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/vcbuild/dmd_backend.vcxproj.filters b/src/vcbuild/dmd_backend.vcxproj.filters index 675fe9eefd..2f5d593ae1 100644 --- a/src/vcbuild/dmd_backend.vcxproj.filters +++ b/src/vcbuild/dmd_backend.vcxproj.filters @@ -1,19 +1,19 @@  - + {6b846289-f779-413a-b14c-51ac8055587b} - + {853090e1-9436-40d8-b439-b8dbbc2c7fa1} - + {2db94531-cc9e-4df8-bd77-c22e38022b15} - + {f109049a-11c8-4419-bdda-9d44c65b2900} - + {8f21dd4e-1670-48be-9a72-1dccf0c17166} @@ -21,391 +21,391 @@ - - ddmd + + dmd - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - + src - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\backend + + dmd\backend - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\tk + + dmd\tk - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root - - ddmd\root + + dmd\root vcbuild @@ -419,31 +419,31 @@ vcbuild - + src - + src - + src - + src - + src - - ddmd\gen + + dmd\gen vcbuild - - ddmd\gen + + dmd\gen \ No newline at end of file diff --git a/src/win32.mak b/src/win32.mak index 00f3a86f15..5eeccb8b4e 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -62,7 +62,7 @@ OS=windows ##### Directories # DMD source directories -D=ddmd +D=dmd C=$D\backend TK=$D\tk ROOT=$D\root diff --git a/src/win64.mak b/src/win64.mak index 67843ed0d4..7ad3243f06 100644 --- a/src/win64.mak +++ b/src/win64.mak @@ -15,7 +15,7 @@ OS=windows .d.exe: $(HOST_DC) -of$@ $< -D=ddmd +D=dmd GEN = ..\generated G = $(GEN)\$(OS)\$(BUILD)\$(MODEL) OBJ_MSVC=$G/strtold.obj $G\longdouble.obj $G\ldfpu.obj