Merge pull request #137 from rainers/master

rainers · web-flow · commit e67848ff0388 · 2022-06-05T10:37:20.000+02:00
Visual D 1.3.0
diff --git a/CHANGES b/CHANGES
@@ -1322,10 +1322,15 @@ Version history
   * installer:
     - full installer now bundled with DMD 2.098.1 and LDC 1.28.1
 
-unreleased version 1.3.0
-  * dmdserver updated to frontend of DMD 2.099.1-beta
-  * full installer now bundled with DMD 2.099.1 and LDC 1.28.1
-  * bugzilla 22747: D files in VC projects failed to build, added separate versions of
+2022-06-05 version 1.3.0
+  * dmdserver updated to frontend of DMD 2.100.0
+  * full installer now bundled with DMD 2.100.0 and LDC 1.29.0
+  * bugzilla 22747: D files in VC projects failed to build in VS 2022, added separate versions of
     Microsoft.Build.CPPTasks.Common for 17.0, 17.1 and 17.2.
   * bugzilla 22764: now searches the 32-bit registry hive for install paths of DMD and LDC
-  * cv2pdb 0.51: added DWARF support for non-contiguous functions.
+  * bugzilla 23069: mago crashing when debugging VARIANT data type in VS 2022
+  * bugzilla 23043: project templates missing in VS 2022 until configuration manually updated
+  * semantic analysis: without a project loaded, a D file is now analized using the compile options
+    of "Compile and Run" with an import path derived from the module declaration.
+  * visualdproj: exit code printed for failed commands
+  * cv2pdb 0.52: improved DWARF support for non-contiguous functions, bug fixes
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR      1
 #define VERSION_MINOR      3
 #define VERSION_REVISION   0
-#define VERSION_BETA       -rc
-#define VERSION_BUILD      1
+#define VERSION_BETA       
+#define VERSION_BUILD      0
diff --git a/doc/StartPage.dd b/doc/StartPage.dd
@@ -85,6 +85,13 @@ $(H2 News)
 $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
 )
 
