mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 21:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Rename short Scope fields (#20841)

Browse source 
* Rename short SCOPE fields

* Update headers
This commit is contained in:
Dennis 2025-02-10 17:22:51 +01:00 • committed by GitHub
parent 0542419acb
commit 5170f3fb69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/src/dmd/dscope.d
View file

@ -131,10 +131,10 @@ extern (C++) struct Scope
VarDeclaration varDecl; /// variable we are in during semantic2 VarDeclaration varDecl; /// variable we are in during semantic2
Dsymbol parent; /// parent to use Dsymbol parent; /// parent to use
LabelStatement slabel; /// enclosing labelled statement LabelStatement slabel; /// enclosing labelled statement
SwitchStatement sw; /// enclosing switch statement SwitchStatement switchStatement;/// enclosing switch statement
Statement tryBody; /// enclosing _body of TryCatchStatement or TryFinallyStatement Statement tryBody; /// enclosing _body of TryCatchStatement or TryFinallyStatement
TryFinallyStatement tf; /// enclosing try finally statement TryFinallyStatement tryFinally; /// enclosing try finally statement
ScopeGuardStatement os; /// enclosing scope(xxx) statement ScopeGuardStatement scopeGuard; /// enclosing scope(xxx) statement
Statement sbreak; /// enclosing statement that supports "break" Statement sbreak; /// enclosing statement that supports "break"
Statement scontinue; /// enclosing statement that supports "continue" Statement scontinue; /// enclosing statement that supports "continue"
ForeachStatement fes; /// if nested function for ForeachStatement, this is it ForeachStatement fes; /// if nested function for ForeachStatement, this is it

22
compiler/src/dmd/frontend.h
View file

@ -5271,7 +5271,7 @@ public:
bool hasVars; bool hasVars;
DefaultStatement* sdefault; DefaultStatement* sdefault;
Statement* tryBody; Statement* tryBody;
TryFinallyStatement* tf; TryFinallyStatement* tryFinally;
Array<GotoCaseStatement* > gotoCases; Array<GotoCaseStatement* > gotoCases;
Array<CaseStatement* >* cases; Array<CaseStatement* >* cases;
VarDeclaration* lastVar; VarDeclaration* lastVar;
@ -7170,10 +7170,10 @@ struct Scope final
VarDeclaration* varDecl; VarDeclaration* varDecl;
Dsymbol* parent; Dsymbol* parent;
LabelStatement* slabel; LabelStatement* slabel;
SwitchStatement* sw; SwitchStatement* switchStatement;
Statement* tryBody; Statement* tryBody;
TryFinallyStatement* tf; TryFinallyStatement* tryFinally;
ScopeGuardStatement* os; ScopeGuardStatement* scopeGuard;
Statement* sbreak; Statement* sbreak;
Statement* scontinue; Statement* scontinue;
ForeachStatement* fes; ForeachStatement* fes;
@ -7242,10 +7242,10 @@ public:
varDecl(), varDecl(),
parent(), parent(),
slabel(), slabel(),
sw(), switchStatement(),
tryBody(), tryBody(),
tf(), tryFinally(),
os(), scopeGuard(),
sbreak(), sbreak(),
scontinue(), scontinue(),
fes(), fes(),
@ -7278,7 +7278,7 @@ public:
argStruct() argStruct()
{ {
} }
Scope(Scope* enclosing, Module* _module = nullptr, ScopeDsymbol* scopesym = nullptr, FuncDeclaration* func = nullptr, VarDeclaration* varDecl = nullptr, Dsymbol* parent = nullptr, LabelStatement* slabel = nullptr, SwitchStatement* sw = nullptr, Statement* tryBody = nullptr, TryFinallyStatement* tf = nullptr, ScopeGuardStatement* os = nullptr, Statement* sbreak = nullptr, Statement* scontinue = nullptr, ForeachStatement* fes = nullptr, Scope* callsc = nullptr, Dsymbol* inunion = nullptr, bool nofree = false, bool inLoop = false, bool inDefaultArg = false, int32_t intypeof = 0, VarDeclaration* lastVar = nullptr, ErrorSink* eSink = nullptr, Module* minst = nullptr, TemplateInstance* tinst = nullptr, CtorFlow ctorflow = CtorFlow(), AlignDeclaration* aligndecl = nullptr, CPPNamespaceDeclaration* namespace_ = nullptr, LINK linkage = (LINK)1u, CPPMANGLE cppmangle = (CPPMANGLE)0u, PragmaDeclaration* inlining = nullptr, Visibility visibility = Visibility((Visibility::Kind)5u, nullptr), int32_t explicitVisibility = 0, uint64_t stc = 0LLU, DeprecatedDeclaration* depdecl = nullptr, uint16_t bitFields = 0u, Previews previews = Previews(), UserAttributeDeclaration* userAttribDecl = nullptr, DocComment* lastdc = nullptr, void* anchorCounts = nullptr, Identifier* prevAnchor = nullptr, AliasDeclaration* aliasAsg = nullptr, StructDeclaration* argStruct = nullptr) : Scope(Scope* enclosing, Module* _module = nullptr, ScopeDsymbol* scopesym = nullptr, FuncDeclaration* func = nullptr, VarDeclaration* varDecl = nullptr, Dsymbol* parent = nullptr, LabelStatement* slabel = nullptr, SwitchStatement* switchStatement = nullptr, Statement* tryBody = nullptr, TryFinallyStatement* tryFinally = nullptr, ScopeGuardStatement* scopeGuard = nullptr, Statement* sbreak = nullptr, Statement* scontinue = nullptr, ForeachStatement* fes = nullptr, Scope* callsc = nullptr, Dsymbol* inunion = nullptr, bool nofree = false, bool inLoop = false, bool inDefaultArg = false, int32_t intypeof = 0, VarDeclaration* lastVar = nullptr, ErrorSink* eSink = nullptr, Module* minst = nullptr, TemplateInstance* tinst = nullptr, CtorFlow ctorflow = CtorFlow(), AlignDeclaration* aligndecl = nullptr, CPPNamespaceDeclaration* namespace_ = nullptr, LINK linkage = (LINK)1u, CPPMANGLE cppmangle = (CPPMANGLE)0u, PragmaDeclaration* inlining = nullptr, Visibility visibility = Visibility((Visibility::Kind)5u, nullptr), int32_t explicitVisibility = 0, uint64_t stc = 0LLU, DeprecatedDeclaration* depdecl = nullptr, uint16_t bitFields = 0u, Previews previews = Previews(), UserAttributeDeclaration* userAttribDecl = nullptr, DocComment* lastdc = nullptr, void* anchorCounts = nullptr, Identifier* prevAnchor = nullptr, AliasDeclaration* aliasAsg = nullptr, StructDeclaration* argStruct = nullptr) :
enclosing(enclosing), enclosing(enclosing),
_module(_module), _module(_module),
scopesym(scopesym), scopesym(scopesym),
@ -7286,10 +7286,10 @@ public:
varDecl(varDecl), varDecl(varDecl),
parent(parent), parent(parent),
slabel(slabel), slabel(slabel),
sw(sw), switchStatement(switchStatement),
tryBody(tryBody), tryBody(tryBody),
tf(tf), tryFinally(tryFinally),
os(os), scopeGuard(scopeGuard),
sbreak(sbreak), sbreak(sbreak),
scontinue(scontinue), scontinue(scontinue),
fes(fes), fes(fes),

6
compiler/src/dmd/scope.h
View file

@ -58,10 +58,10 @@ struct Scope final
VarDeclaration *varDecl; // variable we are in during semantic2 VarDeclaration *varDecl; // variable we are in during semantic2
Dsymbol *parent; // parent to use Dsymbol *parent; // parent to use
LabelStatement *slabel; // enclosing labelled statement LabelStatement *slabel; // enclosing labelled statement
SwitchStatement *sw; // enclosing switch statement SwitchStatement *switchStatement; // enclosing switch statement
Statement *tryBody; // enclosing _body of TryCatchStatement or TryFinallyStatement Statement *tryBody; // enclosing _body of TryCatchStatement or TryFinallyStatement
TryFinallyStatement *tf; // enclosing try finally statement TryFinallyStatement *tryFinally; // enclosing try finally statement
ScopeGuardStatement *os; // enclosing scope(xxx) statement ScopeGuardStatement *scopeGuard; // enclosing scope(xxx) statement
Statement *sbreak; // enclosing statement that supports "break" Statement *sbreak; // enclosing statement that supports "break"
Statement *scontinue; // enclosing statement that supports "continue" Statement *scontinue; // enclosing statement that supports "continue"
ForeachStatement *fes; // if nested function for ForeachStatement, this is it ForeachStatement *fes; // if nested function for ForeachStatement, this is it

6
compiler/src/dmd/semantic3.d
View file

@ -338,7 +338,7 @@ private extern(C++) final class Semantic3Visitor : Visitor
sc2.ctorflow.callSuper = CSX.none; sc2.ctorflow.callSuper = CSX.none;
sc2.sbreak = null; sc2.sbreak = null;
sc2.scontinue = null; sc2.scontinue = null;
sc2.sw = null; sc2.switchStatement = null;
sc2.fes = funcdecl.fes; sc2.fes = funcdecl.fes;
sc2.linkage = funcdecl.isCsymbol() ? LINK.c : LINK.d; sc2.linkage = funcdecl.isCsymbol() ? LINK.c : LINK.d;
sc2.stc &= STC.flowThruFunction; sc2.stc &= STC.flowThruFunction;
@ -350,8 +350,8 @@ private extern(C++) final class Semantic3Visitor : Visitor
sc2.copyFlagsFrom(sc); sc2.copyFlagsFrom(sc);
sc2.contract = Contract.none; sc2.contract = Contract.none;
} }
sc2.tf = null; sc2.tryFinally = null;
sc2.os = null; sc2.scopeGuard = null;
sc2.inLoop = false; sc2.inLoop = false;
sc2.inDefaultArg = false; sc2.inDefaultArg = false;
sc2.userAttribDecl = null; sc2.userAttribDecl = null;

