Merge pull request #104 from rainers/master

Visual D 0.48.0-rc1

CHANGES

@@ -1014,6 +1014,8 @@ unreleased Version 0.48.0
       longer set in sc.ini since dmd 2.079
     - removed option "additional linker options", it was invisible anyway
     - rearrange settings to better show their scope
+  * build system
+    - fixed linking link privatephobos.lib if intermediate dir different from output dir
   * dparser
     - semantic analysis did not work if "parse source for syntax errors" was disabled
     - 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
     - detect AA if type ends with "]", but not with "[]"
     - fix crash in VS if a value is marked expandable, but doesn't yield any children
     - fix .ptr property of static array if it is a struct/class member
+    - add option to disable strings to be expandable
+    - support showing closure and capture variables as locals for dmd 2.084
   * cv2pdb
     - can now detect VS2017 via Setup-COM-API
     - some DWARF fixes
-  * when pasting code to D source file newlines are adapted to surrounding code
+  * editor
+    - when pasting code to D source file newlines are adapted to surrounding code
+    - added outlining for case statements
+    - implemented commands View.PopBrowsContext and View.ForwardBrowseContext
+    - reindent if multiple lines added by completion
+    - tweaked formatting for enumerators, struct and array initializers
+    - added option to not indent case statements
   * fixed "Compile and Run" on selection
   * fix help via F1 for dmd 2.072+

Makefile

@@ -26,7 +26,7 @@
 
 NSIS    = $(PROGRAMFILES)\NSIS
 MSBUILD = msbuild
-MSBUILD15 = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild" 
+MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild" 
 CONFIG  = Release COFF32
 
 ##############################################################
@@ -45,14 +45,18 @@ prerequisites:
 visuald_vs:
 	devenv /Project "visuald"   /Build "$(CONFIG)|Win32" visuald_vs10.sln
 
+visuald_test:
+	devenv /Project "visuald"   /Build "TestDebug|Win32" visuald_vs10.sln
+	bin\TestDebug\VisualD\VisualD.exe
+
 vdserver:
 	devenv /Project "vdserver"  /Build "$(CONFIG)|Win32" visuald_vs10.sln
 
 dparser:
 	cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5 /p:DefineConstants=NET40 /t:Rebuild
 
 dparser_test:
-	dotnet test vdc\abothe\VDServer.sln -c Release
+	set PLATFORM="Any CPU" && dotnet test vdc\abothe\VDServer.sln -c Release
 
 fake_dparser:
 	if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer

VERSION

@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      0
 #define VERSION_MINOR      48
 #define VERSION_REVISION   0
-#define VERSION_BETA       -beta
-#define VERSION_BUILD      3
+#define VERSION_BETA       -rc
+#define VERSION_BUILD      1

appveyor.yml

@@ -27,7 +27,7 @@ environment:
 
 # cache relative to C:\projects\visuald
 cache:
-  - C:\projects\cache\dmd2080_0.7z
+  - C:\projects\cache\dmd2083_0.7z
   - C:\projects\cache\cd851.zip
   - C:\projects\cache\VisualD-v0.47.0.exe
   - C:\projects\cache\binutils-2.25.tar.gz
@@ -50,10 +50,10 @@ install:
   # Download & extract D compiler
   - ps: |
         If ($Env:D_COMPILER -eq 'dmd') {
-            If (-not (Test-Path 'cache\dmd2080_0.7z')) {
-                Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.080.0/dmd.2.080.0.windows.7z' -FileName 'cache\dmd2080_0.7z'
+            If (-not (Test-Path 'cache\dmd2083_0.7z')) {
+                Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.083.0/dmd.2.083.0.windows.7z' -FileName 'cache\dmd2083_0.7z'
             }
-            7z x cache\dmd2080_0.7z > $null
+            7z x cache\dmd2083_0.7z > $null
             Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
             c:\projects\dmd2\windows\bin\dmd.exe --version
         } ElseIf ($Env:D_COMPILER -eq 'dmd-nightly') {
@@ -108,6 +108,8 @@ build_script:
   - nmake prerequisites || nmake prerequisites
   # build Visual D
   - nmake visuald_vs
+  # build and run Visual D unittests
+  - nmake visuald_test
   # Fetch submodules
   - git submodule update --init --recursive
   - cd ..

c2d/ast.d

@@ -3179,6 +3179,12 @@ unittest
 	AST ast = testAST(txt);
 }
 
+unittest
+{
+	string txt = "template<> struct S {};"; // cannot deal with specializations, though
+	AST ast = testAST(txt);
+}
+
 unittest
 {
 	string txt = "typedef void (__noexpr __stdcall *fn)();";