Skip to content

Commit 2827959

Browse files
rainersrainers
authored
Merge pull request #103 from rainers/master
Visual D 0.48 beta 3
2 parents 72df0fe + 9da121e commit 2827959

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

+2969
-1993
lines changed

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ unreleased Version 0.48.0
10221022
- added experimental option to show value of constants in tooltip
10231023
- the last user specified version was prepended to "Windows"
10241024
- predefined versions now evaluated by compiler invocation
1025+
- experimental: option to enable semantic identifier highlighting
10251026
* mago
10261027
- added option to show base class fields as direct fields
10271028
- allow suffix 'h' for hex numbers for better interoperablility with VS disassembly
@@ -1031,6 +1032,9 @@ unreleased Version 0.48.0
10311032
- concord: allow dragging addresses to the disassembly window
10321033
- engine: Fix the way the debugger steps over instructions with REP prefix.
10331034
- engine: the disassemble view now supports SSE4 and AVX
1035+
- detect AA if type ends with "]", but not with "[]"
1036+
- fix crash in VS if a value is marked expandable, but doesn't yield any children
1037+
- fix .ptr property of static array if it is a struct/class member
10341038
* cv2pdb
10351039
- can now detect VS2017 via Setup-COM-API
10361040
- some DWARF fixes

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ vdserver:
5151
dparser:
5252
cd vdc\abothe && $(MSBUILD15) vdserver.sln /p:Configuration=Release;Platform="Any CPU" /p:TargetFrameworkVersion=4.5 /p:DefineConstants=NET40 /t:Rebuild
5353

54+
dparser_test:
55+
dotnet test vdc\abothe\VDServer.sln -c Release
56+
5457
fake_dparser:
5558
if not exist bin\Release\DParserCOMServer\nul md bin\Release\DParserCOMServer
5659
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
118121
##################################
119122
# create installer
120123

121-
install_release_modules: install_modules dparser cv2pdb mago dbuild12 dbuild14 dbuild15
124+
install_release_modules: install_modules dparser dparser_test cv2pdb mago dbuild12 dbuild14 dbuild15
122125

123126
install_vs: install_release_modules install_only
124127

125128
install_vs_no_vs2017: install_modules fake_dparser cv2pdb mago dbuild12 dbuild14 fake_dbuild15 install_only
126129

127-
install_vs_only_vs2017: install_modules dparser cv2pdb_vs15 mago_vs15 fake_dbuild12 fake_dbuild14 dbuild15 install_only
130+
install_vs_only_vs2017: install_modules dparser dparser_test cv2pdb_vs15 mago_vs15 fake_dbuild12 fake_dbuild14 dbuild15 install_only
128131

129132
install_modules: prerequisites visuald_vs vdserver vdextension visualdwizard dcxxfilt
130133

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#define VERSION_MINOR 48
33
#define VERSION_REVISION 0
44
#define VERSION_BETA -beta
5-
#define VERSION_BUILD 2
5+
#define VERSION_BUILD 3

‎appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ build_script:
133133
- set DMDINSTALLDIR=c:\projects\dmd2
134134
# build installer
135135
- cd visuald
136-
# can build dbuild15 only with VS2017
136+
# can build dbuild15 and dparser only with VS2017
137+
- if "%VS%"=="15" nuget restore vdc\abothe\VDServer.sln
137138
- if "%VS%"=="15" nmake install_vs_only_vs2017
138139
- if not "%VS%"=="15" nmake install_vs_no_vs2017
139140

‎c2d/dlist.d‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,23 @@ struct DListIterator(T)
229229
return _list;
230230
}
231231

232+
version(all) // opDot deperecated
233+
{
234+
alias opStar this;
235+
236+
// https://issues.dlang.org/show_bug.cgi?id=16657 need to define opEquals with alias this
237+
bool opEquals(const typeof(this) other) const
238+
{
239+
return _pos == other._pos; // no need to compare lists, nodes belong to only one list
240+
}
241+
}
242+
else
243+
{
232244
ref T opDot()
233245
{
234246
return _pos.data;
235247
}
248+
}
236249

