Merge pull request #75 from rainers/master

changes for Visual D 0.45.0-beta1

Author: rainers

CHANGES

@@ -864,3 +864,25 @@ Version history
   * bugzilla 17254: close and reopen completion box if results added
   * fix link to build log: replace spaces with %20
   * added VC project integration for VS2017
+
+unreleased Version 0.45.0
+
+  * fixed Compile and Run/Debug if building through MS-COFF and not having VS selected in sc.ini
+  * mago: fixed memory leaks that could also prohibit compilation due to PDB file still open
+  * mago: add debugger options page to allow hiding internal locals and static members
+  * cv2pdb: added support for AA display in mago
+  * DParser: added support for function attributes @nogc and scope, align(expression)
+  * added task list support for files loaded into the editor
+  * read default DMD installation path from Visual D or DMD registry key, if not available in 
+    VS registry hive
+  * new project option "Add import paths of project dependencies"
+  * use generic file system tracking instead of compiler switch -deps=
+  * fixed tracker.exe not found in VS2015 and VS2017
+  * /MAPINFO: remove ancient options no longer supported by the MS linker
+  * separated compile and link into two batches so compile skipped if only link inputs changed
+  * fix crash when editing dub.json when part of a project
+  * UCRT version detection: ignore directories that do not start with a digit (e.g. from DDK)
+  * dependency monitoring: added option to specify files/folders to exclude from dependency check
+  * mago: can now show registers in expressions
+  * mago: show static members and base class with different icons
+  * DParser: cache semantic results until next edit

Makefile

@@ -162,6 +162,7 @@ dbuild15:
 
 fake_dbuild15:
 	if not exist msbuild\dbuild\obj\release-v15\nul md msbuild\dbuild\obj\release-v15
+	if exist "$(PROGRAMFILES)\VisualD\msbuild\dbuild.15.0.dll" copy "$(PROGRAMFILES)\VisualD\msbuild\dbuild.15.0.dll" msbuild\dbuild\obj\release-v15
 	if not exist msbuild\dbuild\obj\release-v15\dbuild.15.0.dll echo dummy >msbuild\dbuild\obj\release-v15\dbuild.15.0.dll
 
 mago:

VERSION

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

appveyor.yml

@@ -66,8 +66,8 @@ install:
         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
+        Start-FileDownload 'https://github.com/dlang/visuald/releases/download/v0.44.2/VisualD-v0.44.2.exe' -FileName 'VisualD-v0.44.2.exe'
+  - .\VisualD-v0.44.2.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

c2d/ast.d

@@ -1755,10 +1755,11 @@ class Statement : AST
 			break;
 
 		case Token.Default:
-			// treat as label, just skip and reparse
+			// treat as empty statement, though it should be a label
 			nextToken(tokIt);
 			checkToken(tokIt, Token.Colon);
-			goto L_reparse;
+			stmt = new Statement(type);
+			break;
 
 		case Token.Case:
 			// treat as statement, though it should be a label

c2d/c2d.visualdproj

@@ -210,7 +210,7 @@
   <lib>1</lib>
   <subsystem>0</subsystem>
   <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
+  <singleFileCompilation>3</singleFileCompilation>
   <oneobj>0</oneobj>
   <mscoff>0</mscoff>
   <trace>0</trace>
@@ -301,9 +301,9 @@
   <useStdLibPath>1</useStdLibPath>
   <cRuntime>1</cRuntime>
   <privatePhobos>0</privatePhobos>
-  <additionalOptions />
+  <additionalOptions>-of$(IntDir)\$(ProjectName).obj</additionalOptions>
   <preBuildCommand />
-  <postBuildCommand />
+  <postBuildCommand>dmd -lib $(IntDir)\$(ProjectName).obj -of$(OutDir)\$(ProjectName).lib</postBuildCommand>
   <filesToClean>*.obj</filesToClean>
  </Config>
  <Config name="Debug GDC" platform="Win32">

c2d/cpp2d.d

