Changes for 0.44-beta2

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vdc/abothe/Parser"]
 	path = vdc/abothe/Parser
-	url = https://github.com/aBothe/D_Parser.git
+	url = https://github.com/rainers/D_Parser.git

CHANGES

@@ -816,7 +816,22 @@ unreleased Version 0.3.44
   * when linking with MS linker, options for the map file broke the command line
   * bugzilla 16063: missing option -L/DLL when linking a DLL with MS linker
   * added integration with msbuild and VC++ projects
-  * added installation of mago expression evalutro to Concord debug engine
+  * added installation of mago expression evaluator to Concord debug engine
   * added $(Platform) as a settings macro replacement in addition to $(PlatformName)
   * changed default output directory to $(PlatformName)/$(ConfigurationName)
   * added x64 configurations to project templates
+  * added AppVeyor integration builds
+  * cv2pdb can now be enabled independent of debug engine
+  * dustmite: error messages written to stderr not grepped
+  * added project template to build with DMD, LDC and GDC for x86 and x64
+  * VS SDK 2013 now needed to build Visual D
+  * added automatic brace completion
+  * added preliminary support for VS 2017 RC
+  * dparser: semantic analysis no longer times out after 500ms, but cancels previous requests
+  * dparser: improved performance by adding name lookup cache
+  * completion box no longer pops up if caret has been moved elsewhere
+  * menu entries now disabled if they require the focus on a D file, but it is elsewhere
+  * building a library with LDC now always adds "-oq -od=$(IntDir)" to the command line
+  * reduced idle processing by only updating the active view
+  * mago: display const modifier on type, recover string types
+  * mago concord plugin: enable conditional breakpoints

Makefile

@@ -144,7 +144,7 @@ vdserver:
 	devenv /Project "vdserver"  /Build "Release|Win32" visuald_vs10.sln
 
 dparser:
-	cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release;Platform=x86 /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
+	cd vdc\abothe && $(MSBUILD) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.0 /p:DefineConstants=NET40 /t:Rebuild
 
 vdextension:
 	cd vdextensions && $(MSBUILD) vdextensions.csproj /p:Configuration=Release;Platform=x86 /t:Rebuild
@@ -157,6 +157,9 @@ dbuild14:
 	cd msbuild\dbuild && devenv /Build "Release-v14|AnyCPU" /Project "dbuild" dbuild.sln
 #	cd msbuild\dbuild && $(MSBUILD) dbuild.sln /p:Configuration=Release;Platform="Any CPU" /t:Rebuild
 
+dbuild15:
+	cd msbuild\dbuild && devenv /Build "Release-v15|AnyCPU" /Project "dbuild" dbuild.sln
+
 mago:
 	cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoNatDE" magodbg_2010.sln
 	cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoRemote" magodbg_2010.sln
@@ -169,19 +172,22 @@ cv2pdb:
 
 dcxxfilt: $(DCXXFILT_EXE)
 $(DCXXFILT_EXE): tools\dcxxfilt.d
-	cd tools && set CONFIG=Release && build_dcxxfilt
+# no space after Release, it will be part of environment variable
+	cd tools && set CONFIG=Release&& build_dcxxfilt
 
 ##################################
 # create installer
 
 install: all cpp2d_exe idl2d_exe
+	if not exist ..\downloads\nul md ..\downloads
 	cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi
 	"$(ZIP)" -j ..\downloads\visuald_pdb.zip bin\release\visuald.pdb bin\release\vdserver.pdb
 
 install_vs: prerequisites visuald_vs vdserver cv2pdb dparser vdextension mago dcxxfilt \
 	dbuild12 dbuild14 install_only
 
 install_only:
+	if not exist ..\downloads\nul md ..\downloads
 	cd nsis && "$(NSIS)\makensis" /V1 visuald.nsi
 
 ##################################

TODO

@@ -223,4 +223,6 @@ Unsorted
 - follow theme colors for tool windows
 
 - version highlighting in files not in a project
