Implement Sebastian's idea for simplifying our handling of the greater-than operator...

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

diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index a197f2c0353b4b14a412d9c8b51ab5ae1506f2b5..64b2f134e85c7e3374bc91a4b96e1d85468229b0 100644 (file)
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -64,34 +64,18 @@ class Parser {
   /// argument list.
   bool GreaterThanIsOperator;
 
-  /// \brief RAII object that makes '>' behave like the closing angle
-  /// bracket for a template argument list.
-  struct MakeGreaterThanTemplateArgumentListTerminator {
+  /// \brief RAII object that makes '>' behave either as an operator
+  /// or as the closing angle bracket for a template argument list.
+  struct GreaterThanIsOperatorScope {
     bool &GreaterThanIsOperator;
     bool OldGreaterThanIsOperator;
    
-    MakeGreaterThanTemplateArgumentListTerminator(bool &GTIO)
+    GreaterThanIsOperatorScope(bool &GTIO, bool Val)
       : GreaterThanIsOperator(GTIO), OldGreaterThanIsOperator(GTIO) { 
-      GTIO = false;
+      GreaterThanIsOperator = Val;
     }
 
-    ~MakeGreaterThanTemplateArgumentListTerminator() {
-      GreaterThanIsOperator = OldGreaterThanIsOperator;
-    }
-  };
-
-  /// \brief RAII object that makes '>' behave like an
-  /// operator. Occurs, for example, inside parentheses.
-  struct MakeGreaterThanAnOperator {
-    bool &GreaterThanIsOperator;
-    bool OldGreaterThanIsOperator;
-   
-    MakeGreaterThanAnOperator(bool &GTIO)
-      : GreaterThanIsOperator(GTIO), OldGreaterThanIsOperator(GTIO) { 
-      GTIO = true;
-    }
-
-    ~MakeGreaterThanAnOperator() {
+    ~GreaterThanIsOperatorScope() {
       GreaterThanIsOperator = OldGreaterThanIsOperator;
     }
   };

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 0f04d13f6e6dfcc1eb6fdb6a5e1394054cdfbcdb..f7eeef755678f3e4454065ef05d715fb11215853 100644 (file)
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -1112,7 +1112,7 @@ Parser::OwningExprResult
 Parser::ParseParenExpression(ParenParseOption &ExprType,
                              TypeTy *&CastTy, SourceLocation &RParenLoc) {
   assert(Tok.is(tok::l_paren) && "Not a paren expr!");
-  MakeGreaterThanAnOperator G(GreaterThanIsOperator);
+  GreaterThanIsOperatorScope G(GreaterThanIsOperator, true);
   SourceLocation OpenLoc = ConsumeParen();
   OwningExprResult Result(Actions, true);
   CastTy = 0;

diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index f083be56024c3882532b3a009272c8a5454f0675..fa767141398754f1ddb8fb829ad7d0a82d7b8ded 100644 (file)
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -371,13 +371,17 @@ void Parser::AnnotateTemplateIdToken(DeclTy *Template, TemplateNameKind TNK,
   TemplateArgList TemplateArgs;
   TemplateArgIsTypeList TemplateArgIsType;
   {
-    MakeGreaterThanTemplateArgumentListTerminator G(GreaterThanIsOperator);
+    GreaterThanIsOperatorScope G(GreaterThanIsOperator, false);
     if (Tok.isNot(tok::greater) && 
         ParseTemplateArgumentList(TemplateArgs, TemplateArgIsType)) {
       // Try to find the closing '>'.
       SkipUntil(tok::greater, true, true);
+
+      // Clean up any template arguments that we successfully parsed.
+      ASTTemplateArgsPtr TemplateArgsPtr(Actions, &TemplateArgs[0],
+                                         &TemplateArgIsType[0],
+                                         TemplateArgs.size());
       
-      // FIXME: What's our recovery strategy for failed template-argument-lists?
       return;
     }
   }