From 1d8e8f341c36fb703b29bcbf411200836035ad54 Mon Sep 17 00:00:00 2001 From: lucica28 <57060141+lucica28@users.noreply.github.com> Date: Wed, 10 Aug 2022 08:43:58 +0100 Subject: [PATCH] Update dmd (#23) * Update README * Add dmd-as-a-library submodule (#2) * Add GH Actions build script (#4) * Removed libdparse from imports print functionality (#3) * Fix failing tester + add unittest for imports (#7) * Add style checker (#9) * Update action to build dlang fork * Fix linter errors * Add dmd dependencies to dub.json * Add dmd dependencies to build.bat * Replace libdparse in enum array functionality * replace libdparse in objectconst functionality + unittests integration with dmd (#17) * replace libdparse in objectconst functionality + unittests integration with dmd * updated dmd * run tests * use templates * visit aggregate declaration * updated dmd * solve linter seg fault * get rid of dup + refactor * fix typo * update dmd to latest version Co-authored-by: RazvanN7 Co-authored-by: Eduard Staniloiu --- build.bat | 44 ++++++++++++++++++++++---------------------- dmd | 2 +- makefile | 40 ++++++++++++++++++++-------------------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/build.bat b/build.bat index 999c861..8bffe67 100644 --- a/build.bat +++ b/build.bat @@ -30,29 +30,29 @@ set CONTAINERS= set LIBDDOC= set DMD_ROOT_SRC= -for %%x in (dmd\src\dmd\common\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x -for %%x in (dmd\src\dmd\root\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x +for %%x in (dmd\compiler\src\dmd\common\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x +for %%x in (dmd\compiler\src\dmd\root\*.d) do set DMD_ROOT_SRC=!DMD_ROOT_SRC! %%x set DMD_LEXER_SRC=^ - dmd\src\dmd\console.d ^ - dmd\src\dmd\entity.d ^ - dmd\src\dmd\errors.d ^ - dmd\src\dmd\file_manager.d ^ - dmd\src\dmd\globals.d ^ - dmd\src\dmd\id.d ^ - dmd\src\dmd\identifier.d ^ - dmd\src\dmd\lexer.d ^ - dmd\src\dmd\tokens.d ^ - dmd\src\dmd\utils.d + dmd\compiler\src\dmd\console.d ^ + dmd\compiler\src\dmd\entity.d ^ + dmd\compiler\src\dmd\errors.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 set DMD_PARSER_SRC=^ - dmd\src\dmd\astbase.d ^ - dmd\src\dmd\parse.d ^ - dmd\src\dmd\parsetimevisitor.d ^ - dmd\src\dmd\transitivevisitor.d ^ - dmd\src\dmd\permissivevisitor.d ^ - dmd\src\dmd\strictvisitor.d ^ - dmd\src\dmd\astenums.d + 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 for %%x in (src\dscanner\*.d) do set CORE=!CORE! %%x for %%x in (src\dscanner\analysis\*.d) do set ANALYSIS=!ANALYSIS! %%x @@ -88,7 +88,7 @@ if "%1" == "test" goto test_cmd -I"containers\src"^ -I"libddoc\src"^ -I"libddoc\common\source"^ - -I"dmd\src"^ + -I"dmd\compiler\src"^ -ofbin\dscanner.exe goto eof @@ -109,7 +109,7 @@ set TESTNAME="bin\dscanner-unittest" -I"DCD\dsymbol\src"^ -I"containers\src"^ -I"libddoc\src"^ - -I"dmd\src"^ + -I"dmd\compiler\src"^ -lib %TESTFLAGS%^ -of%TESTNAME%.lib if exist %TESTNAME%.lib %DC% %MFLAGS%^ @@ -123,7 +123,7 @@ if exist %TESTNAME%.lib %DC% %MFLAGS%^ -I"containers\src"^ -I"libddoc\src"^ -I"libddoc\common\source"^ - -I"dmd\src"^ + -I"dmd\compiler\src"^ -unittest^ %TESTFLAGS%^ -of%TESTNAME%.exe diff --git a/dmd b/dmd index ac5f925..fa4ce7b 160000 --- a/dmd +++ b/dmd @@ -1 +1 @@ -Subproject commit ac5f925c8b942c2b338f2831c21b11ddfd1aad87 +Subproject commit fa4ce7b89a7911f1097d32fab691ff8dfef40588 diff --git a/makefile b/makefile index e35818b..31df844 100644 --- a/makefile +++ b/makefile @@ -6,29 +6,29 @@ DMD := $(DC) GDC := gdc LDC := ldc2 DMD_ROOT_SRC := \ - $(shell find dmd/src/dmd/common -name "*.d")\ - $(shell find dmd/src/dmd/root -name "*.d") + $(shell find dmd/compiler/src/dmd/common -name "*.d")\ + $(shell find dmd/compiler/src/dmd/root -name "*.d") DMD_LEXER_SRC := \ - dmd/src/dmd/console.d \ - dmd/src/dmd/entity.d \ - dmd/src/dmd/errors.d \ - dmd/src/dmd/file_manager.d \ - dmd/src/dmd/globals.d \ - dmd/src/dmd/id.d \ - dmd/src/dmd/identifier.d \ - dmd/src/dmd/lexer.d \ - dmd/src/dmd/tokens.d \ - dmd/src/dmd/utils.d \ + dmd/compiler/src/dmd/console.d \ + dmd/compiler/src/dmd/entity.d \ + dmd/compiler/src/dmd/errors.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/src/dmd/astbase.d \ - dmd/src/dmd/parse.d \ - dmd/src/dmd/parsetimevisitor.d \ - dmd/src/dmd/transitivevisitor.d \ - dmd/src/dmd/permissivevisitor.d \ - dmd/src/dmd/strictvisitor.d \ - dmd/src/dmd/astenums.d \ + 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) LIB_SRC := \ @@ -69,7 +69,7 @@ INCLUDE_PATHS = \ -Icontainers/src \ -Ilibddoc/src \ -Ilibddoc/common/source \ - -Idmd/src + -Idmd/compiler/src DMD_VERSIONS = -version=StdLoggerDisableWarning -version=CallbackAPI -version=DMDLIB -version=MARS DMD_DEBUG_VERSIONS = -version=dparse_verbose