Merge pull request #36 from rainers/master

rainers · rainers · commit c7d5b1453182 · 2014-11-29T18:25:50.000+01:00
Visual D 0.3.40 beta3
diff --git a/CHANGES b/CHANGES
@@ -675,9 +675,14 @@ unreleased Version 0.3.40
   * moved "Other Compiler" option from main project page to compiler page
   * added additional options to the resource compiler tool
   * added basic support to compile C/C++ files:
-    * new tool "C/C++" that is also auto-deteted for usual file extensions
+    * new tool "C/C++" that is also auto-detected for usual file extensions
     * common command line options can be specified on the compiler page of the project 
     * special command line options can be added per file
     * $(CC) expands to the compiler executable of the current D compiler: dmc, cl, gcc or clang
     * if "Translate D options" is checked, dmd options for -g, -release, -O are translated to 
       the respective C/C++ compiler option
+  * updated version identifiers according to http://dlang.org/version.html
+  * separate link could fail if configuration name contains spaces
+  * really updated dparser to a6207d6db5e54c68aa4b9db53b702681242d81d5
+  * goto definition on import now supports package.d
+  * bugzilla 13759: $(VSINSTALLDIR)\Common7\IDE now added to the default executable paths
diff --git a/TODO b/TODO
@@ -129,6 +129,7 @@ Debugger:
 - local functions/delegates should have debug info for closure vars ("this" exists)
 - GDC: x64: function arguments not shown
 - VS2012: autoexp.dat does not work? depends on debug engine => edit and continue
+- mago64: modules window does not show 64-bit addresses
 
 GUI-Designer:
 -------------
@@ -163,4 +164,6 @@ Unsorted
 - dustmite support
 - dfix support
 - configuration of dependent project not read from configuration manager
-- jump to assertion error
+- jump to assertion error
++ import std.container: jump to package
+- renaming configuration does not change project config
diff --git a/VERSION b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      3
 #define VERSION_REVISION   40
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      2
+#define VERSION_BUILD      3
diff --git a/stdext/com.d b/stdext/com.d
@@ -12,6 +12,7 @@ module stdext.com;
 import std.utf;
 import std.string;
 import core.stdc.string;
+import core.stdc.wchar_ : wcslen;
 
 import core.memory;
 
diff --git a/stdext/ddocmacros.d b/stdext/ddocmacros.d
@@ -222,11 +222,11 @@ unittest
 
 	string txt = "$(D d-code)";
 	string[string] macros = [ "D" : "$0", "LINK" : `<a href="$1">$+</a>` ];
-	string res = ddocExpand(txt, macros);
+	string res = ddocExpand(txt, macros, true);
 	version(LOG) writeln(res);
 	assert(strip(res) == "d-code");
 
-	res = ddocExpand("link = $(LINK 1,2, 3,4)", macros);
+	res = ddocExpand("link = $(LINK 1,2, 3,4)", macros, true);
 	version(LOG) writeln(res);
 	assert(strip(res) == `link = <a href="1">2,3,4</a>`);
 }
diff --git a/stdext/string.d b/stdext/string.d
@@ -76,11 +76,16 @@ string unquoteArgument(string arg)
 	return arg[1..$-1];
 }
 
-string replaceCrLf(string s)
+string replaceCrLfSemi(string s)
 {
 	return replace(replace(s, "\n", ";"), "\r", "");
 }
 
