fix(cpp1): omit UFCS macro if the function is qualified

Author: JohelEGP

regression-tests/pure2-ufcs-member-access-and-chaining.cpp2

@@ -18,6 +18,8 @@ main: () -> int = {
 
     _ = (j.i).ufcs();
 
+    _ = 42.std::to_string();
+
     42.no_return();
 }
 

regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp

@@ -13,23 +13,23 @@
 [[nodiscard]] auto main() -> int;
 
 
-#line 24 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 26 "pure2-ufcs-member-access-and-chaining.cpp2"
 auto no_return([[maybe_unused]] auto const& param1) -> void;
 
 [[nodiscard]] auto ufcs(cpp2::in<int> i) -> int;
     struct fun_ret { int i; };
 
 
 
-#line 30 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 32 "pure2-ufcs-member-access-and-chaining.cpp2"
 [[nodiscard]] auto fun() -> fun_ret;
 
 
-#line 35 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 37 "pure2-ufcs-member-access-and-chaining.cpp2"
 [[nodiscard]] auto get_i(auto const& r) -> int;
 
 
-#line 39 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 41 "pure2-ufcs-member-access-and-chaining.cpp2"
 //  And a test for non-local UFCS, which shouldn't do a [&] capture
 [[nodiscard]] auto f([[maybe_unused]] auto const& param1) -> int;
 extern int y;
@@ -56,6 +56,8 @@ extern int y;
 
     static_cast<void>(CPP2_UFCS(ufcs)((std::move(j).i)));
 
+    static_cast<void>(std::to_string(42));
+
     CPP2_UFCS(no_return)(42);
 }
 
@@ -67,7 +69,7 @@ auto no_return([[maybe_unused]] auto const& param1) -> void{}
 
 [[nodiscard]] auto fun() -> fun_ret{
         cpp2::deferred_init<int> i;
-#line 31 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 33 "pure2-ufcs-member-access-and-chaining.cpp2"
     i.construct(42);
     return  { std::move(i.value()) }; 
 }
@@ -76,7 +78,7 @@ auto no_return([[maybe_unused]] auto const& param1) -> void{}
     return r.i; 
 }
 
-#line 40 "pure2-ufcs-member-access-and-chaining.cpp2"
+#line 42 "pure2-ufcs-member-access-and-chaining.cpp2"
 [[nodiscard]] auto f([[maybe_unused]] auto const& param1) -> int { return 0;  }
 int y {CPP2_UFCS_NONLOCAL(f)(0)}; 
 

source/cppfront.cpp

@@ -3010,7 +3010,13 @@ class cppfront
 
                 //  Second, emit the UFCS argument list
 
-                prefix.emplace_back(ufcs_string + "(" + funcname + ")(", args.value().open_pos );
+                // If the function name is qualified, omit the UFCS macro entirely.
+                if (i->id_expr->is_qualified()) {
+                    prefix.emplace_back(funcname + "(", args.value().open_pos );
+                } else {
+                    prefix.emplace_back(ufcs_string + "(" + funcname + ")(", args.value().open_pos );
+                }
+
                 suffix.emplace_back(")", args.value().close_pos );
                 if (!args.value().text_chunks.empty()) {
                     for (auto&& e: args.value().text_chunks) {