reduce indentation with an early exit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67997 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 4201e1c..c50a033 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -64,36 +64,34 @@
// FIXME: Verify no attributes were present.
return ParseNamespaceAlias(NamespaceLoc, IdentLoc, Ident);
- if (Tok.is(tok::l_brace)) {
- SourceLocation LBrace = ConsumeBrace();
-
- // Enter a scope for the namespace.
- ParseScope NamespaceScope(this, Scope::DeclScope);
-
- DeclPtrTy NamespcDecl =
- Actions.ActOnStartNamespaceDef(CurScope, IdentLoc, Ident, LBrace);
-
- PrettyStackTraceActionsDecl CrashInfo(NamespcDecl, NamespaceLoc, Actions,
- PP.getSourceManager(),
- "parsing namespace");
-
- while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof))
- ParseExternalDeclaration();
-
- // Leave the namespace scope.
- NamespaceScope.Exit();
-
- SourceLocation RBrace = MatchRHSPunctuation(tok::r_brace, LBrace);
- Actions.ActOnFinishNamespaceDef(NamespcDecl, RBrace);
-
- return NamespcDecl;
-
- } else {
+ if (Tok.isNot(tok::l_brace)) {
Diag(Tok, Ident ? diag::err_expected_lbrace :
- diag::err_expected_ident_lbrace);
+ diag::err_expected_ident_lbrace);
+ return DeclPtrTy();
}
- return DeclPtrTy();
+ SourceLocation LBrace = ConsumeBrace();
+
+ // Enter a scope for the namespace.
+ ParseScope NamespaceScope(this, Scope::DeclScope);
+
+ DeclPtrTy NamespcDecl =
+ Actions.ActOnStartNamespaceDef(CurScope, IdentLoc, Ident, LBrace);
+
+ PrettyStackTraceActionsDecl CrashInfo(NamespcDecl, NamespaceLoc, Actions,
+ PP.getSourceManager(),
+ "parsing namespace");
+
+ while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof))
+ ParseExternalDeclaration();
+
+ // Leave the namespace scope.
+ NamespaceScope.Exit();
+
+ SourceLocation RBrace = MatchRHSPunctuation(tok::r_brace, LBrace);
+ Actions.ActOnFinishNamespaceDef(NamespcDecl, RBrace);
+
+ return NamespcDecl;
}
/// ParseNamespaceAlias - Parse the part after the '=' in a namespace