From 1e2dd669bcdd8df6cdaac061e035828626906447 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 16 Apr 2023 12:56:31 +0200
Subject: [PATCH] printLiteral: Do not overload

---
 src/libcmd/repl.cc         |  6 +++---
 src/libexpr/eval.cc        |  4 ++--
 src/libexpr/nixexpr.cc     |  6 +++---
 src/libexpr/value/print.cc |  4 ++--
 src/libexpr/value/print.hh | 12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
index 1366622c7..41cf77424 100644
--- a/src/libcmd/repl.cc
+++ b/src/libcmd/repl.cc
@@ -913,13 +913,13 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
 
     case nBool:
         str << ANSI_CYAN;
-        printLiteral(str, v.boolean);
+        printLiteralBool(str, v.boolean);
         str << ANSI_NORMAL;
         break;
 
     case nString:
         str << ANSI_WARNING;
-        printLiteral(str, v.string.s);
+        printLiteralString(str, v.string.s);
         str << ANSI_NORMAL;
         break;
 
@@ -959,7 +959,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m
                 if (isVarName(i.first))
                     str << i.first;
                 else
-                    printLiteral(str, i.first);
+                    printLiteralString(str, i.first);
                 str << " = ";
                 if (seen.count(i.second))
                     str << "«repeated»";
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 06208897f..bd05fc156 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -105,10 +105,10 @@ void Value::print(const SymbolTable & symbols, std::ostream & str,
         str << integer;
         break;
     case tBool:
-        printLiteral(str, boolean);
+        printLiteralBool(str, boolean);
         break;
     case tString:
-        printLiteral(str, string.s);
+        printLiteralString(str, string.s);
         break;
     case tPath:
         str << path; // !!! escaping?
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index ca6df0af3..1b5d522d3 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -74,7 +74,7 @@ std::ostream & operator <<(std::ostream & str, const SymbolStr & symbol)
     else {
         char c = s[0];
         if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_')) {
-            printLiteral(str, s);
+            printLiteralString(str, s);
             return str;
         }
         for (auto c : s)
@@ -82,7 +82,7 @@ std::ostream & operator <<(std::ostream & str, const SymbolStr & symbol)
                   (c >= 'A' && c <= 'Z') ||
                   (c >= '0' && c <= '9') ||
                   c == '_' || c == '\'' || c == '-')) {
-                printLiteral(str, s);
+                printLiteralString(str, s);
                 return str;
             }
         str << s;
@@ -107,7 +107,7 @@ void ExprFloat::show(const SymbolTable & symbols, std::ostream & str) const
 
 void ExprString::show(const SymbolTable & symbols, std::ostream & str) const
 {
-    printLiteral(str, s);
+    printLiteralString(str, s);
 }
 
 void ExprPath::show(const SymbolTable & symbols, std::ostream & str) const
diff --git a/src/libexpr/value/print.cc b/src/libexpr/value/print.cc
index c67ff9f87..bd241d9d8 100644
--- a/src/libexpr/value/print.cc
+++ b/src/libexpr/value/print.cc
@@ -3,7 +3,7 @@
 namespace nix {
 
 std::ostream &
-printLiteral(std::ostream & str, const std::string_view string) 
+printLiteralString(std::ostream & str, const std::string_view string)
 {
     str << "\"";
     for (auto i = string.begin(); i != string.end(); ++i) {
@@ -19,7 +19,7 @@ printLiteral(std::ostream & str, const std::string_view string)
 }
 
 std::ostream &
-printLiteral(std::ostream & str, bool boolean) 
+printLiteralBool(std::ostream & str, bool boolean)
 {
     str << (boolean ? "true" : "false");
     return str;
diff --git a/src/libexpr/value/print.hh b/src/libexpr/value/print.hh
index 31c94eb85..98dd2008d 100644
--- a/src/libexpr/value/print.hh
+++ b/src/libexpr/value/print.hh
@@ -17,14 +17,14 @@ namespace nix {
      *
      * @param s The logical string
      */
-    std::ostream & printLiteral(std::ostream & o, std::string_view s);
-    inline std::ostream & printLiteral(std::ostream & o, const char * s) {
-        return printLiteral(o, std::string_view(s));
+    std::ostream & printLiteralString(std::ostream & o, std::string_view s);
+    inline std::ostream & printLiteralString(std::ostream & o, const char * s) {
+        return printLiteralString(o, std::string_view(s));
     }
-    inline std::ostream & printLiteral(std::ostream & o, const std::string & s) {
-        return printLiteral(o, std::string_view(s));
+    inline std::ostream & printLiteralString(std::ostream & o, const std::string & s) {
+        return printLiteralString(o, std::string_view(s));
     }
 
     /** Print `true` or `false`. */
-    std::ostream & printLiteral(std::ostream & o, bool b);
+    std::ostream & printLiteralBool(std::ostream & o, bool b);
 }