2
compiler/src/dmd/statement.d
View file

@ -1106,7 +1106,7 @@ extern (C++) final class SwitchStatement : Statement
bool hasVars; /// true if has variable case values bool hasVars; /// true if has variable case values
DefaultStatement sdefault; /// default: DefaultStatement sdefault; /// default:
Statement tryBody; /// set to TryCatchStatement or TryFinallyStatement if in _body portion Statement tryBody; /// set to TryCatchStatement or TryFinallyStatement if in _body portion
TryFinallyStatement tf; /// set if in the 'finally' block of a TryFinallyStatement TryFinallyStatement tryFinally; /// set if in the 'finally' block of a TryFinallyStatement
GotoCaseStatements gotoCases; /// array of unresolved GotoCaseStatement's GotoCaseStatements gotoCases; /// array of unresolved GotoCaseStatement's
CaseStatements* cases; /// array of CaseStatement's CaseStatements* cases; /// array of CaseStatement's
VarDeclaration lastVar; /// last observed variable declaration in this statement VarDeclaration lastVar; /// last observed variable declaration in this statement

92
compiler/src/dmd/statementsem.d
View file

@ -1804,7 +1804,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
//printf("SwitchStatement::semantic(%p)\n", ss); //printf("SwitchStatement::semantic(%p)\n", ss);
ss.tryBody = sc.tryBody; ss.tryBody = sc.tryBody;
ss.tf = sc.tf; ss.tryFinally = sc.tryFinally;
if (ss.cases) if (ss.cases)
{ {
result = ss; // already run result = ss; // already run
@ -1898,7 +1898,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
sc = sc.push(); sc = sc.push();
sc.sbreak = ss; sc.sbreak = ss;
sc.sw = ss; sc.switchStatement = ss;
ss.cases = new CaseStatements(); ss.cases = new CaseStatements();
const inLoopSave = sc.inLoop; const inLoopSave = sc.inLoop;
@ -1925,9 +1925,9 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
for (Scope* scx = sc; scx; scx = scx.enclosing) for (Scope* scx = sc; scx; scx = scx.enclosing)
{ {
if (!scx.sw) if (!scx.switchStatement)
continue; continue;
foreach (cs; *scx.sw.cases) foreach (cs; *scx.switchStatement.cases)
{ {
if (cs.exp.equals(gcs.exp)) if (cs.exp.equals(gcs.exp))
{ {
@ -1986,7 +1986,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
needswitcherror = true; needswitcherror = true;
} }
ss.hasDefault = sc.sw.sdefault || ss.hasDefault = sc.switchStatement.sdefault ||
!(!ss.isFinal || needswitcherror || global.params.useAssert == CHECKENABLE.on || sc.func.isSafe || sc.func.isSaferD); !(!ss.isFinal || needswitcherror || global.params.useAssert == CHECKENABLE.on || sc.func.isSafe || sc.func.isSaferD);
if (!ss.hasDefault) if (!ss.hasDefault)
{ {
@ -2040,11 +2040,11 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
s = new ExpStatement(ss.loc, new HaltExp(ss.loc)); s = new ExpStatement(ss.loc, new HaltExp(ss.loc));
a.reserve(2); a.reserve(2);
sc.sw.sdefault = new DefaultStatement(ss.loc, s); sc.switchStatement.sdefault = new DefaultStatement(ss.loc, s);
a.push(ss._body); a.push(ss._body);
if (ss._body.blockExit(sc.func, null) & BE.fallthru) if (ss._body.blockExit(sc.func, null) & BE.fallthru)
a.push(new BreakStatement(Loc.initial, null)); a.push(new BreakStatement(Loc.initial, null));
a.push(sc.sw.sdefault); a.push(sc.switchStatement.sdefault);
cs = new CompoundStatement(ss.loc, a); cs = new CompoundStatement(ss.loc, a);
ss._body = cs; ss._body = cs;
} }
@ -2141,7 +2141,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
void visitCase(CaseStatement cs) void visitCase(CaseStatement cs)
{ {
SwitchStatement sw = sc.sw; SwitchStatement sw = sc.switchStatement;
bool errors = false; bool errors = false;
//printf("CaseStatement::semantic() %s\n", toChars()); //printf("CaseStatement::semantic() %s\n", toChars());
@ -2197,9 +2197,9 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
*/ */
for (Scope* scx = sc; scx; scx = scx.enclosing) for (Scope* scx = sc; scx; scx = scx.enclosing)
{ {
if (scx.enclosing && scx.enclosing.sw == sw) if (scx.enclosing && scx.enclosing.switchStatement == sw)
continue; continue;
assert(scx.sw == sw); assert(scx.switchStatement == sw);
Dsymbol pscopesym; Dsymbol pscopesym;
if (!scx.search(cs.exp.loc, v.ident, pscopesym)) if (!scx.search(cs.exp.loc, v.ident, pscopesym))
@ -2254,12 +2254,12 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
i++; i++;
} }
if (sc.sw.tf != sc.tf) if (sc.switchStatement.tryFinally != sc.tryFinally)
{ {
error(cs.loc, "`switch` and `case` are in different `finally` blocks"); error(cs.loc, "`switch` and `case` are in different `finally` blocks");
errors = true; errors = true;
} }
if (sc.sw.tryBody != sc.tryBody) if (sc.switchStatement.tryBody != sc.tryBody)
{ {
error(cs.loc, "case cannot be in different `try` block level from `switch`"); error(cs.loc, "case cannot be in different `try` block level from `switch`");
errors = true; errors = true;
@ -2287,7 +2287,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
void visitCaseRange(CaseRangeStatement crs) void visitCaseRange(CaseRangeStatement crs)
{ {
SwitchStatement sw = sc.sw; SwitchStatement sw = sc.switchStatement;
if (sw is null) if (sw is null)
{ {
error(crs.loc, "case range not in `switch` statement"); error(crs.loc, "case range not in `switch` statement");
@ -2372,26 +2372,26 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
{ {
//printf("DefaultStatement::semantic()\n"); //printf("DefaultStatement::semantic()\n");
bool errors = false; bool errors = false;
if (sc.sw) if (sc.switchStatement)
{ {
if (sc.sw.sdefault) if (sc.switchStatement.sdefault)
{ {
error(ds.loc, "`switch` statement already has a default"); error(ds.loc, "`switch` statement already has a default");
errors = true; errors = true;
} }
sc.sw.sdefault = ds; sc.switchStatement.sdefault = ds;
if (sc.sw.tf != sc.tf) if (sc.switchStatement.tryFinally != sc.tryFinally)
{ {
error(ds.loc, "`switch` and `default` are in different `finally` blocks"); error(ds.loc, "`switch` and `default` are in different `finally` blocks");
errors = true; errors = true;
} }
if (sc.sw.tryBody != sc.tryBody) if (sc.switchStatement.tryBody != sc.tryBody)
{ {
error(ds.loc, "default cannot be in different `try` block level from `switch`"); error(ds.loc, "default cannot be in different `try` block level from `switch`");
errors = true; errors = true;
} }
if (sc.sw.isFinal) if (sc.switchStatement.isFinal)
{ {
error(ds.loc, "`default` statement not allowed in `final switch` statement"); error(ds.loc, "`default` statement not allowed in `final switch` statement");
errors = true; errors = true;
@ -2417,7 +2417,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
/* https://dlang.org/spec/statement.html#goto-statement /* https://dlang.org/spec/statement.html#goto-statement
*/ */
gds.sw = sc.sw; gds.sw = sc.switchStatement;
if (!gds.sw) if (!gds.sw)
{ {
error(gds.loc, "`goto default` not in `switch` statement"); error(gds.loc, "`goto default` not in `switch` statement");
@ -2436,7 +2436,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
/* https://dlang.org/spec/statement.html#goto-statement /* https://dlang.org/spec/statement.html#goto-statement
*/ */
if (!sc.sw) if (!sc.switchStatement)
{ {
error(gcs.loc, "`goto case` not in `switch` statement"); error(gcs.loc, "`goto case` not in `switch` statement");
return setError(); return setError();
@ -2445,13 +2445,13 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
if (gcs.exp) if (gcs.exp)
{ {
gcs.exp = gcs.exp.expressionSemantic(sc); gcs.exp = gcs.exp.expressionSemantic(sc);
gcs.exp = gcs.exp.implicitCastTo(sc, sc.sw.condition.type); gcs.exp = gcs.exp.implicitCastTo(sc, sc.switchStatement.condition.type);
gcs.exp = gcs.exp.optimize(WANTvalue); gcs.exp = gcs.exp.optimize(WANTvalue);
if (gcs.exp.op == EXP.error) if (gcs.exp.op == EXP.error)
return setError(); return setError();
} }
sc.sw.gotoCases.push(gcs); sc.switchStatement.gotoCases.push(gcs);
result = gcs; result = gcs;
} }
@ -2505,22 +2505,22 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
error(rs.loc, "`return` statements cannot be in contracts"); error(rs.loc, "`return` statements cannot be in contracts");
errors = true; errors = true;
} }
if (sc.os) if (sc.scopeGuard)
{ {
// @@@DEPRECATED_2.112@@@ // @@@DEPRECATED_2.112@@@
// Deprecated in 2.100, transform into an error in 2.112 // Deprecated in 2.100, transform into an error in 2.112
if (sc.os.tok == TOK.onScopeFailure) if (sc.scopeGuard.tok == TOK.onScopeFailure)
{ {
deprecation(rs.loc, "`return` statements cannot be in `scope(failure)` bodies."); deprecation(rs.loc, "`return` statements cannot be in `scope(failure)` bodies.");
deprecationSupplemental(rs.loc, "Use try-catch blocks for this purpose"); deprecationSupplemental(rs.loc, "Use try-catch blocks for this purpose");
} }
else else
{ {
error(rs.loc, "`return` statements cannot be in `%s` bodies", Token.toChars(sc.os.tok)); error(rs.loc, "`return` statements cannot be in `%s` bodies", Token.toChars(sc.scopeGuard.tok));
errors = true; errors = true;
} }
} }
if (sc.tf) if (sc.tryFinally)
{ {
error(rs.loc, "`return` statements cannot be in `finally` bodies"); error(rs.loc, "`return` statements cannot be in `finally` bodies");
errors = true; errors = true;
@ -2901,7 +2901,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
Statement s = ls.statement; Statement s = ls.statement;
if (!s || !s.hasBreak()) if (!s || !s.hasBreak())
error(bs.loc, "label `%s` has no `break`", bs.ident.toChars()); error(bs.loc, "label `%s` has no `break`", bs.ident.toChars());
else if (ls.tf != sc.tf) else if (ls.tf != sc.tryFinally)
error(bs.loc, "cannot break out of `finally` block"); error(bs.loc, "cannot break out of `finally` block");
else else
{ {
@ -2917,9 +2917,9 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
} }
else if (!sc.sbreak) else if (!sc.sbreak)
{ {
if (sc.os && sc.os.tok != TOK.onScopeFailure) if (sc.scopeGuard && sc.scopeGuard.tok != TOK.onScopeFailure)
{ {
error(bs.loc, "`break` is not allowed inside `%s` bodies", Token.toChars(sc.os.tok)); error(bs.loc, "`break` is not allowed inside `%s` bodies", Token.toChars(sc.scopeGuard.tok));
} }
else if (sc.fes) else if (sc.fes)
{ {
@ -2989,7 +2989,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
Statement s = ls.statement; Statement s = ls.statement;
if (!s || !s.hasContinue()) if (!s || !s.hasContinue())
error(cs.loc, "label `%s` has no `continue`", cs.ident.toChars()); error(cs.loc, "label `%s` has no `continue`", cs.ident.toChars());
else if (ls.tf != sc.tf) else if (ls.tf != sc.tryFinally)
error(cs.loc, "cannot continue out of `finally` block"); error(cs.loc, "cannot continue out of `finally` block");
else else
{ {
@ -3004,9 +3004,9 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
} }
else if (!sc.scontinue) else if (!sc.scontinue)
{ {
if (sc.os && sc.os.tok != TOK.onScopeFailure) if (sc.scopeGuard && sc.scopeGuard.tok != TOK.onScopeFailure)
{ {
error(cs.loc, "`continue` is not allowed inside `%s` bodies", Token.toChars(sc.os.tok)); error(cs.loc, "`continue` is not allowed inside `%s` bodies", Token.toChars(sc.scopeGuard.tok));
} }
else if (sc.fes) else if (sc.fes)
{ {
@ -3382,7 +3382,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
tfs._body = tfs._body.semanticScope(sc, null, null, tfs); tfs._body = tfs._body.semanticScope(sc, null, null, tfs);
sc = sc.push(); sc = sc.push();
sc.tf = tfs; sc.tryFinally = tfs;
sc.sbreak = null; sc.sbreak = null;
sc.scontinue = null; // no break or continue out of finally block sc.scontinue = null; // no break or continue out of finally block
tfs.finalbody = tfs.finalbody.semanticNoScope(sc); tfs.finalbody = tfs.finalbody.semanticNoScope(sc);
@ -3435,13 +3435,13 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
// scope(success) and scope(failure) are rewritten to try-catch(-finally) statement, // scope(success) and scope(failure) are rewritten to try-catch(-finally) statement,
// so the generated catch block cannot be placed in finally block. // so the generated catch block cannot be placed in finally block.
// See also Catch::semantic. // See also Catch::semantic.
if (sc.os && sc.os.tok != TOK.onScopeFailure) if (sc.scopeGuard && sc.scopeGuard.tok != TOK.onScopeFailure)
{ {
// If enclosing is scope(success) or scope(exit), this will be placed in finally block. // If enclosing is scope(success) or scope(exit), this will be placed in finally block.
error(oss.loc, "cannot put `%s` statement inside `%s`", Token.toChars(oss.tok), Token.toChars(sc.os.tok)); error(oss.loc, "cannot put `%s` statement inside `%s`", Token.toChars(oss.tok), Token.toChars(sc.scopeGuard.tok));
return setError(); return setError();
} }
if (sc.tf) if (sc.tryFinally)
{ {
error(oss.loc, "cannot put `%s` statement inside `finally` block", Token.toChars(oss.tok)); error(oss.loc, "cannot put `%s` statement inside `finally` block", Token.toChars(oss.tok));
return setError(); return setError();
@ -3449,8 +3449,8 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
} }
sc = sc.push(); sc = sc.push();
sc.tf = null; sc.tryFinally = null;
sc.os = oss; sc.scopeGuard = oss;
if (oss.tok != TOK.onScopeFailure) if (oss.tok != TOK.onScopeFailure)
{ {
// Jump out from scope(failure) block is allowed. // Jump out from scope(failure) block is allowed.
@ -3504,8 +3504,8 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
gs.ident = fixupLabelName(sc, gs.ident); gs.ident = fixupLabelName(sc, gs.ident);
gs.label = fd.searchLabel(gs.ident, gs.loc); gs.label = fd.searchLabel(gs.ident, gs.loc);
gs.tryBody = sc.tryBody; gs.tryBody = sc.tryBody;
gs.tf = sc.tf; gs.tf = sc.tryFinally;
gs.os = sc.os; gs.os = sc.scopeGuard;
gs.lastVar = sc.lastVar; gs.lastVar = sc.lastVar;
gs.inCtfeBlock = sc.ctfeBlock; gs.inCtfeBlock = sc.ctfeBlock;
@ -3544,8 +3544,8 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
ls.ident = fixupLabelName(sc, ls.ident); ls.ident = fixupLabelName(sc, ls.ident);
ls.tryBody = sc.tryBody; ls.tryBody = sc.tryBody;
ls.tf = sc.tf; ls.tf = sc.tryFinally;
ls.os = sc.os; ls.os = sc.scopeGuard;
ls.lastVar = sc.lastVar; ls.lastVar = sc.lastVar;
ls.inCtfeBlock = sc.ctfeBlock; ls.inCtfeBlock = sc.ctfeBlock;
@ -4053,13 +4053,13 @@ void catchSemantic(Catch c, Scope* sc)
{ {
//printf("Catch::semantic(%s)\n", ident.toChars()); //printf("Catch::semantic(%s)\n", ident.toChars());
if (sc.os && sc.os.tok != TOK.onScopeFailure) if (sc.scopeGuard && sc.scopeGuard.tok != TOK.onScopeFailure)
{ {
// If enclosing is scope(success) or scope(exit), this will be placed in finally block. // If enclosing is scope(success) or scope(exit), this will be placed in finally block.
error(c.loc, "cannot put `catch` statement inside `%s`", Token.toChars(sc.os.tok)); error(c.loc, "cannot put `catch` statement inside `%s`", Token.toChars(sc.scopeGuard.tok));
c.errors = true; c.errors = true;
} }
if (sc.tf) if (sc.tryFinally)
{ {
/* This is because the _d_local_unwind() gets the stack munged /* This is because the _d_local_unwind() gets the stack munged
* up on this. The workaround is to place any try-catches into * up on this. The workaround is to place any try-catches into