mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-04-06 11:59:02 +02:00
Merged dmdfe 2.031.
This commit is contained in:
@@ -46,7 +46,6 @@ AggregateDeclaration::AggregateDeclaration(Loc loc, Identifier *id)
|
||||
stag = NULL;
|
||||
sinit = NULL;
|
||||
#endif
|
||||
scope = NULL;
|
||||
isnested = 0;
|
||||
vthis = NULL;
|
||||
|
||||
@@ -70,7 +69,7 @@ enum PROT AggregateDeclaration::prot()
|
||||
void AggregateDeclaration::semantic2(Scope *sc)
|
||||
{
|
||||
//printf("AggregateDeclaration::semantic2(%s)\n", toChars());
|
||||
if (scope)
|
||||
if (scope && members)
|
||||
{ error("has forward references");
|
||||
return;
|
||||
}
|
||||
@@ -89,9 +88,10 @@ void AggregateDeclaration::semantic2(Scope *sc)
|
||||
void AggregateDeclaration::semantic3(Scope *sc)
|
||||
{ int i;
|
||||
|
||||
// LDC
|
||||
#if IN_LLVM
|
||||
if (!global.params.useAvailableExternally)
|
||||
availableExternally = false;
|
||||
#endif
|
||||
|
||||
//printf("AggregateDeclaration::semantic3(%s)\n", toChars());
|
||||
if (members)
|
||||
@@ -288,6 +288,7 @@ void StructDeclaration::semantic(Scope *sc)
|
||||
}
|
||||
|
||||
parent = sc->parent;
|
||||
type = type->semantic(loc, sc);
|
||||
#if STRUCTTHISREF
|
||||
handle = type;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user