Skip to content

Commit

Permalink
Resurrect line spaces in denum.d
Browse files Browse the repository at this point in the history
  • Loading branch information
@9rnsr
9rnsr committed Oct 5, 2015
1 parent 44959a1 commit 8875575
Showing 1 changed file with 53 additions and 0 deletions.
53 changes: 53 additions & 0 deletions src/denum.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,18 @@ public:
printf(" member %s\n", em.toChars());
}
}

/* Anonymous enum members get added to enclosing scope.
*/
ScopeDsymbol scopesym = isAnonymous() ? sds : this;

if (!isAnonymous())
{
ScopeDsymbol.addMember(sc, sds);
if (!symtab)
symtab = new DsymbolTable();
}

if (members)
{
for (size_t i = 0; i < members.dim; i++)
Expand Down Expand Up @@ -122,27 +125,34 @@ public:
return;
}
uint dprogress_save = Module.dprogress;

Scope* scx = null;
if (_scope)
{
sc = _scope;
scx = _scope; // save so we don't make redundant copies
_scope = null;
}

parent = sc.parent;
type = type.semantic(loc, sc);

protection = sc.protection;
if (sc.stc & STCdeprecated)
isdeprecated = true;
userAttribDecl = sc.userAttribDecl;

semanticRun = PASSsemantic;

if (!members && !memtype) // enum ident;
{
semanticRun = PASSsemanticdone;
return;
}

if (!symtab)
symtab = new DsymbolTable();

/* The separate, and distinct, cases are:
* 1. enum { ... }
* 2. enum : memtype { ... }
Expand All @@ -151,9 +161,11 @@ public:
* 5. enum ident : memtype;
* 6. enum ident;
*/

if (memtype)
{
memtype = memtype.semantic(loc, sc);

/* Check to see if memtype is forward referenced
*/
if (memtype.ty == Tenum)
Expand Down Expand Up @@ -191,16 +203,21 @@ public:
return;
}
}

semanticRun = PASSsemanticdone;

if (!members) // enum ident : memtype;
return;

if (members.dim == 0)
{
error("enum %s must have at least one member", toChars());
errors = true;
return;
}

Module.dprogress++;

Scope* sce;
if (isAnonymous())
sce = sc;
Expand All @@ -211,6 +228,7 @@ public:
}
sce = sce.startCTFE();
sce.setNoFree(); // needed for getMaxMinValue()

/* Each enum member gets the sce scope
*/
for (size_t i = 0; i < members.dim; i++)
Expand All @@ -219,6 +237,7 @@ public:
if (em)
em._scope = sce;
}

