This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH 1/2] fortran: enable ptype/whatis for user defined types.
- From: Keven Boell <keven dot boell at linux dot intel dot com>
- To: Tom Tromey <tromey at redhat dot com>, Keven Boell <keven dot boell at intel dot com>
- Cc: gdb-patches at sourceware dot org, sanimir dot agovic at intel dot com
- Date: Fri, 29 Nov 2013 13:07:04 +0100
- Subject: Re: [PATCH 1/2] fortran: enable ptype/whatis for user defined types.
- Authentication-results: sourceware.org; auth=none
- References: <1385460780-4972-1-git-send-email-keven dot boell at intel dot com> <1385460780-4972-2-git-send-email-keven dot boell at intel dot com> <87fvqhzfdz dot fsf at fleche dot redhat dot com>
On 27.11.2013 22:47, Tom Tromey wrote:
>>>>>> "Keven" == Keven Boell <keven.boell@intel.com> writes:
>
> Keven> /* Initialize this in case we *don't* use it in this call; that
> Keven> way we can refer to it unconditionally below. */
> Keven> memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
>
> I suspect this should be done inside the loop.
Yes, you are right. Moved it inside the loop. See the updated patch below.
>
> Keven> + for (i = 0; i < sizeof(lookup_domains) / sizeof(lookup_domains[0]); ++i)
>
> Spaces before "("s, but also you can use ARRAY_SIZE here instead.
Done. Used ARRAY_SIZE.
>
> Keven> + sym = lookup_symbol (tmp, expression_context_block,
> Keven> + lookup_domains[i],
> Keven> + parse_language->la_language == language_cplus
> Keven> + ? &is_a_field_of_this : NULL);
>
> Not your problem, but checking for language_cplus here seems like old
> copy-and-paste from the C++ parser.
>
> Tom
>
>From 83978757ded44b13b512076bed3bb1650b2d0104 Mon Sep 17 00:00:00 2001
From: Sanimir Agovic <sanimir.agovic@intel.com>
Date: Fri, 25 Oct 2013 12:10:57 +0100
Subject: [PATCH] fortran: enable ptype/whatis for user defined types.
(gdb) ptype type
old> No symbol "type" in current context.
new> type = Type type
integer(kind=4) :: t_i
End Type type
2013-11-19 Sanimir Agovic <sanimir.agovic@intel.com>
Keven Boell <keven.boell@intel.com>
* f-exp.y (yylex): Add domain array to enable lookup
in multiple domains. Loop over lookup domains and try
to find requested symbol. Add STRUCT_DOMAIN to lookup
domains to be able to query for user defined types.
testsuite/
* gdb.fortran/type.f90: New file.
* gdb.fortran/whatis_type.f90: New file.
Change-Id: I61c8451a3de0f3dce08ad40607fc74eed62a7bd5
Signed-off-by: Keven Boell <keven.boell@intel.com>
---
gdb/f-exp.y | 33 ++++++++++++--------
gdb/testsuite/gdb.fortran/type.f90 | 28 +++++++++++++++++
gdb/testsuite/gdb.fortran/whatis_type.exp | 48 +++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 12 deletions(-)
create mode 100644 gdb/testsuite/gdb.fortran/type.f90
create mode 100644 gdb/testsuite/gdb.fortran/whatis_type.exp
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 567cd00..a7e59df 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -1175,21 +1175,30 @@ yylex (void)
char *tmp = copy_name (yylval.sval);
struct symbol *sym;
struct field_of_this_result is_a_field_of_this;
+ enum domain_enum_tag lookup_domains[] = {STRUCT_DOMAIN, VAR_DOMAIN};
+ int i;
int hextype;
-
- /* Initialize this in case we *don't* use it in this call; that
- way we can refer to it unconditionally below. */
- memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
-
- sym = lookup_symbol (tmp, expression_context_block,
- VAR_DOMAIN,
- parse_language->la_language == language_cplus
- ? &is_a_field_of_this : NULL);
- if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+
+ for (i = 0; i < ARRAY_SIZE (lookup_domains); ++i)
{
- yylval.tsym.type = SYMBOL_TYPE (sym);
- return TYPENAME;
+ /* Initialize this in case we *don't* use it in this call; that
+ way we can refer to it unconditionally below. */
+ memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
+
+ sym = lookup_symbol (tmp, expression_context_block,
+ lookup_domains[i],
+ parse_language->la_language == language_cplus
+ ? &is_a_field_of_this : NULL);
+ if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+ {
+ yylval.tsym.type = SYMBOL_TYPE (sym);
+ return TYPENAME;
+ }
+
+ if (sym)
+ break;
}
+
yylval.tsym.type
= language_lookup_primitive_type_by_name (parse_language,
parse_gdbarch, tmp);
diff --git a/gdb/testsuite/gdb.fortran/type.f90 b/gdb/testsuite/gdb.fortran/type.f90
new file mode 100644
index 0000000..e0c699e
--- /dev/null
+++ b/gdb/testsuite/gdb.fortran/type.f90
@@ -0,0 +1,28 @@
+! Copyright 2013 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 3 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, see <http://www.gnu.org/licenses/>.
+
+program type
+ implicit none
+
+ type :: t1
+ integer :: t1_i
+ real :: t1_r
+ end type t1
+
+ type (t1) :: t1v
+
+ t1v%t1_i = 42
+ t1v%t1_r = 42.24 ! bp1
+end program type
diff --git a/gdb/testsuite/gdb.fortran/whatis_type.exp b/gdb/testsuite/gdb.fortran/whatis_type.exp
new file mode 100644
index 0000000..5a90b40
--- /dev/null
+++ b/gdb/testsuite/gdb.fortran/whatis_type.exp
@@ -0,0 +1,48 @@
+# Copyright 2013 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 3 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, see <http://www.gnu.org/licenses/>.
+
+if { [skip_fortran_tests] } { continue }
+
+standard_testfile type.f90
+
+if { [prepare_for_testing ${testfile}.exp ${testfile} \
+ ${srcfile} {debug f90}] } {
+ return -1
+}
+
+if ![runto MAIN__] {
+ perror "Couldn't run to MAIN__"
+ continue
+}
+
+gdb_breakpoint [gdb_get_line_number "bp1"]
+gdb_continue_to_breakpoint "bp1"
+
+set t1_i "integer\\\(kind=4\\\) :: t1_i"
+set t1_r "real\\\(kind=4\\\) :: t1_r"
+
+gdb_test "whatis t1" \
+ "type = Type t1\r\n${t1_i}\r\n${t1_r}\r\nEnd Type t1" \
+ "whatis t1"
+gdb_test "whatis t1v" \
+ "type = Type t1\r\n${t1_i}\r\n${t1_r}\r\nEnd Type t1" \
+ "whatis t1v"
+
+gdb_test "ptype t1" \
+ "type = Type t1\r\n ${t1_i}\r\n ${t1_r}\r\nEnd Type t1" \
+ "ptype t1"
+gdb_test "ptype t1v" \
+ "type = Type t1\r\n ${t1_i}\r\n ${t1_r}\r\nEnd Type t1" \
+ "ptype t1"
--
1.7.9.5