+string replaceSemiCrLf(string s)
+{
+	return replace(s, ";", "\r\n");
+}
+
 string insertCr(string s)
 {
 	string ns;
diff --git a/vdc/abothe/Parser b/vdc/abothe/Parser
@@ -1 +1 @@
-Subproject commit 1bb6dc6e0a3069a07d8e7f15070161b717bd94c4
+Subproject commit a6207d6db5e54c68aa4b9db53b702681242d81d5
diff --git a/vdc/abothe/comserver/VDServer.cs b/vdc/abothe/comserver/VDServer.cs
@@ -357,8 +357,8 @@ void _setupEditorData()
 				
 			_editorData.ParseCache = new ParseCacheView(_imports.Split('\n'));
 			_editorData.IsDebug = (_flags & 2) != 0;
-			_editorData.DebugLevel = (int)(_flags >> 16) & 0xff;
-			_editorData.VersionNumber = (int)(_flags >> 8) & 0xff;
+			_editorData.DebugLevel = (_flags >> 16) & 0xff;
+			_editorData.VersionNumber = (_flags >> 8) & 0xff;
 			_editorData.GlobalVersionIds = versions.Split('\n');
 			_editorData.GlobalDebugIds = _debugIds.Split('\n');
             CompletionOptions.Instance.ShowUFCSItems = (_flags & 0x2000000) != 0;
diff --git a/vdc/semantic.d b/vdc/semantic.d
@@ -1005,10 +1005,12 @@ class Options
 				return doDoc ? 1 : -1;
 			case "D_NoBoundsChecks":
 				return noBoundsCheck ? 1 : -1;
+			case "CRuntime_DigitalMars":
 			case "Win32":
 			case "X86":
 			case "D_InlineAsm_X86":
 				return x64 ? -1 : 1;
+			case "CRuntime_Microsoft":
 			case "Win64":
 			case "X86_64":
 			case "D_InlineAsm_X86_64":
diff --git a/vdc/versions.d b/vdc/versions.d
@@ -23,7 +23,7 @@ static @property int[string] sPredefinedVersions()
 		[
 			"DigitalMars" : 0,
 			"GNU" : 0,
-			"LDC" : -1,
+			"LDC" : 0,
 			"SDC" : -1,
 			"D_NET" : -1,
 
@@ -53,30 +53,31 @@ static @property int[string] sPredefinedVersions()
 			"X86_64" : 0,
 			"ARM" : -1,
 			"ARM_Thumb" : -1,
-			"ARM_Soft" : -1,
+			"ARM_SoftFloat" : -1,
 			"ARM_SoftFP" : -1,
-			"ARM_HardFP" : -1,
-			"ARM64" : -1,
+			"ARM_HardFloat" : -1,
+			"AArch64" : -1,
+			"Epiphany" : -1,
 			"PPC" : -1,
-			"PPC_SoftFP" : -1,
-			"PPC_HardFP" : -1,
+			"PPC_SoftFloat" : -1,
+			"PPC_HardFloat" : -1,
 			"PPC64" : -1,
 			"IA64" : -1,
-			"MIPS" : -1,
 			"MIPS32" : -1,
 			"MIPS64" : -1,
 			"MIPS_O32" : -1,
 			"MIPS_N32" : -1,
 			"MIPS_O64" : -1,
 			"MIPS_N64" : -1,
 			"MIPS_EABI" : -1,
-			"MIPS_NoFloat" : -1,
 			"MIPS_SoftFloat" : -1,
 			"MIPS_HardFloat" : -1,
+			"NVPTX" : -1,
+			"NVPTX64" : -1,
 			"SPARC" : -1,
 			"SPARC_V8Plus" : -1,
-			"SPARC_SoftFP" : -1,
-			"SPARC_HardFP" : -1,
+			"SPARC_SoftFloat" : -1,
+			"SPARC_HardFloat" : -1,
 			"SPARC64" : -1,
 			"S390" : -1,
 			"S390X" : -1,
@@ -85,11 +86,18 @@ static @property int[string] sPredefinedVersions()
 			"SH" : -1,
 			"SH64" : -1,
 			"Alpha" : -1,
-			"Alpha_SoftFP" : -1,
-			"Alpha_HardFP" : -1,
+			"Alpha_SoftFloat" : -1,
+			"Alpha_HardFloat" : -1,
 
 			"LittleEndian" : 1,
 			"BigEndian" : -1,
+			
+			"ELFv1" : -1,
+			"ELFv2" : -1,
+
+			"CRuntime_DigitalMars" : 0,
+			"CRuntime_Microsoft" : 0,
+			"CRuntime_Glibc" : -1,
 
 			"D_Coverage" : 0,
 			"D_Ddoc" : 0,
diff --git a/visuald/colorizer.d b/visuald/colorizer.d
@@ -234,12 +234,12 @@ class Colorizer : DisposingComObject, IVsColorizer, ConfigModifiedListener
 	string[2] mConfigVersions;
 	bool mConfigRelease;
 	bool mConfigUnittest;
-	bool mConfigGDC;
 	bool mConfigX64;
 	bool mConfigCoverage;
 	bool mConfigDoc;
 	bool mConfigNoBoundsCheck;
-	
+	ubyte mConfigCompiler;
+
 	int[] mCoverage;
 	float mCoveragePercent;
 	string  mLastCoverageFile;
@@ -725,9 +725,15 @@ class Colorizer : DisposingComObject, IVsColorizer, ConfigModifiedListener
 			case "D_LP64":
 				return mConfigX64 ? 1 : -1;
 			case "GNU":
-				return mConfigGDC ? 1 : -1;
+				return mConfigCompiler == Compiler.GDC ? 1 : -1;
+			case "LDC":
+				return mConfigCompiler == Compiler.LDC ? 1 : -1;
 			case "DigitalMars":
-				return mConfigGDC ? -1 : 1;
+				return mConfigCompiler == Compiler.DMD ? 1 : -1;
+			case "CRuntime_DigitalMars":
+				return mConfigCompiler == Compiler.DMD && !mConfigX64 ? 1 : -1;
+			case "CRuntime_Microsoft":
+				return mConfigCompiler == Compiler.DMD && mConfigX64 ? 1 : -1;
 			default:
 				assert(false, "inconsistent predefined versions");
 		}
@@ -1406,7 +1412,7 @@ class Colorizer : DisposingComObject, IVsColorizer, ConfigModifiedListener
 			changes += modifyValue(mConfig.GetProjectOptions().cov,           mConfigCoverage);
 			changes += modifyValue(mConfig.GetProjectOptions().doDocComments, mConfigDoc);
 			changes += modifyValue(mConfig.GetProjectOptions().noboundscheck, mConfigNoBoundsCheck);
-			changes += modifyValue(mConfig.GetProjectOptions().compiler == Compiler.GDC, mConfigGDC);
+			changes += modifyValue(mConfig.GetProjectOptions().compiler,      mConfigCompiler);
 		}
 		return changes != 0;
 	}
