- Various comment typo fixes in Sema.h

- Simplify ParseDeclCXX to use early exit on error instead of nesting.
- Change ParseDeclCXX to using the 'skip on error' form of ExpectAndConsume.
- If we don't see the ; in a using directive, still call the action, for 
  hopefully better error recovery.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61801 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 14 insertions, 16 deletions

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 09c5d52c34..81ea52ca69 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -174,30 +174,28 @@ Parser::DeclTy *Parser::ParseUsingDirective(unsigned Context,
   SourceLocation IdentLoc = SourceLocation();
 
   // Parse namespace-name.
-  if (!SS.isInvalid() && Tok.is(tok::identifier)) {
-    // Parse identifier.
-    NamespcName = Tok.getIdentifierInfo();
-    IdentLoc = ConsumeToken();
-    // Parse (optional) attributes (most likely GNU strong-using extension)
-    if (Tok.is(tok::kw___attribute)) {
-      AttrList = ParseAttributes();
-    }
-    // Eat ';'.
-    if (ExpectAndConsume(tok::semi, diag::err_expected_semi_after,
-                     AttrList? "attributes list" : "namespace name")) {
-        SkipUntil(tok::semi);
-        return 0;
-    }
-  } else {
+  if (SS.isInvalid() || Tok.isNot(tok::identifier)) {
     Diag(Tok, diag::err_expected_namespace_name);
     // If there was invalid namespace name, skip to end of decl, and eat ';'.
     SkipUntil(tok::semi);
     // FIXME: Are there cases, when we would like to call ActOnUsingDirective?
     return 0;
   }
+  
+  // Parse identifier.
+  NamespcName = Tok.getIdentifierInfo();
+  IdentLoc = ConsumeToken();
+  
+  // Parse (optional) attributes (most likely GNU strong-using extension).
+  if (Tok.is(tok::kw___attribute))
+    AttrList = ParseAttributes();
+  
+  // Eat ';'.
+  ExpectAndConsume(tok::semi, diag::err_expected_semi_after,
+                   AttrList ? "attributes list" : "namespace name", tok::semi);
 
   return Actions.ActOnUsingDirective(CurScope, UsingLoc, NamespcLoc, SS,
-                                      IdentLoc ,NamespcName, AttrList);
+                                      IdentLoc, NamespcName, AttrList);
 }
 
 /// ParseUsingDeclaration - Parse C++ using-declaration. Assumes that