@@ -564,6 +564,7 @@ static this()
 
 string createModuleName(string filename)
 {
+	string ext = extension(filename);
 	filename = stripExtension(filename);
 	filename = replace(filename, "\\", "/");
 	string[] names = split(filename, "/");
@@ -586,6 +587,8 @@ string createModuleName(string filename)
 			modname ~= '.';
 		modname ~= safename;
 	}
+	if (ext != ".h" && ext != "")
+		modname ~= "_" ~ ext[1 .. $];
 	return modname;
 }
 
@@ -606,13 +609,21 @@ string mapTokenText(Token tok)
 	return tok.text;
 }
 
-string createMappedTokenListText(TokenList tokList)
+string createMappedTokenListText(TokenList tokList, bool map)
 {
-	string text;
+	string text, prevtext;
 	for(TokenIterator tokIt = tokList.begin(); !tokIt.atEnd(); ++tokIt)
 	{
 		Token tok = *tokIt;
-		string mapped = mapTokenText(tok);
+		string mapped = map ? mapTokenText(tok) : tok.text;
+		if (mapped.length && prevtext.length)
+		{
+			char prevch = prevtext[$-1];
+			char ch = mapped[0];
+			if((isAlphaNum(ch) || ch == '_') && (isAlphaNum(prevch) || prevch == '_'))
+				mapped = " " ~ mapped;
+		}
+		prevtext = mapped;
 		text ~= tok.pretext ~ mapped;
 	}
 	return text;
@@ -1606,6 +1617,40 @@ void patchClassVarInit(Statement stmt)
 	}
 }
 
+void patchSwitchStatement(Statement swstmt)
+{
+	ASTIterator swit = swstmt.children.begin() + 1; // skip expression
+	if (swit.atEnd())
+		return;
+	auto stmt = *swit; // compound statement
+	bool hasDefault = false;
+	if (stmt.children)
+		for(ASTIterator it = stmt.children.begin(); !it.atEnd(); ++it)
+			if (auto s = cast(Statement)(*it))
+				if (s._toktype == Token.Default)
+				{
+					hasDefault = true;
+					break;
+				}
+
+	if (!hasDefault)
+	{
+		auto insertPos = stmt.end - 1; // before "}"
+		TokenList tokList = new TokenList;
+		tokList.append(createToken(insertPos.pretext, "default", Token.Default, stmt.end.lineno));
+		tokList.append(createToken("", ":", Token.Colon, stmt.end.lineno));
+		tokList.append(createToken(" ", "break", Token.Break, stmt.end.lineno));
+		tokList.append(createToken("", ";", Token.Semicolon, stmt.end.lineno));
+		auto defstmt = new Statement(Token.Default);
+		defstmt.start = tokList.begin();
+		defstmt.end = tokList.end();
+
+		stmt.insertChildBefore(stmt.children.end(), defstmt, tokList, &insertPos);
+
+		stmt.verify();
+	}
+}
+
 void splitNonSimpleVarList(Declaration decl)
 {
 	if(decl.children && decl.children.count() > 2)
@@ -1951,7 +1996,7 @@ void patchDeclType(DeclType dtype)
 						// simply add arguments to identifier
 						if(dvar2.start.type == Token.Identifier)
 						{
-							string argtext = createMappedTokenListText(tl);
+							string argtext = createMappedTokenListText(tl, true);
 							dvar2.start.text ~= argtext;
 						}
 						// bad insert position:
@@ -2051,6 +2096,8 @@ void patchAST(AST ast)
 				patchAsm(stmt);
 			if(stmt._toktype == Token.Return)
 				patchReturnExpressionType(stmt);
+			if(stmt._toktype == Token.Switch)
+				patchSwitchStatement(stmt);
 
 			patchClassVarInit(stmt);
 		}
@@ -2247,13 +2294,7 @@ class Source
 
 	string createTokenListText(int pass)
 	{
-		string text;
-		for(TokenIterator tokIt = _tokenList.begin(); !tokIt.atEnd(); ++tokIt)
-		{
-			Token tok = *tokIt;
-			string mapped = pass > 0 ? tok.text : mapTokenText(tok);
-			text ~= tok.pretext ~ mapped;
-		}
+		string text = createMappedTokenListText(_tokenList, pass <= 0);
 		return text;
 	}
 