diff --git a/visuald/config.d b/visuald/config.d
@@ -2640,7 +2640,7 @@ class Config :	DisposingComObject,
 		GlobalOptions globOpt = Package.GetGlobalOptions();
 		string exeSearchPath = x64 ? mProjectOptions.compilerDirectories.ExeSearchPath64 : mProjectOptions.compilerDirectories.ExeSearchPath;
 		if(exeSearchPath.length)
-			cmd ~= "set PATH=" ~ replaceCrLf(exeSearchPath) ~ ";%PATH%\n";
+			cmd ~= "set PATH=" ~ replaceCrLfSemi(exeSearchPath) ~ ";%PATH%\n";
 		
 		string libSearchPath = x64 ? mProjectOptions.compilerDirectories.LibSearchPath64 : mProjectOptions.compilerDirectories.LibSearchPath;
 		bool hasGlobalPath = mProjectOptions.useStdLibPath && libSearchPath.length;
@@ -2649,7 +2649,7 @@ class Config :	DisposingComObject,
 			// obsolete?
 			string lpath;
 			if(hasGlobalPath)
-				lpath = replaceCrLf(libSearchPath);
+				lpath = replaceCrLfSemi(libSearchPath);
 			if(mProjectOptions.libpaths.length && !_endsWith(lpath, ";"))
 				lpath ~= ";";
 			lpath ~= mProjectOptions.libpaths;
