Skip to content

Commit a744cc6

Browse files
authored
Merge pull request #104 from rainers/master
Visual D 0.48.0-rc1
2 parents 2827959 + 3b855b8 commit a744cc6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1521
-537
lines changed

CHANGES

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,8 @@ unreleased Version 0.48.0
10141014
longer set in sc.ini since dmd 2.079
10151015
- removed option "additional linker options", it was invisible anyway
10161016
- rearrange settings to better show their scope
1017+
* build system
1018+
- fixed linking link privatephobos.lib if intermediate dir different from output dir
10171019
* dparser
10181020
- semantic analysis did not work if "parse source for syntax errors" was disabled
10191021
- no semantic info for a package if any file in the package has fatal parser error
@@ -1035,9 +1037,17 @@ unreleased Version 0.48.0
10351037
- detect AA if type ends with "]", but not with "[]"
10361038
- fix crash in VS if a value is marked expandable, but doesn't yield any children
10371039
- fix .ptr property of static array if it is a struct/class member
1040+
- add option to disable strings to be expandable
1041+
- support showing closure and capture variables as locals for dmd 2.084
10381042
* cv2pdb
10391043
- can now detect VS2017 via Setup-COM-API
10401044
- some DWARF fixes
1041-
* when pasting code to D source file newlines are adapted to surrounding code
1045+
* editor
1046+
- when pasting code to D source file newlines are adapted to surrounding code
1047+
- added outlining for case statements
1048+
- implemented commands View.PopBrowsContext and View.ForwardBrowseContext
1049+
- reindent if multiple lines added by completion
1050+
- tweaked formatting for enumerators, struct and array initializers
1051+
- added option to not indent case statements
10421052
* fixed "Compile and Run" on selection
10431053
* fix help via F1 for dmd 2.072+

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
NSIS = $(PROGRAMFILES)\NSIS
2828
MSBUILD = msbuild
29-
MSBUILD15 = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
29+
MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
3030
CONFIG = Release COFF32
3131

3232
##############################################################
@@ -45,14 +45,18 @@ prerequisites:
4545
visuald_vs:
4646
devenv /Project "visuald" /Build "$(CONFIG)|Win32" visuald_vs10.sln
4747

48+
visuald_test:
49+
devenv /Project "visuald" /Build "TestDebug|Win32" visuald_vs10.sln
50+
bin\TestDebug\VisualD\VisualD.exe
51+
4852
vdserver:
4953
devenv /Project "vdserver" /Build "$(CONFIG)|Win32" visuald_vs10.sln
5054

5155
dparser:
5256
cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5 /p:DefineConstants=NET40 /t:Rebuild
5357

5458
dparser_test:
55-
dotnet test vdc\abothe\VDServer.sln -c Release
59+
set PLATFORM="Any CPU" && dotnet test vdc\abothe\VDServer.sln -c Release
5660

5761
fake_dparser:
5862
if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer

VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define VERSION_MAJOR 0
22
#define VERSION_MINOR 48
33
#define VERSION_REVISION 0
4-
#define VERSION_BETA -beta
5-
#define VERSION_BUILD 3
4+
#define VERSION_BETA -rc
5+
#define VERSION_BUILD 1

appveyor.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ environment:
2727

2828
# cache relative to C:\projects\visuald
2929
cache:
30-
- C:\projects\cache\dmd2080_0.7z
30+
- C:\projects\cache\dmd2083_0.7z
3131
- C:\projects\cache\cd851.zip
3232
- C:\projects\cache\VisualD-v0.47.0.exe
3333
- C:\projects\cache\binutils-2.25.tar.gz
@@ -50,10 +50,10 @@ install:
5050
# Download & extract D compiler
5151
- ps: |
5252
If ($Env:D_COMPILER -eq 'dmd') {
53-
If (-not (Test-Path 'cache\dmd2080_0.7z')) {
54-
Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.080.0/dmd.2.080.0.windows.7z' -FileName 'cache\dmd2080_0.7z'
53+
If (-not (Test-Path 'cache\dmd2083_0.7z')) {
54+
Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.083.0/dmd.2.083.0.windows.7z' -FileName 'cache\dmd2083_0.7z'
5555
}
56-
7z x cache\dmd2080_0.7z > $null
56+
7z x cache\dmd2083_0.7z > $null
5757
Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
5858
c:\projects\dmd2\windows\bin\dmd.exe --version
5959
} ElseIf ($Env:D_COMPILER -eq 'dmd-nightly') {
@@ -108,6 +108,8 @@ build_script:
108108
- nmake prerequisites || nmake prerequisites
109109
# build Visual D
110110
- nmake visuald_vs
111+
# build and run Visual D unittests
112+
- nmake visuald_test
111113
# Fetch submodules
112114
- git submodule update --init --recursive
113115
- cd ..

c2d/ast.d

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,6 +3179,12 @@ unittest
31793179
AST ast = testAST(txt);
31803180
}
31813181

3182+
unittest
3183+
{
3184+
string txt = "template<> struct S {};"; // cannot deal with specializations, though
3185+
AST ast = testAST(txt);
3186+
}
3187+
31823188
unittest
31833189
{
31843190
string txt = "typedef void (__noexpr __stdcall *fn)();";

0 commit comments

Comments
 (0)