From d920dbeee3506c0fc46e1c5381b506da52fdd37b Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Mon, 22 Oct 2018 22:40:59 +0200
Subject: Use standard_sc_expr_str() in _name_and_loc()

Makes choices show up as <choice (name, if any)>, which is nice.
Previously, just the name was shown for named choices.
---
 kconfiglib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kconfiglib.py b/kconfiglib.py
index 6b031ae..155a79d 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -5695,7 +5695,9 @@ def _decoding_error(e, filename, macro_linenr=None):
 def _name_and_loc(sc):
     # Helper for giving the symbol/choice name and location(s) in e.g. warnings
 
-    name = sc.name or "<choice>"
+    # Reuse the expression format. That way choices show up as
+    # '<choice (name, if any)>'
+    name = standard_sc_expr_str(sc)
 
     if not sc.nodes:
         return name + " (undefined)"
-- 
cgit v1.2.3