@@ -2894,10 +2894,10 @@ class Config :	DisposingComObject,
 				if(cmdfiles.length > 100)
 				{
 					string lnkresponsefile = GetCommandLinePath() ~ ".lnkarg";
+					lnkresponsefile = makeFilenameAbsolute(lnkresponsefile, workdir);
 					if(lnkresponsefile != quoteFilename(lnkresponsefile))
 					{
 						// optlink does not support quoted response files
-						lnkresponsefile = makeFilenameAbsolute(lnkresponsefile, workdir);
 						if(!std.file.exists(lnkresponsefile))
 							collectException(std.file.write(lnkresponsefile, ""));
 						lnkresponsefile = shortFilename(lnkresponsefile);
diff --git a/visuald/dllmain.d b/visuald/dllmain.d
@@ -179,8 +179,3 @@ bool GetCoverageData(const(char)* fname, uint line, uint* data, uint cnt, float*
 	string filename = to!string(fname);
 	return Package.GetLanguageService().GetCoverageData(filename, line, data, cnt, covPercent);
 }
-
-///////////////////////////////////////////////////////////////////////
-// only the first export has a '_' prefix
-//extern(C) export void dummy () { }
-
diff --git a/visuald/dpackage.d b/visuald/dpackage.d
@@ -1263,6 +1263,10 @@ class GlobalOptions
 			{
 				return toUTF8(getWStringOpt(tag, def));
 			}
+			string getPathsOpt(wstring tag, wstring def = null)
+			{
+				return replaceSemiCrLf(toUTF8(getWStringOpt(tag, def)));
+			}
 			int getIntOpt(wstring tag, int def = 0)
 			{
 				int v = keyToolOpts.GetDWORD(tag, def);
@@ -1320,12 +1324,12 @@ class GlobalOptions
 				enum string prefix = dmd ? "" : compiler ~ ".";
 				opt.InstallDir    = getStringOpt(compiler ~ "InstallDir");
 
-				opt.ExeSearchPath = getStringOpt(prefix ~ "ExeSearchPath");
-				opt.LibSearchPath = getStringOpt(prefix ~ "LibSearchPath");
-				opt.ImpSearchPath = getStringOpt(prefix ~ "ImpSearchPath");
-				opt.ExeSearchPath64 = getStringOpt(prefix ~ "ExeSearchPath64", to!wstring(opt.ExeSearchPath));
-				opt.LibSearchPath64 = getStringOpt(prefix ~ "LibSearchPath64", defLibPath64);
-
+				opt.ExeSearchPath = getPathsOpt(prefix ~ "ExeSearchPath");
+				opt.LibSearchPath = getPathsOpt(prefix ~ "LibSearchPath");
+				opt.ImpSearchPath = getPathsOpt(prefix ~ "ImpSearchPath");
+				opt.ExeSearchPath64 = getPathsOpt(prefix ~ "ExeSearchPath64", to!wstring(opt.ExeSearchPath));
+				opt.LibSearchPath64 = getPathsOpt(prefix ~ "LibSearchPath64", defLibPath64);
+				
 				opt.overrideIni64     = getBoolOpt(prefix ~ "overrideIni64", dmd);
 				opt.overrideLinker64  = getStringOpt(prefix ~ "overrideLinker64", dmd ? r"$(VCINSTALLDIR)\bin\link.exe" : "");
 				opt.overrideOptions64 = getStringOpt(prefix ~ "overrideOptions64");
@@ -1334,7 +1338,7 @@ class GlobalOptions
 			readCompilerOptions!"GDC"(GDC, null);
 			readCompilerOptions!"LDC"(LDC, null);
 
-			JSNSearchPath     = getStringOpt("JSNSearchPath");
+			JSNSearchPath     = getPathsOpt("JSNSearchPath");
 			IncSearchPath     = getStringOpt("IncSearchPath");
 			VDServerIID       = getStringOpt("VDServerIID");
 			compileAndRunOpts = getStringOpt("compileAndRunOpts", "-unittest");
diff --git a/visuald/dproject.d b/visuald/dproject.d
@@ -10,6 +10,7 @@ module visuald.dproject;
 
 import visuald.windows;
 import core.stdc.string : memcpy;
+import core.stdc.wchar_ : wcslen;
 import std.windows.charset;
 import std.string;
 import std.utf;
diff --git a/visuald/hierarchy.d b/visuald/hierarchy.d
@@ -17,6 +17,7 @@ import std.file;
 import std.utf;
 import std.array;
 import std.algorithm;
+import std.process : browse;
 
 import stdext.path;
 import stdext.file;
diff --git a/visuald/hierutil.d b/visuald/hierutil.d
@@ -15,6 +15,7 @@ import std.utf;
 import std.stream;
 import std.array;
 import std.conv;
+import core.stdc.wchar_ : wcslen;
 
 import stdext.path;
 import stdext.array;
diff --git a/visuald/register.d b/visuald/register.d
@@ -589,9 +589,9 @@ version(none){
 		keyToolOpts.Set("Page"w, GUID2wstring(g_ToolsProperty2Page));
 
 		if(keyToolOpts.GetString("ExeSearchPath"w).length == 0)
-			keyToolOpts.Set("ExeSearchPath"w, "$(DMDInstallDir)windows\\bin;$(WindowsSdkDir)\\bin"w);
+			keyToolOpts.Set("ExeSearchPath"w, "$(DMDInstallDir)windows\\bin;$(VSINSTALLDIR)\\Common7\\IDE;$(WindowsSdkDir)\\bin"w, false);
 		if(keyToolOpts.GetString("IncSearchPath"w).length == 0)
-			keyToolOpts.Set("IncSearchPath"w, "$(WindowsSdkDir)\\include;$(DevEnvDir)..\\..\\VC\\include"w);
+			keyToolOpts.Set("IncSearchPath"w, "$(WindowsSdkDir)\\include;$(DevEnvDir)..\\..\\VC\\include"w, false);
 
 		// remove old page
 		RegDeleteRecursive(keyRoot, registrationRoot ~ regPathToolsDirsOld);
diff --git a/visuald/viewfilter.d b/visuald/viewfilter.d
@@ -1306,6 +1306,11 @@ else
 			{
 				imp ~= "i";
 				hr = OpenFileInSolution(imp, -1, file, false);
+				if(hr != S_OK)
+				{
+					imp = imp[0 .. $-3] ~ "\\package.d";
+					hr = OpenFileInSolution(imp, -1, file, false);
+				}
 			}
 			return hr;
 		}

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,16 @@ string unquoteArgument(string arg)`
`76`	`76`	`return arg[1..$-1];`
`77`	`77`	`}`
`78`	`78`
`79`		`-string replaceCrLf(string s)`
	`79`	`+string replaceCrLfSemi(string s)`
`80`	`80`	`{`
`81`	`81`	`return replace(replace(s, "\n", ";"), "\r", "");`
`82`	`82`	`}`
`83`	`83`
	`84`	`+string replaceSemiCrLf(string s)`
	`85`	`+{`
	`86`	`+ return replace(s, ";", "\r\n");`
	`87`	`+}`
	`88`	`+`
`84`	`89`	`string insertCr(string s)`
`85`	`90`	`{`
`86`	`91`	`string ns;`