Skip to content

Commit f94c4a3

Browse files
committed
dparser now used by default if installed
1 parent 14d7623 commit f94c4a3

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

CHANGES

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,9 +562,10 @@ unreleased Version 0.3.37
562562
- user type colorizer settings were forgotten after editing options
563563
- keywords can now also be colored by adding them to the "Colored types"
564564
* DParser
565-
- updated to recent version (7fa55a843e2c36a28e8ce08a697b7972fc26d737)
565+
- updated to recent version (https://github.com/aBothe/D_Parser/commit/72f1bc54f2426954f463f03b215e044174fc1468)
566566
- enabled mixin analysis
567567
- pass deprecation flag to engine
568+
- DParser engine now used by default if installed
568569
* vdserver
569570
- add __FUNCTION__, __PRETTY_FUNCTION__ and __MODULE__ as keywords and primary expression
570571
- add __parameters as specification in is-expression
@@ -574,6 +575,7 @@ unreleased Version 0.3.37
574575
- fixed invoking bad command when no files to compile, but additional arguments set
575576
- added global option to display the reason for building a target
576577
- fixed custom build rules executed twice sometimes
578+
- fixed sc.ini evaluation, added support for sections [Environment32] and [Environment32]
577579
- link dependencies can now also be monitored for the 32-bit MS linker
578580
- added VCINSTALLDIR to the list of available macros
579581
- added different options for executable and librarie search paths to be used for Win32/x64

nsis/visuald.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ Function RegisterDParser
915915
; WriteRegStr ${DPARSER_REG_ROOT} "CLSID\${DPARSER_FACTORY_CLSID}\ProgId" "" DParserCOMServer.VDServer
916916
; WriteRegStr ${DPARSER_REG_ROOT} "CLSID\${DPARSER_FACTORY_CLSID}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" "" ""
917917

918-
WriteRegStr ${DPARSER_REG_ROOT} "${DPARSER_VDSERVER_NAME}\CLSID" "" ${DPARSER_VDSERVER_CLSID}
918+
WriteRegStr ${DPARSER_REG_ROOT} "${DPARSER_FACTORY_NAME}\CLSID" "" ${DPARSER_VDSERVER_CLSID}
919919
WriteRegStr ${DPARSER_REG_ROOT} "CLSID\${DPARSER_VDSERVER_CLSID}\LocalServer32" "" $INSTDIR\DParser\DParserCOMServer.exe
920920
WriteRegStr ${DPARSER_REG_ROOT} "CLSID\${DPARSER_VDSERVER_CLSID}\ProgId" "" DParserCOMServer.VDServer
921921
WriteRegStr ${DPARSER_REG_ROOT} "CLSID\${DPARSER_VDSERVER_CLSID}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" "" ""

visuald/dpackage.d

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,6 +1176,12 @@ class GlobalOptions
11761176
if(!getRegistryRoot())
11771177
return false;
11781178

1179+
wstring dllPath = GetDLLName(g_hInst);
1180+
VisualDInstallDir = normalizeDir(dirName(toUTF8(dllPath)));
1181+
1182+
wstring idePath = GetDLLName(null);
1183+
DevEnvDir = normalizeDir(dirName(toUTF8(idePath)));
1184+
11791185
bool rc = true;
11801186
try
11811187
{
@@ -1222,9 +1228,11 @@ class GlobalOptions
12221228
expandTrigger = cast(byte) getIntOpt("expandTrigger", 0);
12231229
showTypeInTooltip = getBoolOpt("showTypeInTooltip2", true); // changed default
12241230
semanticGotoDef = getBoolOpt("semanticGotoDef", true);
1225-
useDParser = getBoolOpt("useDParser", false);
12261231
pasteIndent = getBoolOpt("pasteIndent", true);
12271232

1233+
scope RegKey keyDParser = new RegKey(HKEY_CLASSES_ROOT, "CLSID\\{002a2de9-8bb6-484d-AA05-7e4ad4084715}", false);
1234+
useDParser = getBoolOpt("useDParser2", keyDParser.key !is null);
1235+
12281236
// overwrite by user config
12291237
void readCompilerOptions(string compiler)(ref CompilerDirectories opt)
12301238
{
@@ -1305,12 +1313,6 @@ class GlobalOptions
13051313
rc = false;
13061314
}
13071315

1308-
wstring dllPath = GetDLLName(g_hInst);
1309-
VisualDInstallDir = normalizeDir(dirName(toUTF8(dllPath)));
1310-
1311-
wstring idePath = GetDLLName(null);
1312-
DevEnvDir = normalizeDir(dirName(toUTF8(idePath)));
1313-
13141316
return rc;
13151317
}
13161318

@@ -1371,7 +1373,7 @@ class GlobalOptions
13711373
keyToolOpts.Set("expandTrigger", expandTrigger);
13721374
keyToolOpts.Set("showTypeInTooltip", showTypeInTooltip);
13731375
keyToolOpts.Set("semanticGotoDef", semanticGotoDef);
1374-
keyToolOpts.Set("useDParser", useDParser);
1376+
keyToolOpts.Set("useDParser2", useDParser);
13751377
keyToolOpts.Set("pasteIndent", pasteIndent);
13761378
keyToolOpts.Set("compileAndRunOpts", toUTF16(compileAndRunOpts));
13771379

0 commit comments

Comments
 (0)