+2022-06-05 Version 1.3.0
+ $(UL
+  $(LI dmdserver updated to frontend of DMD 2.100.0)
+  $(LI fixed support VC-Project integration for VS 2022 17.0 and 17.2)
+  $(LI full installer now bundled with DMD 2.100.0 and LDC 1.29.0)
+ )
+
 2022-01-15 Version 1.2.0
  $(UL
   $(LI added support for VS 2022)
@@ -98,13 +105,6 @@ $(P $(LINK2 VersionHistory.html, Full version history and complete details...)
   $(LI full installer now bundled with DMD 2.096.1 and LDC 1.25.1)
  )
 
-2021-03-02 Version 1.1.0
- $(UL
-  $(LI semantic engine updated to frontend of DMD 2.095.1)
-  $(LI experimental: show parameter storage ref/out/lazy at call site)
-  $(LI integrated dfmt for "Format Document")
- )
-
 $(LINK2 VersionHistory.html, more...)
 
 $(H2 Download)
diff --git a/doc/VersionHistory.dd b/doc/VersionHistory.dd
@@ -1,5 +1,20 @@
 Ddoc
 
+$(H2 2022-06-05 Version 1.3.0)
+ $(UL
+  $(LI dmdserver updated to frontend of DMD 2.100.0)
+  $(LI full installer now bundled with DMD 2.100.0 and LDC 1.29.0)
+  $(LI bugzilla 22747: D files in VC projects failed to build in VS 2022, added separate versions of
+       Microsoft.Build.CPPTasks.Common for 17.0, 17.1 and 17.2.)
+  $(LI bugzilla 22764: now searches the 32-bit registry hive for install paths of DMD and LDC)
+  $(LI bugzilla 23069: mago crashing when debugging VARIANT data type in VS 2022)
+  $(LI bugzilla 23043: project templates missing in VS 2022 until configuration manually updated)
+  $(LI semantic analysis: without a project loaded, a D file is now analized using the compile options)
+  $(LI of "Compile and Run" with an import path derived from the module declaration.)
+  $(LI visualdproj: exit code printed for failed commands)
+  $(LI cv2pdb 0.52: improved DWARF support for non-contiguous functions, bug fixes)
+ )
+
 $(H2 2022-01-15 Version 1.2.0)
  $(UL
   $(LI added support for VS 2022)
diff --git a/doc/visuald.ddoc b/doc/visuald.ddoc
@@ -1,6 +1,6 @@
-VERSION = 1.2.0
-DMD_VERSION = 2.098.1
-LDC_VERSION = 1.28.1
+VERSION = 1.3.0
+DMD_VERSION = 2.100.0
+LDC_VERSION = 1.29.0
 ROOT_DIR = https://www.dlang.org/
 ROOT = https://www.dlang.org
 BODYCLASS = visuald
diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi
@@ -29,12 +29,12 @@
 
 ; define DMD source path to include dmd installation
 ; !define DMD 
-!define DMD_VERSION "2.099.0"
+!define DMD_VERSION "2.100.0"
 !define DMD_SRC c:\d\dmd-${DMD_VERSION}
 
 ; define LDC to include ldc installation
 ; !define LDC
-!define LDC_VERSION "1.28.1"
+!define LDC_VERSION "1.29.0"
 !define LDC_SRC c:\d\ldc2-${LDC_VERSION}-windows-multilib
 
 ; define VS2019 to include VS2019 support
@@ -681,7 +681,7 @@ ${MementoSection} "Install in VS 2022" SecVS2022
   ${File} ..\nsis\Extensions\ vdlogo.ico
   ${AddItem} "$1${EXTENSION_DIR}"
 
-  GetFullPathName /SHORT $0 $INSTDIR
+  GetFullPathName $0 $INSTDIR
   !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VDINSTALLPATH" "$0" NoBackup
   !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VSVERSION" "16" NoBackup
   !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VDVERSION" "${VERSION_MAJOR}.${VERSION_MINOR}" NoBackup
diff --git a/stdext/com.d b/stdext/com.d
@@ -64,7 +64,7 @@ class ComObject : IUnknown
 		return p;
 	}
 
-extern (System):
+extern (Windows):
 	override HRESULT QueryInterface(in IID* riid, void** ppv)
 	{
 		if (*riid == IID_IUnknown)
diff --git a/vdc/dmdserver/dmd b/vdc/dmdserver/dmd
@@ -1 +1 @@
-Subproject commit abd4560a30cb99299f42022b91f708cbe0f2c106
+Subproject commit b17fbeaf48fe0fd4c7c8919495801620c4eb92ce
diff --git a/vdc/dmdserver/dmdinit.d b/vdc/dmdserver/dmdinit.d
@@ -298,7 +298,7 @@ void dmdSetupParams(const ref Options opts)
 			case "-preview=intpromote": global.params.fix16997 = true; break;
 			case "-preview=dtorfields": global.params.dtorFields = FeatureState.enabled; break;
 			case "-preview=markdown": global.params.markdown = true; break;
-			case "-preview=rvaluerefparam": global.params.rvalueRefParam = true; break;
+			case "-preview=rvaluerefparam": global.params.rvalueRefParam = FeatureState.enabled; break;
 			case "-preview=nosharedaccess": global.params.noSharedAccess = true; break;
 			case "-preview=fixAliasThis": global.params.fixAliasThis = true; break;
 			case "-preview=in": global.params.previewIn = true; break;
@@ -422,6 +422,12 @@ void addDefaultVersionIdentifiers(const ref Param params)
 		VersionCondition.addPredefinedGlobalIdent("unittest");
 	if (params.useAssert == CHECKENABLE.on)
 		VersionCondition.addPredefinedGlobalIdent("assert");
+    if (params.useIn == CHECKENABLE.on)
+        VersionCondition.addPredefinedGlobalIdent("D_PreConditions");
+    if (params.useOut == CHECKENABLE.on)
+        VersionCondition.addPredefinedGlobalIdent("D_PostConditions");
+    if (params.useInvariants == CHECKENABLE.on)
+        VersionCondition.addPredefinedGlobalIdent("D_Invariants");
 	if (params.useArrayBounds == CHECKENABLE.off)
 		VersionCondition.addPredefinedGlobalIdent("D_NoBoundsChecks");
 	if (params.betterC)
@@ -436,6 +442,9 @@ void addDefaultVersionIdentifiers(const ref Param params)
 	}
 
 	VersionCondition.addPredefinedGlobalIdent("D_HardFloat");
+
+    if (params.tracegc)
+        VersionCondition.addPredefinedGlobalIdent("D_ProfileGC");
 }
 
 /**
@@ -490,6 +499,7 @@ void addPredefinedGlobalIdentifiers(const ref Target tgt)
 						case 10: predef("FreeBSD_10");  break;
 						case 11: predef("FreeBSD_11"); break;
 						case 12: predef("FreeBSD_12"); break;
+						case 13: predef("FreeBSD_13"); break;
 						default: predef("FreeBSD_11"); break;
 					}
 					break;
diff --git a/vdc/dmdserver/dmdserver.visualdproj b/vdc/dmdserver/dmdserver.visualdproj
@@ -1870,6 +1870,7 @@
    <File path="dmd\src\dmd\link.d" tool="None" />
    <File path="dmd\src\dmd\mars.d" tool="None" />
    <File path="dmd\src\dmd\mtype.d" />
+   <File path="dmd\src\dmd\mustuse.d" />
    <File path="dmd\src\dmd\nogc.d" />
    <File path="dmd\src\dmd\nspace.d" />
    <File path="dmd\src\dmd\ob.d" />
diff --git a/vdc/dmdserver/semanalysis.d b/vdc/dmdserver/semanalysis.d
@@ -1116,7 +1116,7 @@ void do_unittests()
 		}
 	};
 	m = checkErrors(source, "");
-	checkTip(m, 11,  14, "`string source.readln!string(dchar terminator = '\\x0a') pure nothrow @nogc @safe`"
+	checkTip(m, 11,  14, "`string source.readln!string(dchar terminator = '\\n') pure nothrow @nogc @safe`"
 			 ~ "\n\nRead line from `stdin`.");
 
 	source = q{                          // Line 1
@@ -1127,7 +1127,7 @@ void do_unittests()
 		}
 	};
 	m = checkErrors(source, "");
-	checkTip(m, 5,  14, "`string std.stdio.readln!string(dchar terminator = '\\x0a') @system`"
+	checkTip(m, 5,  14, "`string std.stdio.readln!string(dchar terminator = '\\n') @system`"
 			 ~ "\n\nRead line from `stdin`...");
 
 	// string expressions with concat
diff --git a/vdc/dmdserver/semvisitor.d b/vdc/dmdserver/semvisitor.d
@@ -2817,7 +2817,7 @@ Module cloneModule(Module mo)
 {
 	if (!mo)
 		return null;
-	Module m = new Module(mo.srcfile.toString(), mo.ident, mo.isDocFile, mo.isHdrFile);
+	Module m = new Module(mo.srcfile.toString(), mo.ident, cast(bool)mo.docfile, cast(bool)mo.hdrfile);
 	*cast(FileName*)&(m.srcfile) = mo.srcfile; // keep identical source file name pointer
 	m.isPackageFile = mo.isPackageFile;
 	m.md = mo.md;
@@ -2868,7 +2868,7 @@ Module createModuleFromText(string filename, string text)
 	string name = stripExtension(baseName(filename));
 	auto id = Identifier.idPool(name);
 	auto mod = new Module(filename, id, true, false);
-	mod.srcBuffer = new FileBuffer(cast(ubyte[])text);
+	mod.src = cast(ubyte[])text;
 	mod.read(Loc.initial);
 	mod.importedFrom = mod; // avoid skipping unittests
 	mod.parse();
diff --git a/visuald/comutil.d b/visuald/comutil.d
@@ -150,7 +150,7 @@ debug
 	}
 }
 
-extern (System):
+extern (Windows):
 	override HRESULT QueryInterface(in IID* riid, void** ppv)
 	{
 		HRESULT hr = super.QueryInterface(riid, ppv);
diff --git a/visuald/config.d b/visuald/config.d
@@ -3189,11 +3189,14 @@ class Config :	DisposingComObject,
 		}
 		if(cmd.length)
 		{
-			cmd = getEnvironmentChanges() ~ cmd ~ addopt ~ "\n:reportError\n";
+			cmd = getEnvironmentChanges() ~ cmd ~ addopt ~ "\n";
+			cmd ~= ":reportError\n";
+			cmd ~= "set ERR=%ERRORLEVEL%\n";
+			cmd ~= "if %ERR% LSS -65535 then ERR=0x%=EXITCODE%\n";
 			if(syntaxOnly)
-				cmd ~= "if %errorlevel% neq 0 echo Compiling " ~ file.GetFilename() ~ " failed!\n";
+				cmd ~= "if %errorlevel% neq 0 echo Compiling " ~ file.GetFilename() ~ " failed (error code %ERR%)!\n";
 			else
-				cmd ~= "if %errorlevel% neq 0 echo Building " ~ outfile ~ " failed!\n";
+				cmd ~= "if %errorlevel% neq 0 echo Building " ~ outfile ~ " failed (error code %ERR%)!\n";
 			cmd = mProjectOptions.replaceEnvironment(cmd, this, file.GetFilename(), outfile);
 		}
 		return cmd;
@@ -3436,7 +3439,7 @@ class Config :	DisposingComObject,
 		return files;
 	}
 
-	string[] filterTroublesomeOptions(string[] cmds)
+	static string[] filterTroublesomeOptions(string[] cmds)
 	{
 		// filter out options that can cause unexpected failures due to file accesses
 		size_t j = 0;
@@ -3470,8 +3473,11 @@ class Config :	DisposingComObject,
 			if (opts.additionalOptions.length)
 				cmd ~= " " ~ opts.additionalOptions;
 		}
-		cmd ~= " -v -o- dummy.obj";
+		return getCompilerVersionIDs(cmd, opts.versionids);
+	}
 
+	static string getCompilerVersionIDs(string cmd, string opt_versionids)
+	{
 		__gshared string[string] cachedVersions;
 		synchronized
 		{
@@ -3481,12 +3487,13 @@ class Config :	DisposingComObject,
 				cmd = quoteFilename(Package.GetGlobalOptions().LDC.getCompilerPath()) ~ cmd[4..$];
 			else if (cmd.startsWith("gdc "))
 				cmd = quoteFilename(Package.GetGlobalOptions().GDC.getCompilerPath()) ~ cmd[3..$];
+			cmd ~= " -v -o- dummy.obj";
 
 			string key = cmd;
 			if (auto p = key in cachedVersions)
 				return *p;
 
-			string versions = opts.versionids;
+			string versions = opt_versionids;
 			try
 			{
 				auto cmds = tokenizeArgs(cmd);
@@ -3871,7 +3878,9 @@ class Config :	DisposingComObject,
 		}
 		cmd ~= "\ngoto noError\n";
 		cmd ~= "\n:reportError\n";
-		cmd ~= "echo Building " ~ GetTargetPath() ~ " failed!\n";
+		cmd ~= "set ERR=%ERRORLEVEL%\n";
+		cmd ~= "if %ERR% LSS -65535 then ERR=0x%=EXITCODE%\n";
+		cmd ~= "echo Building " ~ GetTargetPath() ~ " failed (error code %ERR%)!\n";
 		cmd ~= "\n:noError\n";
 
 		return mProjectOptions.replaceEnvironment(cmd, this);
diff --git a/visuald/dlangsvc.d b/visuald/dlangsvc.d
diff --git a/visuald/lexutil.d b/visuald/lexutil.d

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class ComObject : IUnknown`
`64`	`64`	`return p;`
`65`	`65`	`}`
`66`	`66`
`67`		`-extern (System):`
	`67`	`+extern (Windows):`
`68`	`68`	`override HRESULT QueryInterface(in IID* riid, void** ppv)`
`69`	`69`	`{`
`70`	`70`	`if (*riid == IID_IUnknown)`