237250
ref T opStar()
238251
{

‎c2d/vsi2d.visualdproj‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<DProject>
22
<ProjectGuid>{8760F45A-69D9-4B68-BE63-0E055B51D447}</ProjectGuid>
3-
<Config name="Debug" platform="Win32">
3+
<Config platform="Win32" name="Debug">
44
<obj>0</obj>
55
<link>0</link>
66
<lib>0</lib>
@@ -15,6 +15,7 @@
1515
<vtls>0</vtls>
1616
<vgc>0</vgc>
1717
<symdebug>1</symdebug>
18+
<symdebugref>1</symdebugref>
1819
<optimize>0</optimize>
1920
<cpu>0</cpu>
2021
<isX86_64>0</isX86_64>
@@ -107,7 +108,7 @@
107108
<postBuildCommand />
108109
<filesToClean>*.obj</filesToClean>
109110
</Config>
110-
<Config name="Release" platform="Win32">
111+
<Config platform="Win32" name="Release">
111112
<obj>0</obj>
112113
<link>0</link>
113114
<lib>0</lib>
@@ -122,6 +123,7 @@
122123
<vtls>0</vtls>
123124
<vgc>0</vgc>
124125
<symdebug>0</symdebug>
126+
<symdebugref>1</symdebugref>
125127
<optimize>0</optimize>
126128
<cpu>0</cpu>
127129
<isX86_64>0</isX86_64>
@@ -214,7 +216,7 @@
214216
<postBuildCommand />
215217
<filesToClean>*.obj</filesToClean>
216218
</Config>
217-
<Config name="Debug" platform="x64">
219+
<Config platform="x64" name="Debug">
218220
<obj>0</obj>
219221
<link>0</link>
220222
<lib>0</lib>
@@ -229,6 +231,7 @@
229231
<vtls>0</vtls>
230232
<vgc>0</vgc>
231233
<symdebug>1</symdebug>
234+
<symdebugref>1</symdebugref>
232235
<optimize>0</optimize>
233236
<cpu>0</cpu>
234237
<isX86_64>1</isX86_64>
@@ -321,7 +324,7 @@
321324
<postBuildCommand />
322325
<filesToClean>*.obj</filesToClean>
323326
</Config>
324-
<Config name="Release" platform="x64">
327+
<Config platform="x64" name="Release">
325328
<obj>0</obj>
326329
<link>0</link>
327330
<lib>0</lib>
@@ -336,6 +339,7 @@
336339
<vtls>0</vtls>
337340
<vgc>0</vgc>
338341
<symdebug>0</symdebug>
342+
<symdebugref>1</symdebugref>
339343
<optimize>0</optimize>
340344
<cpu>0</cpu>
341345
<isX86_64>1</isX86_64>
@@ -428,7 +432,7 @@
428432
<postBuildCommand />
429433
<filesToClean>*.obj</filesToClean>
430434
</Config>
431-
<Config name="Debug GDC" platform="Win32">
435+
<Config platform="Win32" name="Debug GDC">
432436
<obj>0</obj>
433437
<link>0</link>
434438
<lib>0</lib>
@@ -443,6 +447,7 @@
443447
<vtls>0</vtls>
444448
<vgc>0</vgc>
445449
<symdebug>0</symdebug>
450+
<symdebugref>1</symdebugref>
446451
<optimize>0</optimize>
447452
<cpu>0</cpu>
448453
<isX86_64>0</isX86_64>
@@ -535,7 +540,7 @@
535540
<postBuildCommand />
536541
<filesToClean>*.obj</filesToClean>
537542
</Config>
538-
<Config name="Debug GDC" platform="x64">
543+
<Config platform="x64" name="Debug GDC">
539544
<obj>0</obj>
540545
<link>0</link>
541546
<lib>0</lib>
@@ -550,6 +555,7 @@
550555
<vtls>0</vtls>
551556
<vgc>0</vgc>
552557
<symdebug>0</symdebug>
558+
<symdebugref>1</symdebugref>
553559
<optimize>0</optimize>
554560
<cpu>0</cpu>
555561
<isX86_64>1</isX86_64>
@@ -642,7 +648,7 @@
642648
<postBuildCommand />
643649
<filesToClean>*.obj</filesToClean>
644650
</Config>
645-
<Config name="Debug LDC" platform="Win32">
651+
<Config platform="Win32" name="Debug LDC">
646652
<obj>0</obj>
647653
<link>0</link>
648654
<lib>0</lib>
@@ -657,6 +663,7 @@
657663
<vtls>0</vtls>
658664
<vgc>0</vgc>
659665
<symdebug>1</symdebug>
666+
<symdebugref>1</symdebugref>
660667
<optimize>0</optimize>
661668
<cpu>0</cpu>
662669
<isX86_64>0</isX86_64>
@@ -749,7 +756,7 @@
749756
<postBuildCommand />
750757
<filesToClean>*.obj</filesToClean>
751758
</Config>
752-
<Config name="Debug LDC" platform="x64">
759+
<Config platform="x64" name="Debug LDC">
753760
<obj>0</obj>
754761
<link>0</link>
755762
<lib>0</lib>
@@ -764,6 +771,7 @@
764771
<vtls>0</vtls>
765772
<vgc>0</vgc>
766773
<symdebug>1</symdebug>
774+
<symdebugref>1</symdebugref>
767775
<optimize>0</optimize>
768776
<cpu>0</cpu>
769777
<isX86_64>1</isX86_64>
@@ -856,7 +864,7 @@
856864
<postBuildCommand />
857865
<filesToClean>*.obj</filesToClean>
858866
</Config>
859-
<Config name="Debug COFF32" platform="Win32">
867+
<Config platform="Win32" name="Debug COFF32">
860868
<obj>0</obj>
861869
<link>0</link>
862870
<lib>0</lib>
@@ -871,6 +879,7 @@
871879
<vtls>0</vtls>
872880
<vgc>0</vgc>
873881
<symdebug>1</symdebug>
882+
<symdebugref>1</symdebugref>
874883
<optimize>0</optimize>
875884
<cpu>0</cpu>
876885
<isX86_64>0</isX86_64>
@@ -963,7 +972,7 @@
963972
<postBuildCommand />
964973
<filesToClean>*.obj</filesToClean>
965974
</Config>
966-
<Config name="Debug COFF32" platform="x64">
975+
<Config platform="x64" name="Debug COFF32">
967976
<obj>0</obj>
968977
<link>0</link>
969978
<lib>0</lib>
@@ -978,6 +987,7 @@
978987
<vtls>0</vtls>
979988
<vgc>0</vgc>
980989
<symdebug>1</symdebug>
990+
<symdebugref>1</symdebugref>
981991
<optimize>0</optimize>
982992
<cpu>0</cpu>
983993
<isX86_64>1</isX86_64>
@@ -1070,7 +1080,7 @@
10701080
<postBuildCommand />
10711081
<filesToClean>*.obj</filesToClean>
10721082
</Config>
1073-
<Config name="Release LDC" platform="Win32">
1083+
<Config platform="Win32" name="Release LDC">
10741084
<obj>0</obj>
10751085
<link>0</link>
10761086
<lib>0</lib>
@@ -1085,6 +1095,7 @@
10851095
<vtls>0</vtls>
10861096
<vgc>0</vgc>
10871097
<symdebug>1</symdebug>
1098+
<symdebugref>1</symdebugref>
10881099
<optimize>1</optimize>
10891100
<cpu>0</cpu>
10901101
<isX86_64>0</isX86_64>
@@ -1177,7 +1188,7 @@
11771188
<postBuildCommand />
11781189
<filesToClean>*.obj</filesToClean>
11791190
</Config>
1180-
<Config name="Release LDC" platform="x64">
1191+
<Config platform="x64" name="Release LDC">
11811192
<obj>0</obj>
11821193
<link>0</link>
11831194
<lib>0</lib>
@@ -1192,6 +1203,7 @@
11921203
<vtls>0</vtls>
11931204
<vgc>0</vgc>
11941205
<symdebug>1</symdebug>
1206+
<symdebugref>1</symdebugref>
11951207
<optimize>0</optimize>
11961208
<cpu>0</cpu>
11971209
<isX86_64>1</isX86_64>
@@ -1284,7 +1296,7 @@
12841296
<postBuildCommand />
12851297
<filesToClean>*.obj</filesToClean>
12861298
</Config>
1287-
<Config name="Release COFF32" platform="Win32">
1299+
<Config platform="Win32" name="Release COFF32">
12881300
<obj>0</obj>
12891301
<link>0</link>
12901302
<lib>0</lib>
@@ -1299,6 +1311,7 @@
12991311
<vtls>0</vtls>
13001312
<vgc>0</vgc>
13011313
<symdebug>1</symdebug>
1314+
<symdebugref>1</symdebugref>
13021315
<optimize>1</optimize>
13031316
<cpu>0</cpu>
13041317
<isX86_64>0</isX86_64>
@@ -1318,7 +1331,7 @@
13181331
<noboundscheck>0</noboundscheck>
13191332
<useSwitchError>0</useSwitchError>
13201333
<useUnitTests>0</useUnitTests>
1321-
<useInline>1</useInline>
1334+
<useInline>0</useInline>
13221335
<release>1</release>
13231336
<preservePaths>0</preservePaths>
13241337
<warnings>0</warnings>
@@ -1391,7 +1404,7 @@
13911404
<postBuildCommand />
13921405
<filesToClean>*.obj</filesToClean>
13931406
</Config>
1394-
<Config name="Release COFF32" platform="x64">
1407+
<Config platform="x64" name="Release COFF32">
13951408
<obj>0</obj>
13961409
<link>0</link>
13971410
<lib>0</lib>
@@ -1406,6 +1419,7 @@
14061419
<vtls>0</vtls>
14071420
<vgc>0</vgc>
14081421
<symdebug>1</symdebug>
1422+
<symdebugref>1</symdebugref>
14091423
<optimize>1</optimize>
14101424
<cpu>0</cpu>
14111425
<isX86_64>1</isX86_64>

‎vdc/abothe/.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.idea
2+
.vs
3+
*.user
4+
packages
5+
comserver/obj
6+
DParserCOMServer.Tests/obj
7+
DParserCOMServer.Tests/bin

0 commit comments

Comments
 (0)