-- does not rebuild lib if c-file recompiled
+- does not rebuild lib if c-file recompiled
+
+- cannot remove deleted project from solution

VERSION

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

appveyor.yml

@@ -0,0 +1,149 @@
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#
+
+#version: 1.0.{build}-{branch}
+
+# Do not build on tags (GitHub only)
+skip_tags: true
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Operating system (build VM template)
+
+environment:
+  matrix:
+    - os: Visual Studio 2015
+      VS: 14
+    - os: Visual Studio 2013
+      VS: 12
+
+#matrix:
+#  allow_failures:
+#    - VS: 14
+
+# scripts that are called at very beginning, before repo cloning
+init:
+  - git config --global core.autocrlf input
+
+# scripts that run after cloning repository
+install:
+  # show environment
+  - set D_COMPILER=dmd
+  - set
+  - cd c:\projects
+  # Download & extract D compiler
+  - ps: |
+        If ($Env:D_COMPILER -eq 'dmd') {
+            Start-FileDownload 'http://downloads.dlang.org/releases/2.x/2.071.1/dmd.2.071.1.windows.7z' -FileName 'dmd2.7z'
+            7z x dmd2.7z > $null
+            Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
+            c:\projects\dmd2\windows\bin\dmd.exe --version
+        } Else {
+            If ($Env:D_COMPILER -eq 'dmd-nightly') {
+                Start-FileDownload 'http://nightlies.dlang.org/dmd-nightly/dmd.master.windows.7z' -FileName 'dmd2.7z'
+                7z x dmd2.7z > $null
+                Set-Item -path env:DMD -value c:\projects\dmd2\windows\bin\dmd.exe
+                c:\projects\dmd2\windows\bin\dmd.exe --version
+            } Else {
+                # LDC unsupported so far
+                If ($Env:D_COMPILER -eq 'ldc') {
+                    Start-FileDownload 'http://github.com/ldc-developers/ldc/releases/download/v1.0.0/ldc2-1.0.0-win64-msvc.zip' -FileName 'ldc2.zip'
+                    7z x ldc2.zip > $null
+                    Set-Item -path env:DMD -value c:\projects\ldc2-1.0.0-win64-msvc\bin\ldmd2.exe
+                    c:\projects\ldc2-1.0.0-win64-msvc\bin\ldc2 --version
+                }
+            }
+        }
+  # Download & extract coffimplib.exe (no longer available publically as a single download)
+  - ps: |
+        Start-FileDownload 'http://ftp.digitalmars.com/Digital_Mars_C++/Patch/cd851.zip' -FileName 'cd851.zip'
+        7z x cd851.zip > $null
+        copy c:\projects\dm\bin\coffimplib.exe c:\projects\dmd2\windows\bin
+  # Download & install Visual D
+  - ps: |
+        Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v0.3.43/VisualD-v0.3.43.exe' -FileName 'VisualD-v0.3.43.exe'
+  - .\VisualD-v0.3.43.exe /S
+  # configure DMD path
+  - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\12.0\ToolsOptionsPages\Projects\Visual D Settings" /v DMDInstallDir /t REG_SZ /d c:\projects\dmd2 /reg:32 /f
+  - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\ToolsOptionsPages\Projects\Visual D Settings" /v DMDInstallDir /t REG_SZ /d c:\projects\dmd2 /reg:32 /f
+  # disable link dependencies monitoring, fails on AppVeyor server
+  - reg add "HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\ToolsOptionsPages\Projects\Visual D Settings" /v optlinkDeps /t REG_DWORD /d 0 /reg:32 /f
+  # Set environment variables
+  - set PATH=c:\projects\dm\bin;%PATH%
+  - call "c:\Program Files (x86)\Microsoft Visual Studio %VS%.0\VC\vcvarsall.bat" x86
+  # Print environment info
+  - set
+  - msbuild /version
+  - cl
+
+#---------------------------------#
+#       build configuration       #
+#---------------------------------#
+
+before_build:
+  - cd c:\projects
+
+build_script:
+  - cd c:\projects
+  - cd visuald
+  # ignore failure once, in case it needs reloading the sdk project
+  - nmake prerequisites || nmake prerequisites
+  # build Visual D
+  - nmake visuald_vs
+  # Fetch submodules
+  - git submodule update --init --recursive
+  - cd ..
+  # Clone mago/cv2pdb (need to be two levels up)
+  - cd ..
+  - git clone https://github.com/rainers/mago.git mago
+  - set VS_SDK_PATH=%VSSDK120Install%
+  - copy mago\PropSheets\Template_MagoDbg_properties.props mago\PropSheets\MagoDbg_properties.props
+  - md cv2pdb
+  - cd cv2pdb
+  - git clone https://github.com/rainers/cv2pdb.git trunk
+  - cd ..
+  # Download & extract binutils
+  - cd projects
+  - ps: |
+        Start-FileDownload 'http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.gz' -FileName 'binutils-2.25.tar.gz'
+        7z x binutils-2.25.tar.gz > $null
+        7z x binutils-2.25.tar > $null
+  - 'if "%VS%"=="12" echo #define snprintf _snprintf >binutils-2.25\config.h'
+  - 'if "%VS%"=="14" echo // empty                   >binutils-2.25\config.h'
+  - set BINUTILS=c:\projects\binutils-2.25
+  - set DMDINSTALLDIR=c:\projects\dmd2
+  # build installer
+  - cd visuald
+  - nmake install_vs
+
+after_build:
+  # publish as artifact
+  - cd c:\projects
+  - 7z a logs_and_symbols.7z -r visuald\bin\*.pdb visuald\bin\*.html
+  - for %%I in (downloads\*.exe) do (set BUILD_EXE=%%I && set ARTIFACT=%%~dpnI-%APPVEYOR_BUILD_NUMBER%-vs%VS%.exe)
+  - copy %BUILD_EXE% %ARTIFACT%
+  - ps: |
+        If ($Env:VS -eq '12') {
+            echo 'Creating artifacts...'
+            Push-AppveyorArtifact $Env:ARTIFACT
+            Push-AppveyorArtifact ..\cv2pdb\trunk\bin\Release\cv2pdb.exe
+            Push-AppveyorArtifact visuald\bin\Release\pipedmd.exe
+            Push-AppveyorArtifact logs_and_symbols.7z
+        }
+
+on_failure:
+  - cd c:\projects
+  - 7z a logs.7z -r visuald\bin\*.html
+  - ps: |
+        echo 'Publishing log files...'
+        Push-AppveyorArtifact logs.7z
+
+#---------------------------------#
+#       test configuration        #
+#---------------------------------#
+
+test_script:
+  - cd c:\projects

