[PATCH v3] gdb/symtab.c Fix completion of template class members

[Daniel Knezevic <daniel.knezevic@htecgroup.com>]

Hi,

Is there anything I need to change for this patch?

I have updated the patch based on Keith's comments that you can find bellow:

---
 gdb/symtab.c                          |  3 ++-
 gdb/testsuite/gdb.cp/cpcompletion.cc  | 26 +++++++++++++++++++
 gdb/testsuite/gdb.cp/cpcompletion.exp | 37 +++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/gdb/symtab.c b/gdb/symtab.c
index cd3bf876551..0d349a0f5ad 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5937,7 +5937,8 @@ default_collect_symbol_completion_matches_break_on
 	  while (p > text)
 	    {
 	      if (c_isalnum (p[-1]) || p[-1] == '_' || p[-1] == '\0'
-		  || p[-1] == ':' || strchr (break_on, p[-1]) != NULL)
+		  || p[-1] == ':' || p[-1] == '<' || p[-1] == '>'
+		  || strchr (break_on, p[-1]) != NULL)
 		--p;
 	      else
 		break;
diff --git a/gdb/testsuite/gdb.cp/cpcompletion.cc b/gdb/testsuite/gdb.cp/cpcompletion.cc
index b85f168928c..92561d25405 100644
--- a/gdb/testsuite/gdb.cp/cpcompletion.cc
+++ b/gdb/testsuite/gdb.cp/cpcompletion.cc
@@ -74,6 +74,28 @@ struct baz
   S s;
 };
 
+/* The Outer class is used to test completion of nested template classes.  */
+template <typename T>
+struct Outer
+{
+  T value;
+
+  template <typename U>
+  struct Inner
+  {
+    U inner_value;
+    T outer_ref;
+  };
+
+  Inner<int> get_int_inner () const
+  {
+    Inner<int> i;
+    i.inner_value = 0;
+    i.outer_ref = value;
+    return i;
+  }
+};
+
 int main ()
 {
   baz<int> obj (2.3, 0.1);
@@ -84,5 +106,9 @@ int main ()
   Foo foo1;
   foo1.set_foo (42);		// Set breakpoint here.
   a.get();			// Prevent compiler from throwing 'a' away.
+  Outer<double> outer;
+  outer.value = 4.2;
+  auto inner = outer.get_int_inner ();
+  Outer<double>::Inner<long> long_inner;
   return 0;
 }
diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp
index 555392b470a..679fb160182 100644
--- a/gdb/testsuite/gdb.cp/cpcompletion.exp
+++ b/gdb/testsuite/gdb.cp/cpcompletion.exp
@@ -137,3 +137,40 @@ with_test_prefix "expression with namespace" {
 }
 
 test_gdb_complete_unique "break baz(int" "break baz(int, double)"
+
+# Test completion with a template class.
+test_gdb_complete_unique "p baz<int>::" "p baz<int>::baz<double>(int, double)"
+
+# Test completion of nested template classes
+with_test_prefix "nested template classes" {
+    # Unlike in linespecs, tab- and complete-command completion work a
+    # bit differently when completing around the scope operator.  The
+    # matches in the tab-completion case only show the part of the
+    # symbol after the scope, since ':' is a word break character.
+
+    set tab_completion_list {
+	"Inner<int>"
+	"Inner<long>"
+	"get_int_inner() const"
+    }
+    test_gdb_complete_tab_multiple "ptype Outer<double>:" ":" $tab_completion_list
+    test_gdb_complete_tab_multiple "ptype Outer<double>::" "" $tab_completion_list
+
+    # OTOH, the complete command must show the whole command, with
+    # qualified symbol displayed as entered by the user.
+    set cmd_completion_list {
+	"Outer<double>::Inner<int>"
+	"Outer<double>::Inner<long>"
+	"Outer<double>::get_int_inner() const"
+    }
+    test_gdb_complete_cmd_multiple "ptype " "Outer<double>:" $cmd_completion_list
+    test_gdb_complete_cmd_multiple "ptype " "Outer<double>::" $cmd_completion_list
+    test_gdb_complete_cmd_multiple "ptype " "Outer<double>::Inn" {
+	"Outer<double>::Inner<int>"
+	"Outer<double>::Inner<long>"
+    }
+
+    # Add a disambiguating character and we get a unique completion.
+    test_gdb_complete_unique "ptype Outer<double>::g" \
+	"ptype Outer<double>::get_int_inner() const"
+}
-- 
2.43.0

Best regards,
Daniel