RFA: make `info source' say whether macro info is present

RFA: make `info source' say whether macro info is present

[Jim Blandy]

This will make it a bit easier to write tests that exit gracefully
when the test executable doesn't have any information about
preprocessor macros.  Alternative suggestions welcome.

gdb/ChangeLog:
2002-05-22  Jim Blandy  <jimb@redhat.com>

	* source.c (source_info): Mention whether the symtab has
	information about preprocessor macros.

gdb/testsuite/ChangeLog:
2002-05-22  Jim Blandy  <jimb@redhat.com>

	* lib/gdb.exp (get_debug_format): Tolerate message saying whether
	preprocessor macro information is present.

Index: gdb/source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.28
diff -c -r1.28 source.c
*** gdb/source.c	23 Apr 2002 11:09:09 -0000	1.28
--- gdb/source.c	22 May 2002 20:13:14 -0000
***************
*** 500,505 ****
--- 500,507 ----
  
    printf_filtered ("Source language is %s.\n", language_str (s->language));
    printf_filtered ("Compiled with %s debugging format.\n", s->debugformat);
+   printf_filtered ("%s preprocessor macro info.\n",
+                    s->macro_table ? "Includes" : "Does not include");
  }
  \f
  
Index: gdb/testsuite/lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.18
diff -c -r1.18 gdb.exp
*** gdb/testsuite/lib/gdb.exp	10 May 2002 18:38:09 -0000	1.18
--- gdb/testsuite/lib/gdb.exp	22 May 2002 20:13:14 -0000
***************
*** 1435,1441 ****
      set debug_format "unknown"
      send_gdb "info source\n"
      gdb_expect 10 {
! 	-re "Compiled with (.*) debugging format.\r\n$gdb_prompt $" {
  	    set debug_format $expect_out(1,string)
  	    verbose "debug format is $debug_format"
  	    return 1;
--- 1435,1441 ----
      set debug_format "unknown"
      send_gdb "info source\n"
      gdb_expect 10 {
! 	-re "Compiled with (.*) debugging format.\r\n.*$gdb_prompt $" {
  	    set debug_format $expect_out(1,string)
  	    verbose "debug format is $debug_format"
  	    return 1;

Re: RFA: make `info source' say whether macro info is present

[Eli Zaretskii]

On Wed, 22 May 2002, Jim Blandy wrote:

> This will make it a bit easier to write tests that exit gracefully
> when the test executable doesn't have any information about
> preprocessor macros.  Alternative suggestions welcome.
> 
> gdb/ChangeLog:
> 2002-05-22  Jim Blandy  <jimb@redhat.com>
> 
> 	* source.c (source_info): Mention whether the symtab has
> 	information about preprocessor macros.

Jim, I think gdb.texinfo should be updated to match this change, where 
"info source" is documented.

Re: RFA: make `info source' say whether macro info is present

[Jim Blandy]

Eli Zaretskii <eliz@is.elta.co.il> writes:

> On Wed, 22 May 2002, Jim Blandy wrote:
> 
> > This will make it a bit easier to write tests that exit gracefully
> > when the test executable doesn't have any information about
> > preprocessor macros.  Alternative suggestions welcome.
> > 
> > gdb/ChangeLog:
> > 2002-05-22  Jim Blandy  <jimb@redhat.com>
> > 
> > 	* source.c (source_info): Mention whether the symtab has
> > 	information about preprocessor macros.
> 
> Jim, I think gdb.texinfo should be updated to match this change, where 
> "info source" is documented.

*blush*  Thanks.  This patch includes a doc fix:

gdb/ChangeLog:
2002-05-22  Jim Blandy  <jimb@redhat.com>

	* source.c (source_info): Mention whether the symtab has
	information about preprocessor macros.

gdb/testsuite/ChangeLog:
2002-05-22  Jim Blandy  <jimb@redhat.com>

	* lib/gdb.exp (get_debug_format): Tolerate message saying whether
	preprocessor macro information is present.

gdb/doc/ChangeLog:
2002-05-23  Jim Blandy  <jimb@redhat.com>

	* gdb.texinfo (Symbols): Update documentation for `info source'
	command.

Index: gdb/source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.28
diff -c -r1.28 source.c
*** gdb/source.c	23 Apr 2002 11:09:09 -0000	1.28
--- gdb/source.c	23 May 2002 20:02:33 -0000
***************
*** 500,505 ****
--- 500,507 ----
  
    printf_filtered ("Source language is %s.\n", language_str (s->language));
    printf_filtered ("Compiled with %s debugging format.\n", s->debugformat);
+   printf_filtered ("%s preprocessor macro info.\n",
+                    s->macro_table ? "Includes" : "Does not include");
  }
  \f
  
Index: gdb/testsuite/lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.18
diff -c -r1.18 gdb.exp
*** gdb/testsuite/lib/gdb.exp	10 May 2002 18:38:09 -0000	1.18
--- gdb/testsuite/lib/gdb.exp	23 May 2002 20:02:34 -0000
***************
*** 1435,1441 ****
      set debug_format "unknown"
      send_gdb "info source\n"
      gdb_expect 10 {
! 	-re "Compiled with (.*) debugging format.\r\n$gdb_prompt $" {
  	    set debug_format $expect_out(1,string)
  	    verbose "debug format is $debug_format"
  	    return 1;
--- 1435,1441 ----
      set debug_format "unknown"
      send_gdb "info source\n"
      gdb_expect 10 {
! 	-re "Compiled with (.*) debugging format.\r\n.*$gdb_prompt $" {
  	    set debug_format $expect_out(1,string)
  	    verbose "debug format is $debug_format"
  	    return 1;
Index: gdb/doc/gdb.texinfo
===================================================================
RCS file: /cvs/src/src/gdb/doc/gdb.texinfo,v
retrieving revision 1.100
diff -c -r1.100 gdb.texinfo
*** gdb/doc/gdb.texinfo	17 May 2002 18:00:03 -0000	1.100
--- gdb/doc/gdb.texinfo	23 May 2002 20:02:45 -0000
***************
*** 9020,9028 ****
  
  @kindex info source
  @item info source
! Show the name of the current source file---that is, the source file for
! the function containing the current point of execution---and the language
! it was written in.
  
  @kindex info sources
  @item info sources
--- 9020,9044 ----
  
  @kindex info source
  @item info source
! Show information about the current source file---that is, the source file for
! the function containing the current point of execution:
! @itemize @bullet
! @item
! the name of the source file, and the directory containing it,
! @item
! the directory it was compiled in,
! @item
! its length, in lines,
! @item
! which programming language it is written in,
! @item
! whether the executable includes debugging information for that file, and
! if so, what format the information is in (e.g., STABS, Dwarf 2, etc.), and
! @item
! whether the debugging information includes information about
! preprocessor macros.
! @end itemize
! 
  
  @kindex info sources
  @item info sources

Re: RFA: make `info source' say whether macro info is present

[Eli Zaretskii]

> From: Jim Blandy <jimb@redhat.com>
> Date: 23 May 2002 15:05:20 -0500
> 
> > Jim, I think gdb.texinfo should be updated to match this change, where 
> > "info source" is documented.
> 
> *blush*  Thanks.  This patch includes a doc fix:

Thanks, the patch for gdb.texinfo is approved.

Re: RFA: make `info source' say whether macro info is present

[Jim Blandy]

I've committed this patch.

Jim Blandy <jimb@redhat.com> writes:

> Eli Zaretskii <eliz@is.elta.co.il> writes:
> 
> > On Wed, 22 May 2002, Jim Blandy wrote:
> > 
> > > This will make it a bit easier to write tests that exit gracefully
> > > when the test executable doesn't have any information about
> > > preprocessor macros.  Alternative suggestions welcome.
> > > 
> > > gdb/ChangeLog:
> > > 2002-05-22  Jim Blandy  <jimb@redhat.com>
> > > 
> > > 	* source.c (source_info): Mention whether the symtab has
> > > 	information about preprocessor macros.
> > 
> > Jim, I think gdb.texinfo should be updated to match this change, where 
> > "info source" is documented.
> 
> *blush*  Thanks.  This patch includes a doc fix:
> 
> gdb/ChangeLog:
> 2002-05-22  Jim Blandy  <jimb@redhat.com>
> 
> 	* source.c (source_info): Mention whether the symtab has
> 	information about preprocessor macros.
> 
> gdb/testsuite/ChangeLog:
> 2002-05-22  Jim Blandy  <jimb@redhat.com>
> 
> 	* lib/gdb.exp (get_debug_format): Tolerate message saying whether
> 	preprocessor macro information is present.
> 
> gdb/doc/ChangeLog:
> 2002-05-23  Jim Blandy  <jimb@redhat.com>
> 
> 	* gdb.texinfo (Symbols): Update documentation for `info source'
> 	command.