2002-05-27 Michael Chastain <mec@shout.net>

From Benjamin Kosnik  <bkoz@redhat.com>

	* gdb.c++/m-data.cc: New file.
	* gdb.c++/m-data.exp: New file.

3 files changed, 171 insertions, 0 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f746075..c033fa3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2002-05-27  Michael Chastain  <mec@shout.net>
 From Benjamin Kosnik  <bkoz@redhat.com>
 
+	* gdb.c++/m-data.cc: New file.
+	* gdb.c++/m-data.exp: New file.
+
+2002-05-27  Michael Chastain  <mec@shout.net>
+From Benjamin Kosnik  <bkoz@redhat.com>
+
 	* gdb.c++/try_catch.cc: New file.
 	* gdb.c++/try_catch.exp: New file.	
 
diff --git a/gdb/testsuite/gdb.c++/m-data.cc b/gdb/testsuite/gdb.c++/m-data.cc
new file mode 100644
index 0000000..d995027
--- /dev/null
+++ b/gdb/testsuite/gdb.c++/m-data.cc
@@ -0,0 +1,53 @@
+// 2002-05-13
+
+namespace __gnu_test
+{
+  enum 	region { oriental, egyptian, greek, etruscan, roman };
+
+  // Test one.
+  class gnu_obj_1
+  {
+  protected:
+    typedef region antiquities;
+    const bool 		test;
+    const int 		key1;
+    long       		key2;
+
+    antiquities 	value;
+
+  public:
+    gnu_obj_1(antiquities a, long l): test(true), key1(5), key2(l), value(a) {}
+  };
+
+  // Test two.
+  template<typename T>
+    class gnu_obj_2: public virtual gnu_obj_1
+    {
+    protected:
+      antiquities	value_derived;
+      
+    public:
+      gnu_obj_2(antiquities b): gnu_obj_1(oriental, 7), value_derived(b) { }
+    }; 
+
+  // Test three.
+  template<typename T>
+    class gnu_obj_3
+    {
+    protected:
+      typedef region antiquities;
+      gnu_obj_2<int>   	data;
+      
+    public:
+      gnu_obj_3(antiquities b): data(etruscan) { }
+    }; 
+} 
+
+int main()
+{
+  using namespace __gnu_test;
+  gnu_obj_1		test1(egyptian, 4589);
+  gnu_obj_2<long>	test2(roman);
+  gnu_obj_3<long>	test3(greek);
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.c++/m-data.exp b/gdb/testsuite/gdb.c++/m-data.exp
new file mode 100644
index 0000000..ac68258
--- /dev/null
+++ b/gdb/testsuite/gdb.c++/m-data.exp
@@ -0,0 +1,112 @@
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Tests for member data
+# 2002-05-13  Benjamin Kosnik  <bkoz@redhat.com>
+
+# This file is part of the gdb testsuite
+
+if $tracelevel then {
+        strace $tracelevel
+        }
+
+if { [skip_cplus_tests] } { continue }
+
+#
+# test running programs
+#
+set prms_id 0
+set bug_id 0
+
+set testfile "m-data"
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+if [get_compiler_info ${binfile} "c++"] {
+    return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+
+if ![runto_main] then {
+    perror "couldn't run to breakpoint"
+    continue
+}
+
+# One.
+gdb_test "break 50" "Breakpoint \[0-9\]*.*line 50\\."
+gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-data\\.cc:50\r\n.*" "continue to 50"
+
+# simple object, const bool
+gdb_test "print test1.test" "\\$\[0-9\]* = true" "simple object, const bool"
+
+# simple object, const int
+gdb_test "print test1.key1" "\\$\[0-9\]* = 5" "simple object, const int"
+
+# simple object, long
+gdb_test "print test1.key2" "\\$\[0-9\]* = 4589" "simple object, long"
+
+# simple object, enum
+gdb_test "print test1.value" "\\$\[0-9\]* = egyptian" "simple object, enum"
+
+# Two.
+gdb_test "break 51" "Breakpoint \[0-9\]*.*line 51\\."
+gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-data\\.cc:51\r\n.*" "continue to 51"
+
+# derived template object, base const bool
+gdb_test "print test2.test" "\\$\[0-9\]* = true" "derived template object, base const bool"
+
+# derived template object, base const int
+gdb_test "print test2.key1" "\\$\[0-9\]* = 5" "derived template object, base const int"
+
+# derived template object, base long
+gdb_test "print test2.key2" "\\$\[0-9\]* = 7" "derived template object, base long"
+
+# derived template object, base enum
+gdb_test "print test2.value" "\\$\[0-9\]* = oriental" "derived template object, base enum"
+
+# derived template object, enum
+gdb_test "print test2.value_derived" "\\$\[0-9\]* = roman" "derived template object, derived enum"
+
+# Three.
+gdb_test "break 52" "Breakpoint \[0-9\]*.*line 52\\."
+gdb_test "continue" "Continuing\\.\r\n\r\nBreakpoint.*at.*m-data\\.cc:52\r\n.*" "continue to 52"
+
+# template object, derived template data member's base const bool
+gdb_test "print test3.data.test" "\\$\[0-9\]* = true" "template object, const bool"
+
+# template object, derived template data member's base const int
+gdb_test "print test3.data.key1" "\\$\[0-9\]* = 5" "template object, const int"
+
+# template object, derived template data member's base long
+gdb_test "print test3.data.key2" "\\$\[0-9\]* = 7" "template object, long"
+
+# template object, derived template data member's base enum
+gdb_test "print test3.data.value" "\\$\[0-9\]* = oriental" "template object, base enum"
+
+# template object, derived template data member's enum
+gdb_test "print test3.data.value_derived" "\\$\[0-9]\* = etruscan" "template object, derived enum"
+
+gdb_exit
+return 0