build/build.visualdproj

@@ -218,6 +218,6 @@ call $(InputPath) "$(OutDir)\vsi2d.exe" "$(OutDir)\sdk.success&qu
   <File path="sdk_libs.bat" customcmd="call &quot;$(VSINSTALLDIR)\Common7\Tools\vsvars32.bat&quot;
 if errorlevel 1 goto reportError
 call $(InputPath) &quot;$(OutDir)\vsi2d.exe&quot; &quot;$(OutDir)\sdk_libs.success&quot;" tool="Custom" outfile="$(OutDir)\sdk_libs.success" />
-  <File path="..\tools\tlb2idl.d" customcmd="dmd -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) oleaut32.lib uuid.lib" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
+  <File path="..\tools\tlb2idl.d" customcmd="dmd -d -map $(OutDir)\$(InputName).map -of$(OutDir)\$(InputName).exe $(InputPath) oleaut32.lib uuid.lib" tool="Custom" outfile="$(OutDir)\$(InputName).exe" />
  </Folder>
 </DProject>

build/sdk.bat

@@ -19,6 +19,7 @@ if not exist ..\sdk\vsi\nul     md ..\sdk\vsi
 if not exist ..\sdk\win32\nul   md ..\sdk\win32
 if not exist %DTE_IDL_PATH%\nul md %DTE_IDL_PATH%
 