@@ -2678,7 +2719,7 @@ class Cpp2DConverter
 		// cannot remove decl immediately, because iterators in iterateTopLevelDeclarations will become invalid
 		declsToRemove ~= decl;
 
-		currentSource._ast.verify();
+		decl._parent.verify();
 	}
 
 	void moveAllMethods()
@@ -2795,8 +2836,6 @@ class Cpp2DConverter
 		string fname = replace(modname, ".", "/");
 		if(pass == 0)
 		{
-			if (ext != ".h" && ext != "")
-				fname ~= "_" ~ ext[1 .. $];
 			fname ~= ".d";
 		}
 		else
@@ -2996,7 +3035,7 @@ string testDmdGen(string txt, int countRemove = 1, int countNoImpl = 0, TokenLis
 
 	TokenList tokenList = scanText(txt);
 
-	if(defines is null)
+	if(defines !is null)
 	{
 		expandPPdefines(tokenList, defines, MixinMode.ExpandDefine);
 		rescanPP(tokenList);
@@ -3741,7 +3780,6 @@ unittest
 
 unittest
 {
-	// force failure
 	string txt =
 		  "#define A 1\n"
 		~ "#define B A\n"
@@ -3750,7 +3788,7 @@ unittest
 		;
 	string exp =
 		  "enum A = 1;\n"
-		~ "alias B A;\n"
+		~ "alias A B;\n"
 		~ " auto C(  )() { return B*B; }\n"
 		~ " auto SQR(  ARG1 )(ARG1 a) { return a*a; }\n"
 		;
@@ -3771,13 +3809,77 @@ void cpp2d_test()
 		;
 
 //	PP.expandConditionals["EXP"] = true;
-	TokenList[string] defines = [ "EXP" : scanText("1") ];
 
-	string res = testDmdGen(txt, 0, 0, defines);
+	string res = testDmdGen(txt, 0, 0, null);
 	assert(res == exp);
 
+	TokenList[string] defines = [ "EXP" : scanText("1") ];
+	string exp2 = "enum WSL = 1; // comment\n";
+	string res2 = testDmdGen(txt, 0, 0, defines);
+	assert(res2 == exp2);
+
 	PP.expandConditionals = PP.expandConditionals.init;
 }
 
+unittest
+{
+	string txt =
+		"void foo(int x) {\n"
+		~ "  switch(x) {\n"
+		~ "  case 0: return;\n"
+		~ "  }\n"
+		~ "}\n"
+		;
+	string exp =
+		"void foo(int x) {\n"
+		~ "  switch(x) {\n"
+		~ "  case 0: return;\n"
+		~ "  default: break;\n"
+		~ "  }\n"
+		~ "}\n"
+		;
+
+	string res = testDmdGen(txt, 0, 0);
+	assert(res == exp);
+}
+
+unittest
+{
+	string txt =
+		"void foo(int x) {\n"
+		~ "  switch(x) {\n"
+		~ "  default: break;\n"
+		~ "  case 1: return;\n"
+		~ "  }\n"
+		~ "}\n"
+		;
+	string exp =
+		"void foo(int x) {\n"
+		~ "  switch(x) {\n"
+		~ "  default: break;\n"
+		~ "  case 1: return;\n"
+		~ "  }\n"
+		~ "}\n"
+		;
+
+	string res = testDmdGen(txt, 0, 0);
+	assert(res == exp);
+}
+
+unittest
+{
+	string rtxt = "case '0' => goto case; case '0'";
+	PatchRule rule;
+	bool rc = C2DIni.parsePatchRule(rule, rtxt);
+
+	string txt = "switch(x) { case '0': break; }";
+	auto tokenList = scanText(txt);
+	replaceTokenSequence(tokenList, rule.searchTokens, rule.replaceTokens, true);
+	string ntxt = tokenListToString(tokenList, true);
+
+	string exp = "switch(x) { goto case;case'0': break; }";
+	assert(exp == ntxt);
+}
+
 version(MAIN)
 void main() {}