From 34174badd0e3793ecf3d4d8acbc928971a91bfa6 Mon Sep 17 00:00:00 2001 From: Prajwal S N Date: Fri, 22 Sep 2023 13:17:09 +0530 Subject: [PATCH] chore(deps): add dmd library Signed-off-by: Prajwal S N --- .gitmodules | 3 +++ README.md | 10 +++++----- dmd | 1 + dub.json | 3 ++- makefile | 36 ++++++++++++++++++++++++++++++++---- 5 files changed, 43 insertions(+), 10 deletions(-) create mode 160000 dmd diff --git a/.gitmodules b/.gitmodules index d493df0..5cf3ca7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "d-test-utils"] path = d-test-utils url = https://github.com/dlang-community/d-test-utils.git +[submodule "dmd"] + path = dmd + url = https://github.com/dlang/dmd.git diff --git a/README.md b/README.md index 6c3d766..7bd2503 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ when using the **--inplace** option. ### Building from source using Make * Clone the repository -* Run ```git submodule update --init --recursive``` in the dfmt directory -* To compile with DMD, run ```make``` in the dfmt directory. To compile with - LDC, run ```make ldc``` instead. The generated binary will be placed in ```dfmt/bin/```. +* Run `git submodule update --init --recursive` in the dfmt directory +* To compile with DMD, run `make` in the dfmt directory. To compile with + LDC, run `make ldc` instead. The generated binary will be placed in `dfmt/bin/`. ### Building from source using dub * Clone the repository @@ -69,8 +69,8 @@ dfmt --inplace --space_after_cast=false --max_line_length=80 \ ``` ## Disabling formatting -Formatting can be temporarily disabled by placing the comments ```// dfmt off``` -and ```// dfmt on``` around code that you do not want formatted. +Formatting can be temporarily disabled by placing the comments `// dfmt off` +and `// dfmt on` around code that you do not want formatted. ```d void main(string[] args) diff --git a/dmd b/dmd new file mode 160000 index 0000000..b859107 --- /dev/null +++ b/dmd @@ -0,0 +1 @@ +Subproject commit b859107c37a948d0492fccb7a319f0a96b0eecb1 diff --git a/dub.json b/dub.json index a0d6357..09b59ee 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,8 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": ">=0.19.2 <1.0.0" + "libdparse": ">=0.19.2 <1.0.0", + "dmd": "~>2.105.2" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/makefile b/makefile index d790c0c..2051b1d 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,36 @@ +DMD_ROOT_SRC := \ + $(shell find dmd/compiler/src/dmd/common -name "*.d")\ + $(shell find dmd/compiler/src/dmd/root -name "*.d") +DMD_LEXER_SRC := \ + dmd/compiler/src/dmd/console.d \ + dmd/compiler/src/dmd/entity.d \ + dmd/compiler/src/dmd/errors.d \ + dmd/compiler/src/dmd/errorsink.d \ + dmd/compiler/src/dmd/location.d \ + dmd/compiler/src/dmd/file_manager.d \ + dmd/compiler/src/dmd/globals.d \ + dmd/compiler/src/dmd/id.d \ + dmd/compiler/src/dmd/identifier.d \ + dmd/compiler/src/dmd/lexer.d \ + dmd/compiler/src/dmd/tokens.d \ + dmd/compiler/src/dmd/utils.d \ + $(DMD_ROOT_SRC) + +DMD_PARSER_SRC := \ + dmd/compiler/src/dmd/astbase.d \ + dmd/compiler/src/dmd/parse.d \ + dmd/compiler/src/dmd/parsetimevisitor.d \ + dmd/compiler/src/dmd/transitivevisitor.d \ + dmd/compiler/src/dmd/permissivevisitor.d \ + dmd/compiler/src/dmd/strictvisitor.d \ + dmd/compiler/src/dmd/astenums.d \ + $(DMD_LEXER_SRC) + SRC := $(shell find src -name "*.d") \ - $(shell find libdparse/src -name "*.d") \ - $(shell find stdx-allocator/source -name "*.d") -INCLUDE_PATHS := -Ilibdparse/src -Istdx-allocator/source -Isrc -Jbin -DMD_COMMON_FLAGS := -dip25 -w $(INCLUDE_PATHS) + $(shell find stdx-allocator/source -name "*.d") \ + $(DMD_PARSER_SRC) +INCLUDE_PATHS := -Ilibdparse/src -Istdx-allocator/source -Isrc -Idmd/compiler/src -Jbin -Jdmd +DMD_COMMON_FLAGS := -w $(INCLUDE_PATHS) DMD_DEBUG_FLAGS := -debug -g $(DMD_COMMON_FLAGS) DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS) DMD_TEST_FLAGS := -unittest -g $(DMD_COMMON_FLAGS)