Merge pull request #103 from rainers/master

Visual D 0.48 beta 3
dlang · Nov 10, 2018 · 2827959 · 2827959
2 parents 72df0fe + 9da121e
commit 2827959
Show file tree

Hide file tree

Showing 41 changed files with 2,969 additions and 1,993 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1022,6 +1022,7 @@ unreleased Version 0.48.0
     - added experimental option to show value of constants in tooltip
     - the last user specified version was prepended to "Windows"
     - predefined versions now evaluated by compiler invocation
+    - experimental: option to enable semantic identifier highlighting
   * mago
     - added option to show base class fields as direct fields
     - allow suffix 'h' for hex numbers for better interoperablility with VS disassembly
@@ -1031,6 +1032,9 @@ unreleased Version 0.48.0
     - concord: allow dragging addresses to the disassembly window
     - engine: Fix the way the debugger steps over instructions with REP prefix.
     - engine: the disassemble view now supports SSE4 and AVX
+    - 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
   * cv2pdb
     - can now detect VS2017 via Setup-COM-API
     - some DWARF fixes

diff --git a/Makefile b/Makefile
@@ -51,6 +51,9 @@ vdserver:
 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
+
 fake_dparser:
 	if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer
 	if exist "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" copy "$(PROGRAMFILES)\VisualD\dparser\dparser\DParserCOMServer.exe" bin\Release\DParserCOMServer
@@ -118,13 +121,13 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
 ##################################
 # create installer
 
-install_release_modules: install_modules dparser cv2pdb mago dbuild12 dbuild14 dbuild15
+install_release_modules: install_modules dparser dparser_test cv2pdb mago dbuild12 dbuild14 dbuild15
 
 install_vs: install_release_modules install_only
 
 install_vs_no_vs2017:   install_modules fake_dparser cv2pdb mago dbuild12 dbuild14 fake_dbuild15 install_only
 
-install_vs_only_vs2017: install_modules dparser cv2pdb_vs15 mago_vs15 fake_dbuild12 fake_dbuild14 dbuild15 install_only
+install_vs_only_vs2017: install_modules dparser dparser_test cv2pdb_vs15 mago_vs15 fake_dbuild12 fake_dbuild14 dbuild15 install_only
 
 install_modules: prerequisites visuald_vs vdserver vdextension visualdwizard dcxxfilt
 

diff --git a/VERSION b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      48
 #define VERSION_REVISION   0
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      2
+#define VERSION_BUILD      3
diff --git a/appveyor.yml b/appveyor.yml
@@ -133,7 +133,8 @@ build_script:
   - set DMDINSTALLDIR=c:\projects\dmd2
   # build installer
   - cd visuald
-  # can build dbuild15 only with VS2017
+  # can build dbuild15 and dparser only with VS2017
+  - if     "%VS%"=="15" nuget restore vdc\abothe\VDServer.sln
   - if     "%VS%"=="15" nmake install_vs_only_vs2017
   - if not "%VS%"=="15" nmake install_vs_no_vs2017
 

diff --git a/c2d/dlist.d b/c2d/dlist.d
@@ -229,10 +229,23 @@ struct DListIterator(T)
 		return _list;
 	}
 
+version(all) // opDot deperecated
+{
+	alias opStar this;
+
+	// https://issues.dlang.org/show_bug.cgi?id=16657 need to define opEquals with alias this
+	bool opEquals(const typeof(this) other) const
+	{
+		return _pos == other._pos; // no need to compare lists, nodes belong to only one list
+	}
+}
+else
+{
 	ref T opDot()
 	{
 		return _pos.data;
 	}
+}
 
 	ref T opStar()
 	{

diff --git a/c2d/vsi2d.visualdproj b/c2d/vsi2d.visualdproj
@@ -1,6 +1,6 @@
 <DProject>
  <ProjectGuid>{8760F45A-69D9-4B68-BE63-0E055B51D447}</ProjectGuid>
- <Config name="Debug" platform="Win32">
+ <Config platform="Win32" name="Debug">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -15,6 +15,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -107,7 +108,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release" platform="Win32">
+ <Config platform="Win32" name="Release">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -122,6 +123,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>0</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -214,7 +216,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug" platform="x64">
+ <Config platform="x64" name="Debug">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -229,6 +231,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -321,7 +324,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release" platform="x64">
+ <Config platform="x64" name="Release">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -336,6 +339,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>0</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -428,7 +432,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug GDC" platform="Win32">
+ <Config platform="Win32" name="Debug GDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -443,6 +447,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>0</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -535,7 +540,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug GDC" platform="x64">
+ <Config platform="x64" name="Debug GDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -550,6 +555,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>0</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -642,7 +648,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug LDC" platform="Win32">
+ <Config platform="Win32" name="Debug LDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -657,6 +663,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -749,7 +756,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug LDC" platform="x64">
+ <Config platform="x64" name="Debug LDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -764,6 +771,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -856,7 +864,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug COFF32" platform="Win32">
+ <Config platform="Win32" name="Debug COFF32">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -871,6 +879,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -963,7 +972,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Debug COFF32" platform="x64">
+ <Config platform="x64" name="Debug COFF32">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -978,6 +987,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -1070,7 +1080,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release LDC" platform="Win32">
+ <Config platform="Win32" name="Release LDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -1085,6 +1095,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>1</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -1177,7 +1188,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release LDC" platform="x64">
+ <Config platform="x64" name="Release LDC">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -1192,6 +1203,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>
@@ -1284,7 +1296,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release COFF32" platform="Win32">
+ <Config platform="Win32" name="Release COFF32">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -1299,6 +1311,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>1</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
@@ -1318,7 +1331,7 @@
   <noboundscheck>0</noboundscheck>
   <useSwitchError>0</useSwitchError>
   <useUnitTests>0</useUnitTests>
-  <useInline>1</useInline>
+  <useInline>0</useInline>
   <release>1</release>
   <preservePaths>0</preservePaths>
   <warnings>0</warnings>
@@ -1391,7 +1404,7 @@
   <postBuildCommand />
   <filesToClean>*.obj</filesToClean>
  </Config>
- <Config name="Release COFF32" platform="x64">
+ <Config platform="x64" name="Release COFF32">
   <obj>0</obj>
   <link>0</link>
   <lib>0</lib>
@@ -1406,6 +1419,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
+  <symdebugref>1</symdebugref>
   <optimize>1</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>

diff --git a/vdc/abothe/.gitignore b/vdc/abothe/.gitignore
@@ -0,0 +1,7 @@
+.idea
+.vs
+*.user
+packages
+comserver/obj
+DParserCOMServer.Tests/obj
+DParserCOMServer.Tests/bin