if (!added)
{
/* addMember() is not called when the EnumDeclaration appears as a function statement,
Expand Down Expand Up @@ -247,6 +266,7 @@ public:
// Otherwise enum members are in the EnumDeclaration's symbol table
scopesym = this;
}

for (size_t i = 0; i < members.dim; i++)
{
EnumMember em = (*members)[i].isEnumMember();
Expand All @@ -257,13 +277,15 @@ public:
}
}
}

for (size_t i = 0; i < members.dim; i++)
{
EnumMember em = (*members)[i].isEnumMember();
if (em)
em.semantic(em._scope);
}
//printf("defaultval = %lld\n", defaultval);

//if (defaultval) printf("defaultval: %s %s\n", defaultval->toChars(), defaultval->type->toChars());
//printf("members = %s\n", members->toChars());
}
Expand Down Expand Up @@ -293,12 +315,14 @@ public:
// Try one last time to resolve this enum
semantic(_scope);
}

if (!members || !symtab || _scope)
{
error("is forward referenced when looking for '%s'", ident.toChars());
//*(char*)0=0;
return null;
}

Dsymbol s = ScopeDsymbol.search(loc, ident, flags);
return s;
}
Expand All @@ -323,14 +347,17 @@ public:
{
//printf("EnumDeclaration::getMaxValue()\n");
bool first = true;

Expression* pval = (id == Id.max) ? &maxval : &minval;

if (inuse)
{
error(loc, "recursive definition of .%s property", id.toChars());
goto Lerrors;
}
if (*pval)
goto Ldone;

if (_scope)
semantic(_scope);
if (errors)
Expand All @@ -345,13 +372,15 @@ public:
error(loc, "has no .%s property because base type %s is not an integral type", id.toChars(), memtype ? memtype.toChars() : "");
goto Lerrors;
}

for (size_t i = 0; i < members.dim; i++)
{
EnumMember em = (*members)[i].isEnumMember();
if (!em)
continue;
if (em.errors)
goto Lerrors;

Expression e = em.value;
if (first)
{
Expand All @@ -365,6 +394,7 @@ public:
* and let the semantic analyzer and constant
* folder give us the result.
*/

/* Compute:
* if (e > maxval)
* maxval = e;
Expand All @@ -388,6 +418,7 @@ public:
}
return e;
}

Lerrors:
*pval = new ErrorExp();
return *pval;
Expand All @@ -398,6 +429,7 @@ public:
//printf("EnumDeclaration::getDefaultValue() %p %s\n", this, toChars());
if (defaultval)
return defaultval;

if (_scope)
semantic(_scope);
if (errors)
Expand All @@ -407,6 +439,7 @@ public:
error(loc, "forward reference of %s.init", toChars());
goto Lerrors;
}

for (size_t i = 0; i < members.dim; i++)
{
EnumMember em = (*members)[i].isEnumMember();
Expand All @@ -415,6 +448,7 @@ public:
defaultval = em.value;
return defaultval;
}

Lerrors:
defaultval = new ErrorExp();
return defaultval;
Expand Down Expand Up @@ -524,16 +558,20 @@ public:
goto Lerrors;
if (errors || semanticRun >= PASSsemanticdone)
return;

semanticRun = PASSsemantic;
if (_scope)
sc = _scope;

// The first enum member is special
bool first = (this == (*ed.members)[0]);

if (type)
{
type = type.semantic(loc, sc);
assert(value); // "type id;" is not a valid enum member declaration
}

if (value)
{
Expression e = value;
Expand Down Expand Up @@ -562,6 +600,7 @@ public:
EnumMember em = (*ed.members)[i].isEnumMember();
if (!em || em == this || em.semanticRun < PASSsemanticdone || em.type)
continue;

//printf("[%d] em = %s, em->semanticRun = %d\n", i, toChars(), em->semanticRun);
Expression ev = em.value;
ev = ev.implicitCastTo(sc, ed.memtype);
Expand All @@ -578,12 +617,15 @@ public:
}
}
}

if (ed.memtype && !type)
{
e = e.implicitCastTo(sc, ed.memtype);
e = e.ctfeInterpret();

// save origValue for better json output
origValue = e;

if (!ed.isAnonymous())
e = e.castTo(sc, ed.type);
}
Expand All @@ -592,6 +634,7 @@ public:
e = e.implicitCastTo(sc, type);
e = e.ctfeInterpret();
assert(ed.isAnonymous());

// save origValue for better json output
origValue = e;
}
Expand All @@ -611,8 +654,10 @@ public:
Expression e = new IntegerExp(loc, 0, Type.tint32);
e = e.implicitCastTo(sc, t);
e = e.ctfeInterpret();

// save origValue for better json output
origValue = e;

if (!ed.isAnonymous())
e = e.castTo(sc, ed.type);
value = e;
Expand All @@ -638,11 +683,14 @@ public:
emprev.semantic(emprev._scope); // resolve it
if (emprev.errors)
goto Lerrors;

Expression eprev = emprev.value;
Type tprev = eprev.type.equals(ed.type) ? ed.memtype : eprev.type;

Expression emax = tprev.getProperty(ed.loc, Id.max, 0);
emax = emax.semantic(sc);
emax = emax.ctfeInterpret();

// Set value to (eprev + 1).
// But first check that (eprev != emax)
assert(eprev);
Expand All @@ -660,6 +708,7 @@ public:
e = e.semantic(sc);
e = e.castTo(sc, eprev.type);
e = e.ctfeInterpret();

// save origValue (without cast) for better json output
if (e.op != TOKerror) // avoid duplicate diagnostics
{
Expand All @@ -668,6 +717,7 @@ public:
origValue = origValue.semantic(sc);
origValue = origValue.ctfeInterpret();
}

if (e.op == TOKerror)
goto Lerrors;
if (e.type.isfloating())
Expand All @@ -684,6 +734,7 @@ public:
}
value = e;
}

assert(origValue);
semanticRun = PASSsemanticdone;
}
Expand All @@ -697,8 +748,10 @@ public:
{
assert(value);
vd = new VarDeclaration(loc, type, ident, new ExpInitializer(loc, value.copy()));

vd.storage_class = STCmanifest;
vd.semantic(sc);

vd.protection = ed.isAnonymous() ? ed.protection : Prot(PROTpublic);
vd.parent = ed.isAnonymous() ? ed.parent : ed;
vd.userAttribDecl = ed.isAnonymous() ? ed.userAttribDecl : null;
Expand Down

0 comments on commit 8875575

Please sign in to comment.