+if "%WindowsSDKVersion%" == "\" set WindowsSDKVersion=%UCRTVersion%
 if "%WindowsSDKVersion%" == "" set WindowsSDKVersion=%UCRTVersion%
 set WINSDKINC=
 if not "%WindowsSDKVersion%" == "" if exist "%WindowsSdkDir%\include\%WindowsSDKVersion%\um\windows.h" set WINSDKINC=%WindowsSdkDir%\include\%WindowsSDKVersion%

build/sdk_libs.bat

@@ -28,8 +28,8 @@ if "%WINSDKLIB%" == "" if exist "%WindowsSdkDir%\lib\kernel32.lib" set WINSDKLIB
 if "%WINSDKLIB%" == "" (echo Error: could not detect the Windows SDK library folder && exit /B 1)
 
 set COFFIMPLIB=c:\l\dmc\bin\coffimplib.exe
-%coffimplib% >nul 2>&1
-if errorlevel 9000 set COFFIMPLIB=coffimplib
+if not exist %COFFIMPLIB% set COFFIMPLIB=%DMDInstallDir%\windows\bin\coffimplib.exe
+if not exist %COFFIMPLIB% set COFFIMPLIB=coffimplib
 %coffimplib% >nul 2>&1
 if errorlevel 9000 (echo Error: cannot execute %COFFIMPLIB%, please add to PATH && exit /B 1)
 

build_doc.bat

@@ -0,0 +1,34 @@
+set DMD=c:\s\d\rainers\windows\bin\dmd.exe
+rem set WEB=m:\s\d\rainers\web\visuald
+set WEB=c:\s\d\visuald\gh-pages\visuald
+
+set SRC=      doc/ReportingBugs.dd
+set SRC=%SRC% doc/StartPage.dd
+set SRC=%SRC% doc/ReportingBugs.dd
+set SRC=%SRC% doc/BuildFromSource.dd
+set SRC=%SRC% doc/KnownIssues.dd
+set SRC=%SRC% doc/Installation.dd
+set SRC=%SRC% doc/BrowseInfo.dd
+set SRC=%SRC% doc/Profiling.dd
+set SRC=%SRC% doc/Coverage.dd
+set SRC=%SRC% doc/CppConversion.dd
+set SRC=%SRC% doc/Debugging.dd
+set SRC=%SRC% doc/ProjectConfig.dd
+set SRC=%SRC% doc/TokenReplace.dd
+set SRC=%SRC% doc/Search.dd
+set SRC=%SRC% doc/Editor.dd
+set SRC=%SRC% doc/ProjectWizard.dd
+set SRC=%SRC% doc/GlobalOptions.dd
+set SRC=%SRC% doc/Features.dd
+set SRC=%SRC% doc/VersionHistory.dd
+set SRC=%SRC% doc/News36.dd
+set SRC=%SRC% doc/CompileCommands.dd
+set SRC=%SRC% doc/DustMite.dd
+
+set DDOC=doc/macros.ddoc doc/html.ddoc ..\..\rainers\d-programming-language.org\dlang.org.ddoc doc/visuald.ddoc
+
+if not exist %WEB% md %WEB%
+if not exist %WEB%\images md %WEB%\images
+cp -u doc/images/* %WEB%\images
+%DMD% -Dd%WEB% -o- -w %DDOC% %SRC%
+

c2d/ast.d

@@ -1626,7 +1626,7 @@ class Expression : AST
 			case Token.Or:             return v1 | v2;
 			case Token.AmpAmpersand:   return v1 && v2;
 			case Token.OrOr:           return v1 || v2;
-			case Token.Comma:          return v1, v2;
+			case Token.Comma:          return /*v1,*/ v2;
 			case Token.Tilde:
 			case Token.Unordered:
 			case Token.UnordGreater: