From 6e31430b7070860436f93153ee1f8d832ca8b7ca Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 15 Mar 2010 17:26:47 +0000
Subject: [PATCH] gdb 	* c-exp.y (name_not_typename): Add 'operator' clause.
 gdb/testsuite 	* gdb.cp/userdef.exp: Add tests for explicit calls to
 operator==. 	* gdb.cp/userdef.cc (operator==): New function. 
 (main): New locals mem1, mem2.

---
 gdb/ChangeLog                    | 4 ++++
 gdb/c-exp.y                      | 8 ++++++++
 gdb/testsuite/ChangeLog          | 6 ++++++
 gdb/testsuite/gdb.cp/userdef.cc  | 9 +++++++++
 gdb/testsuite/gdb.cp/userdef.exp | 4 ++++
 5 files changed, 31 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ce03f4bef2..2b3c172ea95 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-15  Tom Tromey  <tromey@redhat.com>
+
+	* c-exp.y (name_not_typename): Add 'operator' clause.
+
 2010-03-15  Ralf Corsepius  <ralf.corsepius@rtems.org>
 
 	* configure.ac: Exit if ${gdb_target_obs}" is not set.
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 1af76c9dc71..2577a99398e 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1236,6 +1236,14 @@ name_not_typename :	NAME
    context where only a name could occur, this might be useful.
   	|	NAME_OR_INT
  */
+	|	operator
+			{
+			  $$.stoken = $1;
+			  $$.sym = lookup_symbol ($1.ptr,
+						  expression_context_block,
+						  VAR_DOMAIN,
+						  &$$.is_a_field_of_this);
+			}
 	;
 
 %%
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 84c5eef9a28..b675f98c277 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-15  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.cp/userdef.exp: Add tests for explicit calls to operator==.
+	* gdb.cp/userdef.cc (operator==): New function.
+	(main): New locals mem1, mem2.
+
 2010-03-15  Jie Zhang  <jie@codesourcery.com>
 
 	* lib/mi-support.exp (mi_gdb_target_load): Delete unused timeout var.
diff --git a/gdb/testsuite/gdb.cp/userdef.cc b/gdb/testsuite/gdb.cp/userdef.cc
index 338c58a7c8b..56a735fdc89 100644
--- a/gdb/testsuite/gdb.cp/userdef.cc
+++ b/gdb/testsuite/gdb.cp/userdef.cc
@@ -311,6 +311,11 @@ public:
   int z;
 };
 
+bool operator== (const Member &m1, const Member &m2)
+{
+  return m1.z == m2.z;
+}
+
 class Container
 {
 public:
@@ -330,8 +335,12 @@ int main (void)
  A1 two(4,5);
  A1 three(0,0);
  Container c;
+ Member mem1, mem2;
  int val;
  
+ mem1.z = 5;
+ mem2.z = 7;
+
  marker1(); // marker1-returns-here
  cout << one; // marker1-returns-here
  cout << two;
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index 5e47d9079e0..33bb485484b 100644
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
@@ -113,6 +113,7 @@ gdb_test "print one > two" "\\\$\[0-9\]* = 0\[\r\n\]"
 gdb_test "print one >= two" "\\\$\[0-9\]* = 0\[\r\n\]"
 
 gdb_test "print one == two" "\\\$\[0-9\]* = 0\[\r\n\]"
+gdb_test "print one.operator== (two)" "\\\$\[0-9\]* = 0\[\r\n\]"
 
 gdb_test "print one != two" "\\\$\[0-9\]* = 1\[\r\n\]"
 
@@ -155,5 +156,8 @@ gdb_test "print *c" "\\\$\[0-9\]* = \\(Member &\\) @$hex: {z = .*}"
 gdb_test "print &*c" "\\\$\[0-9\]* = \\(Member \\*\\) $hex"
 gdb_test "ptype &*c" "type = (struct|class) Member {(\[\r\n \]+public:)?\[\r\n \]+int z;\[\r\n\]+} &\\*"
 
+gdb_test "print operator== (mem1, mem2)" " = false"
+gdb_test "print operator== (mem1, mem1)" " = true"
+
 gdb_exit
 return 0
-- 
2.30.2