Merge pull request #302 from rainers/master

changes for Visual D 1.4.1-beta2

Author: rainers

CHANGES

@@ -1414,3 +1414,10 @@ Version history
   * mago: fixed display of AA key in expanded view
   * issue #291: allow overriding the default compiler executable path in the VC project settings
   * issue #296: VC project integration: added support to build for ARM64 with LDC
+
+2025-05-01 version 1.4.1-beta2
+  * issue #300: storage class adornments not updated after edits
+  * issue #301: mago: strip modifier from type before detecting arrays
+  * mago: improved stability when displaying arrays from invalid memory address
+  * dmdserver: fixed a couple of assertions causing the server to restart
+  * dmdserver: replaced new location storage to avoid leaking memory

VERSION

@@ -2,4 +2,4 @@
 #define VERSION_MINOR      4
 #define VERSION_REVISION   1
 #define VERSION_BETA       -beta
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2

vdc/dmdserver/dmd

@@ -23,11 +23,13 @@ import dmd.dmodule;
 import dmd.dstruct;
 import dmd.dsymbol;
 import dmd.dtemplate;
+import dmd.escape;
 import dmd.expression;
 import dmd.func;
 import dmd.globals;
 import dmd.id;
 import dmd.identifier;
+import dmd.location;
 import dmd.mtype;
 import dmd.objc;
 import dmd.rootobject;
@@ -42,6 +44,8 @@ import core.stdc.string;
 ////////////////////////////////////////////////////////////////
 alias countersType = uint[uint]; // actually uint[Key]
 alias EscapeInfer = RootObject[int];
+enum uint_1 : uint { initValue = 1 }
+
 
 enum string[2][] dmdStatics =
 [
@@ -108,6 +112,7 @@ enum string[2][] dmdStatics =
 	["_D3dmd7arrayop7arrayOpFCQw10expression6BinExpPSQBt6dscope5ScopeZQByCQCo9dtemplate19TemplateDeclaration", "TemplateDeclaration"],
 	["_D3dmd6errors18colorHighlightCodeFNbKSQBk6common9outbuffer9OutBufferZ6nestedi", "int"],
 	["_D3dmd7dmodule6Module18loadCoreStdcConfigFZ16core_stdc_configCQCiQChQCc", "Module"],
+	// EscapeState.reset not accessible in package dmd
 	["_D3dmd6escape11EscapeState17scopeInferFailureHiCQBu10rootobject10RootObject", "EscapeInfer" ],
 ];
 
@@ -135,7 +140,7 @@ string genInitDmdStatics()
 {
 	string s;
 	foreach (decl; dmdStatics)
-		s ~= cmangled(decl[0]) ~ " = " ~ decl[1] ~ ".init;\n";
+		s ~= cmangled(decl[0]) ~ " = (" ~ decl[1] ~ ").init;\n";
 	return s;
 }
 
@@ -197,6 +202,7 @@ void dmdInit()
 	//Token._init();
 	Id.initialize();
 	Expression._init();
+	location_init();
 
 	target._init(global.params); // needed by Type._init
 	Type._init();
@@ -394,6 +400,63 @@ void dmdSetupParams(const ref Options opts)
 	global.filePath.setDim(0);
 	foreach(i; opts.stringImportDirs)
 		global.filePath.push(toStringz(i));
+
+	dmdSetupCompileEnv();
+}
+
+void dmdSetupCompileEnv()
+{
+	import dmd.common.charactertables;
+
+	global.compileEnv.previewIn        = global.params.previewIn;
+	global.compileEnv.transitionIn     = global.params.v.vin;
+	global.compileEnv.ddocOutput       = global.params.ddoc.doOutput;
+
+	final switch(global.params.cIdentifierTable)
+	{
+		case CLIIdentifierTable.C99:
+			global.compileEnv.cCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.C99);
+			break;
+
+		case CLIIdentifierTable.C11:
+		case CLIIdentifierTable.default_:
+			// ImportC is defined against C11, not C23.
+			// If it was C23 this needs to be changed to UAX31 instead.
+			global.compileEnv.cCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.C11);
+			break;
+
+		case CLIIdentifierTable.UAX31:
+			global.compileEnv.cCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.UAX31);
+			break;
+
+		case CLIIdentifierTable.All:
+			global.compileEnv.cCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.LR);
+			break;
+	}
+
+	final switch(global.params.dIdentifierTable)
+	{
+		case CLIIdentifierTable.C99:
+			global.compileEnv.dCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.C99);
+			break;
+
+		case CLIIdentifierTable.C11:
+			global.compileEnv.dCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.C11);
+			break;
+
+		case CLIIdentifierTable.UAX31:
+			global.compileEnv.dCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.UAX31);
+			break;
+
+		case CLIIdentifierTable.All:
+		case CLIIdentifierTable.default_:
+			// @@@DEPRECATED_2.119@@@
+			// Change the default to UAX31,
+			//  this is a breaking change as C99 (what D used for ~23 years),
+			//  has characters that are not in UAX31.
+			global.compileEnv.dCharLookupTable = IdentifierCharLookup.forTable(IdentifierTable.LR);
+			break;
+	}
 }
 
 // initialization that are necessary before restarting an analysis (which might run