From e8692b012f3d90b997b3aaed17667bbcd40d64b8 Mon Sep 17 00:00:00 2001
From: IOBYTE <reif@earthlink.net>
Date: Mon, 27 May 2019 14:51:52 -0400
Subject: [PATCH] template simplifier: partial fix for instantiation of
 templates with type trait parameters (#1855)

---
 lib/templatesimplifier.cpp    |  8 +++---
 test/testsimplifytemplate.cpp | 53 +++++++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index cd5e09ef0..1dc9e0789 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -364,8 +364,8 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         if (!tok)
             return 0;
 
-        // Skip casts
-        if (tok->str() == "(") {
+        // Skip links
+        if (Token::Match(tok, "(|{")) {
             tok = tok->link();
             if (tok)
                 tok = tok->next();
@@ -996,9 +996,9 @@ void TemplateSimplifier::useDefaultArgumentValues(TemplateSimplifier::TokenAndNa
                         --indentlevel;
                     tok->insertToken(from->str(), from->originalName());
                     tok = tok->next();
-                    if (Token::Match(tok, "(|["))
+                    if (Token::Match(tok, "(|[|{"))
                         links.push(tok);
-                    else if (!links.empty() && Token::Match(tok, ")|]")) {
+                    else if (!links.empty() && Token::Match(tok, ")|]|}")) {
                         Token::createMutualLinks(links.top(), tok);
                         links.pop();
                     }
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index aa5ca90c3..ab8c73d5d 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -2545,36 +2545,59 @@ private:
                                 "template <typename...> struct e {};\n"
                                 "static_assert(sizeof(e<>) == sizeof(e<c<int>, c<int>, int>), \"\");\n";
             const char exp[] = "namespace a { "
-                               "template < typename b , bool = std :: is_empty < b > { } && std :: is_final < b > { } > struct c ; "
+                               "template < typename b , bool > struct c ; "
                                "} "
                                "namespace boost { "
                                "using a :: c ; "
-                               "} using boost :: c ; "
+                               "} "
+                               "using boost :: c ; "
                                "struct e<> ; "
-                               "struct e<c<int>,c<int>,int> ; "
-                               "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int>,c<int>,int> ) , \"\" ) ; "
+                               "struct e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> ; "
+                               "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> ) , \"\" ) ; "
                                "struct e<> { } ; "
-                               "struct e<c<int>,c<int>,int> { } ;";
-            ASSERT_EQUALS(exp, tok(code));
+                               "struct e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> { } ;";
+            const char actual[] = "namespace a { "
+                                  "template < typename b , bool > struct c ; "
+                                  "} "
+                                  "namespace boost { "
+                                  "using a :: c ; "
+                                  "} "
+                                  "using boost :: c ; "
+                                  "struct e<> ; "
+                                  "struct e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> ; "
+                                  "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> ) , \"\" ) ; "
+                                  "struct e<> { } ; "
+                                  "struct e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> { } ;";
+            TODO_ASSERT_EQUALS(exp, actual, tok(code));
         }
         {
             const char code[] = "template <typename b, bool = __is_empty(b) && __is_final(b)> struct c;\n"
                                 "template <typename...> struct e {};\n"
-                                "static_assert(sizeof(e<>) == sizeof(e<c<int>, c<int>, int>), "");\n";
-            const char exp[] = "template < typename b , bool = std :: is_empty < b > { } && std :: is_final < b > { } > struct c ; "
+                                "static_assert(sizeof(e<>) == sizeof(e<c<int>, c<int>, int>), \"\");\n";
+            const char exp[] = "template < typename b , bool > struct c ; "
                                "struct e<> ; "
-                               "struct e<c<int>,c<int>,int> ; "
-                               "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int>,c<int>,int> ) , ) ; "
+                               "struct e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> ; "
+                               "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> ) , \"\" ) ; "
                                "struct e<> { } ; "
-                               "struct e<c<int>,c<int>,int> { } ;";
-            ASSERT_EQUALS(exp, tok(code));
+                               "struct e<c<int,std::is_empty<int>{}&&std::is_final<int>{}>,c<int,std::is_empty<int>{}&&std::is_final<int>{}>,int> { } ;";
+            const char actual[] = "template < typename b , bool > struct c ; "
+                                  "struct e<> ; "
+                                  "struct e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> ; "
+                                  "static_assert ( sizeof ( e<> ) == sizeof ( e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> ) , \"\" ) ; "
+                                  "struct e<> { } ; "
+                                  "struct e<c<int,std::is_empty<b>{}&&std::is_final<b>{}>,c<int,std::is_empty<b>{}&&std::is_final<b>{}>,int> { } ;";
+            TODO_ASSERT_EQUALS(exp, actual, tok(code));
         }
         {
             const char code[] = "template <typename b, bool = __is_empty(b) && __is_final(b)> struct c{};\n"
                                 "c<int> cc;\n";
-            const char exp[] = "template < typename b , bool = std :: is_empty < b > { } && std :: is_final < b > { } > struct c { } ; "
-                               "c < int > cc ;";
-            ASSERT_EQUALS(exp, tok(code));
+            const char exp[] = "struct c<int,std::is_empty<int>{}&&std::is_final<int>{}> ; "
+                               "c<int,std::is_empty<b>{}&&std::is_final<b>{}> cc ; "
+                               "struct c<int,std::is_empty<int>{}&&std::is_final<int>{}> { } ;";
+            const char actual[] = "struct c<int,std::is_empty<b>{}&&std::is_final<b>{}> ; "
+                                  "c<int,std::is_empty<b>{}&&std::is_final<b>{}> cc ; "
+                                  "struct c<int,std::is_empty<b>{}&&std::is_final<b>{}> { } ;";
+            TODO_ASSERT_EQUALS(exp, actual, tok(code));
         }
     }