Add handling methods with more template arguments

```cpp
CPP2_UFCS_TEMPLATE(FUNCNAME,PARAM1,...)
```
is replaced by
```cpp
CPP2_UFCS_TEMPLATE(FUNCNAME,TEMPARGS,PARAM1,...)
```
That means that calling
```cpp
obj.fun<int, long, double>(1,2);
```
will be generated to:
```cpp
CPP2_UFCS_TEMPLATE(fun, (<int,long, double>), obj, 1, 2);
```

Author: filipsajdak

include/cpp2util.h

@@ -536,21 +536,23 @@ class out {
     } \
 }(PARAM1)
 
-#define CPP2_UFCS_TEMPLATE(FUNCNAME,PARAM1,...) \
+#define CPP2_UFCS_REMPARENS(...) __VA_ARGS__
+
+#define CPP2_UFCS_TEMPLATE(FUNCNAME,TEMPARGS,PARAM1,...) \
 [](auto&& obj, auto&& ...params) { \
-    if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME(std::forward<decltype(params)>(params)...); }) { \
-        return std::forward<decltype(obj)>(obj).template FUNCNAME(std::forward<decltype(params)>(params)...); \
+    if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); }) { \
+        return std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(params)>(params)...); \
     } else { \
-        return FUNCNAME(std::forward<decltype(obj)>(obj), std::forward<decltype(params)>(params)...); \
+        return FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(obj)>(obj), std::forward<decltype(params)>(params)...); \
     } \
 }(PARAM1, __VA_ARGS__)
 
-#define CPP2_UFCS_TEMPLATE_0(FUNCNAME,PARAM1) \
+#define CPP2_UFCS_TEMPLATE_0(FUNCNAME,TEMPARGS,PARAM1) \
 [](auto&& obj) { \
-    if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME(); }) { \
-        return std::forward<decltype(obj)>(obj).template FUNCNAME(); \
+    if constexpr (requires{ std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); }) { \
+        return std::forward<decltype(obj)>(obj).template FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (); \
     } else { \
-        return FUNCNAME(std::forward<decltype(obj)>(obj)); \
+        return FUNCNAME CPP2_UFCS_REMPARENS TEMPARGS (std::forward<decltype(obj)>(obj)); \
     } \
 }(PARAM1)
 //--------------------------------------------------------------------

source/cppfront.cpp

@@ -1789,10 +1789,7 @@ class cppfront
             }
             // Going backwards if we found Dot and there is args variable
             // it means that it should be handled by UFCS
-            else if( i->op->type() == lexeme::Dot && args
-                        // don't use UFCS for methods with more than one template argument
-                        && i->id_expr && i->id_expr->template_args_count() < 2
-                    )
+            else if( i->op->type() == lexeme::Dot && args )
             {
                 auto funcname = print_to_string(*i->id_expr);
 
@@ -1805,8 +1802,14 @@ class cppfront
                 //printer.print_cpp2("CPP2_UFCS(", n.position());
 
                 auto ufcs_string = std::string("CPP2_UFCS");
+
                 if (i->id_expr->template_args_count() > 0) {
                     ufcs_string += "_TEMPLATE";
+                    // we need to replace "fun<int,long,double>" to "fun, (<int,long,double>)" to be able to generate
+                    // from obj.fun<int, long, double>(1,2) this CPP2_UFCS_TEMPLATE(fun, (<int,long, double>), obj, 1, 2)
+                    auto split = funcname.find('<'); assert(split != std::string::npos);
+                    funcname.insert(split, ", (");
+                    funcname += ')';
                 }
                 //  If there are no additional arguments, use the _0 version
                 if (args.value().empty()) {