Skip to content

Commit 772c2c5

Browse files
rainersrainers
committed
fix build after merge
1 parent 4c8e6eb commit 772c2c5

File tree

5 files changed

+35
-17
lines changed

5 files changed

+35
-17
lines changed

‎vdc/dmdserver/dmd‎

Submodule dmd updated 817 files

‎vdc/dmdserver/dmdinit.d‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
module vdc.dmdserver.dmdinit;
1010

1111
import dmd.arraytypes;
12+
import dmd.astenums;
1213
import dmd.builtin;
1314
import dmd.cond;
1415
import dmd.compiler;
@@ -45,7 +46,10 @@ alias EscapeInfer = RootObject[int];
4546
enum string[2][] dmdStatics =
4647
[
4748
["_D3dmd5clone12buildXtoHashFCQBa7dstruct17StructDeclarationPSQCg6dscope5ScopeZ8tftohashCQDh5mtype12TypeFunction", "TypeFunction"],
48-
["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
49+
// < 2.110
50+
// ["_D3dmd7dstruct15search_toStringRCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
51+
// 2.110
52+
["_D3dmd7dstruct15search_toStringFCQBfQBe17StructDeclarationZ10tftostringCQCs5mtype12TypeFunction", "TypeFunction"],
4953
// 2.103
5054
["_D3dmd7dmodule6Module11loadStdMathFZ8std_mathCQBsQBrQBm", "Module"],
5155
["_D3dmd7dmodule6Module14loadCoreAtomicFZ11core_atomicCQBzQByQBt", "Module"],
@@ -62,9 +66,13 @@ enum string[2][] dmdStatics =
6266
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt7globals3LocPSQCk6dscope5ScopeZ11visitAArrayMFCQDrQCp10TypeAArrayZ5fhashCQEr4func15FuncDeclaration", "FuncDeclaration"],
6367
// ["_D3dmd5lexer13TimeStampInfo8initdoneb", "bool"],
6468
// 2.103
65-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
66-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
67-
["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
69+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
70+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
71+
// ["_D3dmd7typesem12typeSemanticRCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
72+
// 2.110
73+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ3feqCQEq4func15FuncDeclaration", "FuncDeclaration"],
74+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ4fcmpCQEr4func15FuncDeclaration", "FuncDeclaration"],
75+
["_D3dmd7typesem12typeSemanticFCQBc5mtype4TypeKxSQBt8location3LocPSQCl6dscope5ScopeZ11visitAArrayMFCQDsQCq10TypeAArrayZ5fhashCQEs4func15FuncDeclaration", "FuncDeclaration"],
6876

6977
["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ11visitAArrayMFCQFcQEi10TypeAArrayZ8fd_aaLenCQGf4func15FuncDeclaration", "FuncDeclaration"],
7078
["_D3dmd7typesem6dotExpFCQv5mtype4TypePSQBk6dscope5ScopeCQCb10expression10ExpressionCQDdQBc8DotIdExpEQDtQCz10DotExpFlagZ8noMemberMFQEdQDsQDdCQFh10identifier10IdentifieriZ4nesti", "int"],
@@ -288,7 +296,7 @@ void dmdSetupParams(const ref Options opts)
288296
global.params.ddoc.files = Strings();
289297
// Default to -m32 for 32 bit dmd, -m64 for 64 bit dmd
290298
target.isX86_64 = opts.x64;
291-
target.omfobj = !opts.msvcrt;
299+
//target.omfobj = !opts.msvcrt;
292300
target.cpu = CPU.baseline;
293301
target.isLP64 = opts.x64;
294302

@@ -337,7 +345,7 @@ void dmdSetupParams(const ref Options opts)
337345
foreach(v; opts.versionIds)
338346
versionids.push(toStringz(v));
339347

340-
global.versionids = new Identifiers();
348+
global.versionids.setDim(0);
341349
// Add in command line versions
342350
foreach (charz; *versionids)
343351
{
@@ -360,18 +368,18 @@ void dmdSetupParams(const ref Options opts)
360368
foreach(d; opts.debugIds)
361369
debugids.push(toStringz(d));
362370

363-
global.debugids = new Identifiers();
371+
global.debugids.setDim(0);
364372
foreach (charz; *debugids)
365373
{
366374
global.debugids.push(new Identifier(charz));
367375
DebugCondition.addGlobalIdent(charz[0 .. strlen(charz)]);
368376
}
369377

370-
global.path = new Strings();
378+
global.path.setDim(0);
371379
foreach(i; opts.importDirs)
372380
global.path.push(toStringz(i));
373381

374-
global.filePath = new Strings();
382+
global.filePath.setDim(0);
375383
foreach(i; opts.stringImportDirs)
376384
global.filePath.push(toStringz(i));
377385
}

‎vdc/dmdserver/dmdserver.visualdproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,9 @@
17681768
<Folder name="dmd">
17691769
<Folder name="common">
17701770
<File path="dmd\compiler\src\dmd\common\bitfields.d" />
1771+
<File path="dmd\compiler\src\dmd\common\charactertables.d" />
17711772
<File path="dmd\compiler\src\dmd\common\file.d" />
1773+
<File path="dmd\compiler\src\dmd\common\identifiertables.d" />
17721774
<File path="dmd\compiler\src\dmd\common\int128.d" />
17731775
<File path="dmd\compiler\src\dmd\common\outbuffer.d" />
17741776
<File path="dmd\compiler\src\dmd\common\smallbuffer.d" />
@@ -1809,6 +1811,8 @@
18091811
<File path="dmd\compiler\src\dmd\astenums.d" />
18101812
<File path="dmd\compiler\src\dmd\asttypename.d" tool="None" />
18111813
<File path="dmd\compiler\src\dmd\attrib.d" />
1814+
<File path="dmd\compiler\src\dmd\attribsem.d" />
1815+
<File path="dmd\compiler\src\dmd\basicmangle.d" />
18121816
<File path="dmd\compiler\src\dmd\blockexit.d" />
18131817
<File path="dmd\compiler\src\dmd\boostlicense.txt" />
18141818
<File path="dmd\compiler\src\dmd\builtin.d" />
@@ -1848,6 +1852,7 @@
18481852
<File path="dmd\compiler\src\dmd\e2ir.d" tool="None" />
18491853
<File path="dmd\compiler\src\dmd\eh.d" tool="None" />
18501854
<File path="dmd\compiler\src\dmd\entity.d" />
1855+
<File path="dmd\compiler\src\dmd\enumsem.d" />
18511856
<File path="dmd\compiler\src\dmd\errors.d" />
18521857
<File path="dmd\compiler\src\dmd\errorsink.d" />
18531858
<File path="dmd\compiler\src\dmd\escape.d" />
@@ -1857,11 +1862,12 @@
18571862
<File path="dmd\compiler\src\dmd\foreachvar.d" />
18581863
<File path="dmd\compiler\src\dmd\frontend.d" tool="None" />
18591864
<File path="dmd\compiler\src\dmd\func.d" />
1865+
<File path="dmd\compiler\src\dmd\funcsem.d" />
18601866
<File path="dmd\compiler\src\dmd\globals.d" />
18611867
<File path="dmd\compiler\src\dmd\glue.d" tool="None" />
18621868
<File path="dmd\compiler\src\dmd\gluelayer.d" />
18631869
<File path="dmd\compiler\src\dmd\hdrgen.d" />
1864-
<File path="dmd\compiler\src\dmd\iasm.d" tool="None" />
1870+
<File path="dmd\compiler\src\dmd\iasm.d" />
18651871
<File path="dmd\compiler\src\dmd\iasmdmd.d" tool="None" />
18661872
<File path="dmd\compiler\src\dmd\iasmgcc.d" tool="None" />
18671873
<File path="dmd\compiler\src\dmd\id.d" />
@@ -1899,6 +1905,7 @@
18991905
<File path="dmd\compiler\src\dmd\parsetimevisitor.d" />
19001906
<File path="dmd\compiler\src\dmd\permissivevisitor.d" />
19011907
<File path="dmd\compiler\src\dmd\postordervisitor.d" />
1908+
<File path="dmd\compiler\src\dmd\pragmasem.d" />
19021909
<File path="dmd\compiler\src\dmd\printast.d" />
19031910
<File path="dmd\compiler\src\dmd\root\region.d" />
19041911
<File path="dmd\compiler\src\dmd\rootobject.d" />
@@ -1921,6 +1928,7 @@
19211928
<File path="dmd\compiler\src\dmd\strictvisitor.d" />
19221929
<File path="dmd\compiler\src\dmd\target.d" />
19231930
<File path="dmd\compiler\src\dmd\templateparamsem.d" />
1931+
<File path="dmd\compiler\src\dmd\templatesem.d" />
19241932
<File path="dmd\compiler\src\dmd\tocsym.d" tool="None" />
19251933
<File path="dmd\compiler\src\dmd\toctype.d" tool="None" />
19261934
<File path="dmd\compiler\src\dmd\tocvdebug.d" tool="None" />

‎vdc/dmdserver/semanalysis.d‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ void do_unittests()
10781078
checkTip(m, 24, 3, "(enum) `source.TOK`");
10791079
checkTip(m, 30, 10, "(class) `object.TypeInfo_Class`\n...");
10801080
checkTip(m, 30, 25, "(enum) `object.TypeInfo_Class.ClassFlags`");
1081-
checkTip(m, 30, 36, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
1081+
checkTip(m, 30, 36, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
10821082
checkTip(m, 21, 43, "(constant) `ulong source.RightBase.sizeof = 8LU`");
10831083

10841084
IdTypePos[][string] exp2 = [
@@ -1698,16 +1698,16 @@ void do_unittests()
16981698
m = checkErrors(source, "");
16991699
checkTip(m, 2, 18, "(class) `object.TypeInfo_Class`\n...");
17001700
checkTip(m, 2, 33, "(enum) `object.TypeInfo_Class.ClassFlags`");
1701-
checkTip(m, 2, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
1701+
checkTip(m, 2, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
17021702
checkTip(m, 5, 4, "(class) `object.TypeInfo_Class`\n...");
17031703
checkTip(m, 5, 19, "(enum) `object.TypeInfo_Class.ClassFlags`");
1704-
checkTip(m, 5, 30, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
1704+
checkTip(m, 5, 30, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
17051705
checkTip(m, 6, 8, "(class) `object.TypeInfo_Class`\n...");
17061706
checkTip(m, 6, 23, "(enum) `object.TypeInfo_Class.ClassFlags`");
1707-
checkTip(m, 6, 34, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = 1u`");
1707+
checkTip(m, 6, 34, "(enum value) `object.TypeInfo_Class.ClassFlags.isCOMclass = cast(ushort)1u`");
17081708
checkTip(m, 8, 18, "(class) `object.TypeInfo_Class`\n...");
17091709
checkTip(m, 8, 33, "(enum) `object.TypeInfo_Class.ClassFlags`");
1710-
checkTip(m, 8, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.noPointers = 2u`");
1710+
checkTip(m, 8, 44, "(enum value) `object.TypeInfo_Class.ClassFlags.noPointers = cast(ushort)2u`");
17111711
checkTip(m, 11, 18, "(field) `ulong int[].length`");
17121712
checkTip(m, 11, 32, "(field) `ulong int[int].length`");
17131713
checkTip(m, 12, 18, "(field) `int* int[].ptr`");

‎vdc/dmdserver/semvisitor.d‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ import dmd.statement;
5050
import dmd.staticassert;
5151
import dmd.target;
5252
import dmd.tokens;
53+
import dmd.typesem;
5354
import dmd.visitor;
5455

56+
import dmd.common.charactertables;
5557
import dmd.common.outbuffer;
5658
import dmd.root.file;
5759
import dmd.root.filename;
@@ -1448,7 +1450,7 @@ static const(char)* printSymbolWithLink(Dsymbol sym, bool qualifyTypes)
14481450
size_t pos = p;
14491451
if (utf_decodeChar(str, pos, dch) !is null)
14501452
break;
1451-
if (!isUniAlpha(dch))
1453+
if (!isAnyIdentifierCharacter(dch))
14521454
break;
14531455
p = pos;
14541456
}

0 commit comments

Comments
 (0)