[PATCH] Redefine skip_quoted

[PATCH] Redefine skip_quoted

[Adam Fedor]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

Objective-C has a different idea of what word break characters are. 
Hence this patch (although the new usage isn't actually apparent in this 
patch).

2002-10-04  Adam Fedor  <fedor@gnu.org>

	* Makefile.in (c-exp.tab.o): Add $(completer_h) to dependancies.
	(jv-exp.tarb.o): Likewise.
	(p-exp.tab.o): Likewise.
	* completer.c (skip_quoted): Take additional "word break
	characters" argument.
	* completer.h: Update definition of skip_quoted.
	* defs.h (skip_quoted): Delete, declared in completer.h.
	* c-exp.y: Include completer.h.  Update definition of skip_quoted.
	* p-exp.y: Likewise.
	* jv-exp.y: Likewise.
	* linespec.c (decode_line_1): Likewise.



[-- Attachment #2: objc3.patch --]
[-- Type: text/plain, Size: 7511 bytes --]

Index: gdb/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.268
diff -u -p -r1.268 Makefile.in
--- gdb/Makefile.in	2 Oct 2002 21:33:58 -0000	1.268
+++ gdb/Makefile.in	5 Oct 2002 02:49:03 -0000
@@ -1433,12 +1433,12 @@ z8k-tdep.o: $(srcdir)/z8k-tdep.c
 
 c-exp.tab.o: c-exp.tab.c $(defs_h) $(gdb_string_h) $(expression_h) \
 	$(value_h) $(parser_defs_h) $(language_h) $(c_lang_h) $(bfd_h) \
-	$(charset_h) \
+	$(charset_h) $(completer_h) \
 	$(symfile_h) $(objfiles_h)
 
 jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \
 	$(gdbtypes_h) $(language_h) $(parser_defs_h) $(symtab_h) $(value_h) \
-	$(bfd_h) $(objfiles_h) $(symfile_h)
+	$(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h) 
 
 f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
 	$(language_h) $(parser_defs_h) $(value_h) $(bfd_h) $(objfiles_h) \
@@ -1450,7 +1450,7 @@ m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(e
 
 p-exp.tab.o: p-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	$(language_h) p-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
-	$(bfd_h) $(objfiles_h) $(symfile_h)
+	$(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h) 
 
 ada-exp.tab.o: ada-exp.tab.c ada-lex.c ada-lang.h \
 	$(defs_h) $(expression_h) \
Index: gdb/c-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/c-exp.y,v
retrieving revision 1.15
diff -u -p -r1.15 c-exp.y
--- gdb/c-exp.y	20 Sep 2002 00:24:01 -0000	1.15
+++ gdb/c-exp.y	5 Oct 2002 02:49:10 -0000
@@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "symfile.h" /* Required by objfiles.h.  */
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
 #include "charset.h"
+#include "completer.h"
 
 /* Flag indicating we're dealing with HP-compiled objects */ 
 extern int hp_som_som_object_present;
@@ -1331,7 +1332,9 @@ yylex ()
       c = *lexptr++;
       if (c != '\'')
 	{
-	  namelen = skip_quoted (tokstart) - tokstart;
+	  namelen = skip_quoted (tokstart, 
+				 get_gdb_completer_word_break_characters())
+	    - tokstart;
 	  if (namelen > 2)
 	    {
 	      lexptr = tokstart + namelen;
Index: gdb/completer.c
===================================================================
RCS file: /cvs/src/src/gdb/completer.c,v
retrieving revision 1.11
diff -u -p -r1.11 completer.c
--- gdb/completer.c	24 Mar 2002 00:40:35 -0000	1.11
+++ gdb/completer.c	5 Oct 2002 02:49:11 -0000
@@ -683,7 +683,7 @@ line_completion_function (char *text, in
    location after the "word". */
 
 char *
-skip_quoted (char *str)
+skip_quoted (char *str, char *breakchars)
 {
   char quote_char = '\0';
   char *scan;
@@ -705,7 +705,7 @@ skip_quoted (char *str)
 	  /* Found start of a quoted string. */
 	  quote_char = *scan;
 	}
-      else if (strchr (gdb_completer_word_break_characters, *scan))
+      else if (strchr (breakchars, *scan))
 	{
 	  break;
 	}
Index: gdb/completer.h
===================================================================
RCS file: /cvs/src/src/gdb/completer.h,v
retrieving revision 1.6
diff -u -p -r1.6 completer.h
--- gdb/completer.h	18 Feb 2002 01:12:38 -0000	1.6
+++ gdb/completer.h	5 Oct 2002 02:49:11 -0000
@@ -39,6 +39,6 @@ extern char *get_gdb_completer_quote_cha
 
 /* Exported to linespec.c */
 
-extern char *skip_quoted (char *str);
+extern char *skip_quoted (char *str, char *);
 
 #endif /* defined (COMPLETER_H) */
Index: gdb/defs.h
===================================================================
RCS file: /cvs/src/src/gdb/defs.h,v
retrieving revision 1.99
diff -u -p -r1.99 defs.h
--- gdb/defs.h	27 Sep 2002 22:08:51 -0000	1.99
+++ gdb/defs.h	5 Oct 2002 02:49:13 -0000
@@ -532,8 +532,6 @@ extern void print_transfer_performance (
 
 typedef void initialize_file_ftype (void);
 
-extern char *skip_quoted (char *);
-
 extern char *gdb_readline (char *);
 
 extern char *gdb_readline_wrapper (char *);
Index: gdb/jv-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/jv-exp.y,v
retrieving revision 1.11
diff -u -p -r1.11 jv-exp.y
--- gdb/jv-exp.y	19 Sep 2002 03:58:41 -0000	1.11
+++ gdb/jv-exp.y	5 Oct 2002 02:49:14 -0000
@@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "bfd.h" /* Required by objfiles.h.  */
 #include "symfile.h" /* Required by objfiles.h.  */
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
+#include "completer.h"
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
    as well as gratuitiously global symbol names, so we can have multiple
@@ -918,7 +919,9 @@ yylex ()
       c = *lexptr++;
       if (c != '\'')
 	{
-	  namelen = skip_quoted (tokstart) - tokstart;
+	  namelen = skip_quoted (tokstart, 
+				 get_gdb_completer_word_break_characters())
+	    - tokstart;
 	  if (namelen > 2)
 	    {
 	      lexptr = tokstart + namelen;
Index: gdb/linespec.c
===================================================================
RCS file: /cvs/src/src/gdb/linespec.c,v
retrieving revision 1.23
diff -u -p -r1.23 linespec.c
--- gdb/linespec.c	22 Sep 2002 22:18:41 -0000	1.23
+++ gdb/linespec.c	5 Oct 2002 02:49:14 -0000
@@ -761,7 +761,8 @@ decode_line_1 (char **argptr, int funfir
 		      && strchr (get_gdb_completer_quote_characters (),
 				 **argptr) != NULL)
 		    {
-		      p = skip_quoted (*argptr);
+		      p = skip_quoted (*argptr,
+				       get_gdb_completer_word_break_characters());
 		      *argptr = *argptr + 1;
 		    }
 		  else
@@ -1094,10 +1095,14 @@ decode_line_1 (char **argptr, int funfir
      Find the next token (everything up to end or next whitespace).  */
 
   if (**argptr == '$')		/* May be a convenience variable */
-    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));	/* One or two $ chars possible */
+    {
+      /* One or two $ chars possible */
+      p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1),
+		       get_gdb_completer_word_break_characters());
+    }
   else if (is_quoted)
     {
-      p = skip_quoted (*argptr);
+      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
       if (p[-1] != '\'')
 	error ("Unmatched single quote.");
     }
@@ -1107,7 +1112,7 @@ decode_line_1 (char **argptr, int funfir
     }
   else
     {
-      p = skip_quoted (*argptr);
+      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
     }
 
   copy = (char *) alloca (p - *argptr + 1);
Index: gdb/p-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/p-exp.y,v
retrieving revision 1.15
diff -u -p -r1.15 p-exp.y
--- gdb/p-exp.y	19 Sep 2002 03:58:41 -0000	1.15
+++ gdb/p-exp.y	5 Oct 2002 02:49:15 -0000
@@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #include "bfd.h" /* Required by objfiles.h.  */
 #include "symfile.h" /* Required by objfiles.h.  */
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
+#include "completer.h"
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
    as well as gratuitiously global symbol names, so we can have multiple
@@ -1100,8 +1101,10 @@ yylex ()
       c = *lexptr++;
       if (c != '\'')
 	{
-	  namelen = skip_quoted (tokstart) - tokstart;
-	  if (namelen > 2)
+	  namelen = skip_quoted (tokstart, 
+				 get_gdb_completer_word_break_characters())
+	    - tokstart;
+   	  if (namelen > 2)
 	    {
 	      lexptr = tokstart + namelen;
 	      if (lexptr[-1] != '\'')

Re: [PATCH] Redefine skip_quoted

[Michael Snyder]

Adam Fedor wrote:
> 
> Objective-C has a different idea of what word break characters are.
> Hence this patch (although the new usage isn't actually apparent in this
> patch).

I think you need Jim or Elena's buy-in for the change in linespec.c, 
but I'll approve the rest.  Jim, Elena's on vacation -- can you give
a quick look at this?

> 
> 2002-10-04  Adam Fedor  <fedor@gnu.org>
> 
>         * Makefile.in (c-exp.tab.o): Add $(completer_h) to dependancies.
>         (jv-exp.tarb.o): Likewise.
>         (p-exp.tab.o): Likewise.
>         * completer.c (skip_quoted): Take additional "word break
>         characters" argument.
>         * completer.h: Update definition of skip_quoted.
>         * defs.h (skip_quoted): Delete, declared in completer.h.
>         * c-exp.y: Include completer.h.  Update definition of skip_quoted.
>         * p-exp.y: Likewise.
>         * jv-exp.y: Likewise.
>         * linespec.c (decode_line_1): Likewise.
> 
>   -------------------------------------------------------------------------------
> Index: gdb/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/gdb/Makefile.in,v
> retrieving revision 1.268
> diff -u -p -r1.268 Makefile.in
> --- gdb/Makefile.in     2 Oct 2002 21:33:58 -0000       1.268
> +++ gdb/Makefile.in     5 Oct 2002 02:49:03 -0000
> @@ -1433,12 +1433,12 @@ z8k-tdep.o: $(srcdir)/z8k-tdep.c
> 
>  c-exp.tab.o: c-exp.tab.c $(defs_h) $(gdb_string_h) $(expression_h) \
>         $(value_h) $(parser_defs_h) $(language_h) $(c_lang_h) $(bfd_h) \
> -       $(charset_h) \
> +       $(charset_h) $(completer_h) \
>         $(symfile_h) $(objfiles_h)
> 
>  jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \
>         $(gdbtypes_h) $(language_h) $(parser_defs_h) $(symtab_h) $(value_h) \
> -       $(bfd_h) $(objfiles_h) $(symfile_h)
> +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> 
>  f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
>         $(language_h) $(parser_defs_h) $(value_h) $(bfd_h) $(objfiles_h) \
> @@ -1450,7 +1450,7 @@ m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(e
> 
>  p-exp.tab.o: p-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
>         $(language_h) p-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
> -       $(bfd_h) $(objfiles_h) $(symfile_h)
> +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> 
>  ada-exp.tab.o: ada-exp.tab.c ada-lex.c ada-lang.h \
>         $(defs_h) $(expression_h) \
> Index: gdb/c-exp.y
> ===================================================================
> RCS file: /cvs/src/src/gdb/c-exp.y,v
> retrieving revision 1.15
> diff -u -p -r1.15 c-exp.y
> --- gdb/c-exp.y 20 Sep 2002 00:24:01 -0000      1.15
> +++ gdb/c-exp.y 5 Oct 2002 02:49:10 -0000
> @@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suit
>  #include "symfile.h" /* Required by objfiles.h.  */
>  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
>  #include "charset.h"
> +#include "completer.h"
> 
>  /* Flag indicating we're dealing with HP-compiled objects */
>  extern int hp_som_som_object_present;
> @@ -1331,7 +1332,9 @@ yylex ()
>        c = *lexptr++;
>        if (c != '\'')
>         {
> -         namelen = skip_quoted (tokstart) - tokstart;
> +         namelen = skip_quoted (tokstart,
> +                                get_gdb_completer_word_break_characters())
> +           - tokstart;
>           if (namelen > 2)
>             {
>               lexptr = tokstart + namelen;
> Index: gdb/completer.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/completer.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 completer.c
> --- gdb/completer.c     24 Mar 2002 00:40:35 -0000      1.11
> +++ gdb/completer.c     5 Oct 2002 02:49:11 -0000
> @@ -683,7 +683,7 @@ line_completion_function (char *text, in
>     location after the "word". */
> 
>  char *
> -skip_quoted (char *str)
> +skip_quoted (char *str, char *breakchars)
>  {
>    char quote_char = '\0';
>    char *scan;
> @@ -705,7 +705,7 @@ skip_quoted (char *str)
>           /* Found start of a quoted string. */
>           quote_char = *scan;
>         }
> -      else if (strchr (gdb_completer_word_break_characters, *scan))
> +      else if (strchr (breakchars, *scan))
>         {
>           break;
>         }
> Index: gdb/completer.h
> ===================================================================
> RCS file: /cvs/src/src/gdb/completer.h,v
> retrieving revision 1.6
> diff -u -p -r1.6 completer.h
> --- gdb/completer.h     18 Feb 2002 01:12:38 -0000      1.6
> +++ gdb/completer.h     5 Oct 2002 02:49:11 -0000
> @@ -39,6 +39,6 @@ extern char *get_gdb_completer_quote_cha
> 
>  /* Exported to linespec.c */
> 
> -extern char *skip_quoted (char *str);
> +extern char *skip_quoted (char *str, char *);
> 
>  #endif /* defined (COMPLETER_H) */
> Index: gdb/defs.h
> ===================================================================
> RCS file: /cvs/src/src/gdb/defs.h,v
> retrieving revision 1.99
> diff -u -p -r1.99 defs.h
> --- gdb/defs.h  27 Sep 2002 22:08:51 -0000      1.99
> +++ gdb/defs.h  5 Oct 2002 02:49:13 -0000
> @@ -532,8 +532,6 @@ extern void print_transfer_performance (
> 
>  typedef void initialize_file_ftype (void);
> 
> -extern char *skip_quoted (char *);
> -
>  extern char *gdb_readline (char *);
> 
>  extern char *gdb_readline_wrapper (char *);
> Index: gdb/jv-exp.y
> ===================================================================
> RCS file: /cvs/src/src/gdb/jv-exp.y,v
> retrieving revision 1.11
> diff -u -p -r1.11 jv-exp.y
> --- gdb/jv-exp.y        19 Sep 2002 03:58:41 -0000      1.11
> +++ gdb/jv-exp.y        5 Oct 2002 02:49:14 -0000
> @@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suit
>  #include "bfd.h" /* Required by objfiles.h.  */
>  #include "symfile.h" /* Required by objfiles.h.  */
>  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> +#include "completer.h"
> 
>  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
>     as well as gratuitiously global symbol names, so we can have multiple
> @@ -918,7 +919,9 @@ yylex ()
>        c = *lexptr++;
>        if (c != '\'')
>         {
> -         namelen = skip_quoted (tokstart) - tokstart;
> +         namelen = skip_quoted (tokstart,
> +                                get_gdb_completer_word_break_characters())
> +           - tokstart;
>           if (namelen > 2)
>             {
>               lexptr = tokstart + namelen;
> Index: gdb/linespec.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/linespec.c,v
> retrieving revision 1.23
> diff -u -p -r1.23 linespec.c
> --- gdb/linespec.c      22 Sep 2002 22:18:41 -0000      1.23
> +++ gdb/linespec.c      5 Oct 2002 02:49:14 -0000
> @@ -761,7 +761,8 @@ decode_line_1 (char **argptr, int funfir
>                       && strchr (get_gdb_completer_quote_characters (),
>                                  **argptr) != NULL)
>                     {
> -                     p = skip_quoted (*argptr);
> +                     p = skip_quoted (*argptr,
> +                                      get_gdb_completer_word_break_characters());
>                       *argptr = *argptr + 1;
>                     }
>                   else
> @@ -1094,10 +1095,14 @@ decode_line_1 (char **argptr, int funfir
>       Find the next token (everything up to end or next whitespace).  */
> 
>    if (**argptr == '$')         /* May be a convenience variable */
> -    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));       /* One or two $ chars possible */
> +    {
> +      /* One or two $ chars possible */
> +      p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1),
> +                      get_gdb_completer_word_break_characters());
> +    }
>    else if (is_quoted)
>      {
> -      p = skip_quoted (*argptr);
> +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
>        if (p[-1] != '\'')
>         error ("Unmatched single quote.");
>      }
> @@ -1107,7 +1112,7 @@ decode_line_1 (char **argptr, int funfir
>      }
>    else
>      {
> -      p = skip_quoted (*argptr);
> +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
>      }
> 
>    copy = (char *) alloca (p - *argptr + 1);
> Index: gdb/p-exp.y
> ===================================================================
> RCS file: /cvs/src/src/gdb/p-exp.y,v
> retrieving revision 1.15
> diff -u -p -r1.15 p-exp.y
> --- gdb/p-exp.y 19 Sep 2002 03:58:41 -0000      1.15
> +++ gdb/p-exp.y 5 Oct 2002 02:49:15 -0000
> @@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suit
>  #include "bfd.h" /* Required by objfiles.h.  */
>  #include "symfile.h" /* Required by objfiles.h.  */
>  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> +#include "completer.h"
> 
>  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
>     as well as gratuitiously global symbol names, so we can have multiple
> @@ -1100,8 +1101,10 @@ yylex ()
>        c = *lexptr++;
>        if (c != '\'')
>         {
> -         namelen = skip_quoted (tokstart) - tokstart;
> -         if (namelen > 2)
> +         namelen = skip_quoted (tokstart,
> +                                get_gdb_completer_word_break_characters())
> +           - tokstart;
> +         if (namelen > 2)
>             {
>               lexptr = tokstart + namelen;
>               if (lexptr[-1] != '\'')

Re: [PATCH] Redefine skip_quoted

[Jim Blandy]

I don't understand the purpose of this patch.

Instead of havingb skip_quoted use gdb_completer_word_break_characters
directly, it adds an argument to skip_quoted, and then passes the
return value from get_gdb_completer_word_break_characters () in every
case.  But the Objective-C case does exactly the same thing as all the
other cases; it doesn't behave any differently.

Is this some sort of preparatory patch for something else?  What's
coming down the line?

Michael Snyder <msnyder@redhat.com> writes:

> Adam Fedor wrote:
> > 
> > Objective-C has a different idea of what word break characters are.
> > Hence this patch (although the new usage isn't actually apparent in this
> > patch).
> 
> I think you need Jim or Elena's buy-in for the change in linespec.c, 
> but I'll approve the rest.  Jim, Elena's on vacation -- can you give
> a quick look at this?
> 
> > 
> > 2002-10-04  Adam Fedor  <fedor@gnu.org>
> > 
> >         * Makefile.in (c-exp.tab.o): Add $(completer_h) to dependancies.
> >         (jv-exp.tarb.o): Likewise.
> >         (p-exp.tab.o): Likewise.
> >         * completer.c (skip_quoted): Take additional "word break
> >         characters" argument.
> >         * completer.h: Update definition of skip_quoted.
> >         * defs.h (skip_quoted): Delete, declared in completer.h.
> >         * c-exp.y: Include completer.h.  Update definition of skip_quoted.
> >         * p-exp.y: Likewise.
> >         * jv-exp.y: Likewise.
> >         * linespec.c (decode_line_1): Likewise.
> > 
> >   -------------------------------------------------------------------------------
> > Index: gdb/Makefile.in
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/Makefile.in,v
> > retrieving revision 1.268
> > diff -u -p -r1.268 Makefile.in
> > --- gdb/Makefile.in     2 Oct 2002 21:33:58 -0000       1.268
> > +++ gdb/Makefile.in     5 Oct 2002 02:49:03 -0000
> > @@ -1433,12 +1433,12 @@ z8k-tdep.o: $(srcdir)/z8k-tdep.c
> > 
> >  c-exp.tab.o: c-exp.tab.c $(defs_h) $(gdb_string_h) $(expression_h) \
> >         $(value_h) $(parser_defs_h) $(language_h) $(c_lang_h) $(bfd_h) \
> > -       $(charset_h) \
> > +       $(charset_h) $(completer_h) \
> >         $(symfile_h) $(objfiles_h)
> > 
> >  jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \
> >         $(gdbtypes_h) $(language_h) $(parser_defs_h) $(symtab_h) $(value_h) \
> > -       $(bfd_h) $(objfiles_h) $(symfile_h)
> > +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> > 
> >  f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
> >         $(language_h) $(parser_defs_h) $(value_h) $(bfd_h) $(objfiles_h) \
> > @@ -1450,7 +1450,7 @@ m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(e
> > 
> >  p-exp.tab.o: p-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
> >         $(language_h) p-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
> > -       $(bfd_h) $(objfiles_h) $(symfile_h)
> > +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> > 
> >  ada-exp.tab.o: ada-exp.tab.c ada-lex.c ada-lang.h \
> >         $(defs_h) $(expression_h) \
> > Index: gdb/c-exp.y
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/c-exp.y,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 c-exp.y
> > --- gdb/c-exp.y 20 Sep 2002 00:24:01 -0000      1.15
> > +++ gdb/c-exp.y 5 Oct 2002 02:49:10 -0000
> > @@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suit
> >  #include "symfile.h" /* Required by objfiles.h.  */
> >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> >  #include "charset.h"
> > +#include "completer.h"
> > 
> >  /* Flag indicating we're dealing with HP-compiled objects */
> >  extern int hp_som_som_object_present;
> > @@ -1331,7 +1332,9 @@ yylex ()
> >        c = *lexptr++;
> >        if (c != '\'')
> >         {
> > -         namelen = skip_quoted (tokstart) - tokstart;
> > +         namelen = skip_quoted (tokstart,
> > +                                get_gdb_completer_word_break_characters())
> > +           - tokstart;
> >           if (namelen > 2)
> >             {
> >               lexptr = tokstart + namelen;
> > Index: gdb/completer.c
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/completer.c,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 completer.c
> > --- gdb/completer.c     24 Mar 2002 00:40:35 -0000      1.11
> > +++ gdb/completer.c     5 Oct 2002 02:49:11 -0000
> > @@ -683,7 +683,7 @@ line_completion_function (char *text, in
> >     location after the "word". */
> > 
> >  char *
> > -skip_quoted (char *str)
> > +skip_quoted (char *str, char *breakchars)
> >  {
> >    char quote_char = '\0';
> >    char *scan;
> > @@ -705,7 +705,7 @@ skip_quoted (char *str)
> >           /* Found start of a quoted string. */
> >           quote_char = *scan;
> >         }
> > -      else if (strchr (gdb_completer_word_break_characters, *scan))
> > +      else if (strchr (breakchars, *scan))
> >         {
> >           break;
> >         }
> > Index: gdb/completer.h
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/completer.h,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 completer.h
> > --- gdb/completer.h     18 Feb 2002 01:12:38 -0000      1.6
> > +++ gdb/completer.h     5 Oct 2002 02:49:11 -0000
> > @@ -39,6 +39,6 @@ extern char *get_gdb_completer_quote_cha
> > 
> >  /* Exported to linespec.c */
> > 
> > -extern char *skip_quoted (char *str);
> > +extern char *skip_quoted (char *str, char *);
> > 
> >  #endif /* defined (COMPLETER_H) */
> > Index: gdb/defs.h
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/defs.h,v
> > retrieving revision 1.99
> > diff -u -p -r1.99 defs.h
> > --- gdb/defs.h  27 Sep 2002 22:08:51 -0000      1.99
> > +++ gdb/defs.h  5 Oct 2002 02:49:13 -0000
> > @@ -532,8 +532,6 @@ extern void print_transfer_performance (
> > 
> >  typedef void initialize_file_ftype (void);
> > 
> > -extern char *skip_quoted (char *);
> > -
> >  extern char *gdb_readline (char *);
> > 
> >  extern char *gdb_readline_wrapper (char *);
> > Index: gdb/jv-exp.y
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/jv-exp.y,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 jv-exp.y
> > --- gdb/jv-exp.y        19 Sep 2002 03:58:41 -0000      1.11
> > +++ gdb/jv-exp.y        5 Oct 2002 02:49:14 -0000
> > @@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suit
> >  #include "bfd.h" /* Required by objfiles.h.  */
> >  #include "symfile.h" /* Required by objfiles.h.  */
> >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> > +#include "completer.h"
> > 
> >  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
> >     as well as gratuitiously global symbol names, so we can have multiple
> > @@ -918,7 +919,9 @@ yylex ()
> >        c = *lexptr++;
> >        if (c != '\'')
> >         {
> > -         namelen = skip_quoted (tokstart) - tokstart;
> > +         namelen = skip_quoted (tokstart,
> > +                                get_gdb_completer_word_break_characters())
> > +           - tokstart;
> >           if (namelen > 2)
> >             {
> >               lexptr = tokstart + namelen;
> > Index: gdb/linespec.c
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/linespec.c,v
> > retrieving revision 1.23
> > diff -u -p -r1.23 linespec.c
> > --- gdb/linespec.c      22 Sep 2002 22:18:41 -0000      1.23
> > +++ gdb/linespec.c      5 Oct 2002 02:49:14 -0000
> > @@ -761,7 +761,8 @@ decode_line_1 (char **argptr, int funfir
> >                       && strchr (get_gdb_completer_quote_characters (),
> >                                  **argptr) != NULL)
> >                     {
> > -                     p = skip_quoted (*argptr);
> > +                     p = skip_quoted (*argptr,
> > +                                      get_gdb_completer_word_break_characters());
> >                       *argptr = *argptr + 1;
> >                     }
> >                   else
> > @@ -1094,10 +1095,14 @@ decode_line_1 (char **argptr, int funfir
> >       Find the next token (everything up to end or next whitespace).  */
> > 
> >    if (**argptr == '$')         /* May be a convenience variable */
> > -    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));       /* One or two $ chars possible */
> > +    {
> > +      /* One or two $ chars possible */
> > +      p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1),
> > +                      get_gdb_completer_word_break_characters());
> > +    }
> >    else if (is_quoted)
> >      {
> > -      p = skip_quoted (*argptr);
> > +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
> >        if (p[-1] != '\'')
> >         error ("Unmatched single quote.");
> >      }
> > @@ -1107,7 +1112,7 @@ decode_line_1 (char **argptr, int funfir
> >      }
> >    else
> >      {
> > -      p = skip_quoted (*argptr);
> > +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
> >      }
> > 
> >    copy = (char *) alloca (p - *argptr + 1);
> > Index: gdb/p-exp.y
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/p-exp.y,v
> > retrieving revision 1.15
> > diff -u -p -r1.15 p-exp.y
> > --- gdb/p-exp.y 19 Sep 2002 03:58:41 -0000      1.15
> > +++ gdb/p-exp.y 5 Oct 2002 02:49:15 -0000
> > @@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suit
> >  #include "bfd.h" /* Required by objfiles.h.  */
> >  #include "symfile.h" /* Required by objfiles.h.  */
> >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> > +#include "completer.h"
> > 
> >  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
> >     as well as gratuitiously global symbol names, so we can have multiple
> > @@ -1100,8 +1101,10 @@ yylex ()
> >        c = *lexptr++;
> >        if (c != '\'')
> >         {
> > -         namelen = skip_quoted (tokstart) - tokstart;
> > -         if (namelen > 2)
> > +         namelen = skip_quoted (tokstart,
> > +                                get_gdb_completer_word_break_characters())
> > +           - tokstart;
> > +         if (namelen > 2)
> >             {
> >               lexptr = tokstart + namelen;
> >               if (lexptr[-1] != '\'')

Re: [PATCH] Redefine skip_quoted

[Michael Snyder]

Jim Blandy wrote:
> 
> I don't understand the purpose of this patch.
> 
> Instead of havingb skip_quoted use gdb_completer_word_break_characters
> directly, it adds an argument to skip_quoted, and then passes the
> return value from get_gdb_completer_word_break_characters () in every
> case.  But the Objective-C case does exactly the same thing as all the
> other cases; it doesn't behave any differently.
> 
> Is this some sort of preparatory patch for something else?  What's
> coming down the line?

I know that ObjC needs to redefine the set of word-break chars, 
because it has some extra ones like ':' and ']'.  I can't find
where they get redefined in this patch: perhaps it's in a part
of the uber-patch that's been held back?

> 
> Michael Snyder <msnyder@redhat.com> writes:
> 
> > Adam Fedor wrote:
> > >
> > > Objective-C has a different idea of what word break characters are.
> > > Hence this patch (although the new usage isn't actually apparent in this
> > > patch).
> >
> > I think you need Jim or Elena's buy-in for the change in linespec.c,
> > but I'll approve the rest.  Jim, Elena's on vacation -- can you give
> > a quick look at this?
> >
> > >
> > > 2002-10-04  Adam Fedor  <fedor@gnu.org>
> > >
> > >         * Makefile.in (c-exp.tab.o): Add $(completer_h) to dependancies.
> > >         (jv-exp.tarb.o): Likewise.
> > >         (p-exp.tab.o): Likewise.
> > >         * completer.c (skip_quoted): Take additional "word break
> > >         characters" argument.
> > >         * completer.h: Update definition of skip_quoted.
> > >         * defs.h (skip_quoted): Delete, declared in completer.h.
> > >         * c-exp.y: Include completer.h.  Update definition of skip_quoted.
> > >         * p-exp.y: Likewise.
> > >         * jv-exp.y: Likewise.
> > >         * linespec.c (decode_line_1): Likewise.
> > >
> > >   -------------------------------------------------------------------------------
> > > Index: gdb/Makefile.in
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/Makefile.in,v
> > > retrieving revision 1.268
> > > diff -u -p -r1.268 Makefile.in
> > > --- gdb/Makefile.in     2 Oct 2002 21:33:58 -0000       1.268
> > > +++ gdb/Makefile.in     5 Oct 2002 02:49:03 -0000
> > > @@ -1433,12 +1433,12 @@ z8k-tdep.o: $(srcdir)/z8k-tdep.c
> > >
> > >  c-exp.tab.o: c-exp.tab.c $(defs_h) $(gdb_string_h) $(expression_h) \
> > >         $(value_h) $(parser_defs_h) $(language_h) $(c_lang_h) $(bfd_h) \
> > > -       $(charset_h) \
> > > +       $(charset_h) $(completer_h) \
> > >         $(symfile_h) $(objfiles_h)
> > >
> > >  jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \
> > >         $(gdbtypes_h) $(language_h) $(parser_defs_h) $(symtab_h) $(value_h) \
> > > -       $(bfd_h) $(objfiles_h) $(symfile_h)
> > > +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> > >
> > >  f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
> > >         $(language_h) $(parser_defs_h) $(value_h) $(bfd_h) $(objfiles_h) \
> > > @@ -1450,7 +1450,7 @@ m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(e
> > >
> > >  p-exp.tab.o: p-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
> > >         $(language_h) p-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
> > > -       $(bfd_h) $(objfiles_h) $(symfile_h)
> > > +       $(bfd_h) $(objfiles_h) $(symfile_h) $(completer_h)
> > >
> > >  ada-exp.tab.o: ada-exp.tab.c ada-lex.c ada-lang.h \
> > >         $(defs_h) $(expression_h) \
> > > Index: gdb/c-exp.y
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/c-exp.y,v
> > > retrieving revision 1.15
> > > diff -u -p -r1.15 c-exp.y
> > > --- gdb/c-exp.y 20 Sep 2002 00:24:01 -0000      1.15
> > > +++ gdb/c-exp.y 5 Oct 2002 02:49:10 -0000
> > > @@ -50,6 +50,7 @@ Foundation, Inc., 59 Temple Place - Suit
> > >  #include "symfile.h" /* Required by objfiles.h.  */
> > >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> > >  #include "charset.h"
> > > +#include "completer.h"
> > >
> > >  /* Flag indicating we're dealing with HP-compiled objects */
> > >  extern int hp_som_som_object_present;
> > > @@ -1331,7 +1332,9 @@ yylex ()
> > >        c = *lexptr++;
> > >        if (c != '\'')
> > >         {
> > > -         namelen = skip_quoted (tokstart) - tokstart;
> > > +         namelen = skip_quoted (tokstart,
> > > +                                get_gdb_completer_word_break_characters())
> > > +           - tokstart;
> > >           if (namelen > 2)
> > >             {
> > >               lexptr = tokstart + namelen;
> > > Index: gdb/completer.c
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/completer.c,v
> > > retrieving revision 1.11
> > > diff -u -p -r1.11 completer.c
> > > --- gdb/completer.c     24 Mar 2002 00:40:35 -0000      1.11
> > > +++ gdb/completer.c     5 Oct 2002 02:49:11 -0000
> > > @@ -683,7 +683,7 @@ line_completion_function (char *text, in
> > >     location after the "word". */
> > >
> > >  char *
> > > -skip_quoted (char *str)
> > > +skip_quoted (char *str, char *breakchars)
> > >  {
> > >    char quote_char = '\0';
> > >    char *scan;
> > > @@ -705,7 +705,7 @@ skip_quoted (char *str)
> > >           /* Found start of a quoted string. */
> > >           quote_char = *scan;
> > >         }
> > > -      else if (strchr (gdb_completer_word_break_characters, *scan))
> > > +      else if (strchr (breakchars, *scan))
> > >         {
> > >           break;
> > >         }
> > > Index: gdb/completer.h
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/completer.h,v
> > > retrieving revision 1.6
> > > diff -u -p -r1.6 completer.h
> > > --- gdb/completer.h     18 Feb 2002 01:12:38 -0000      1.6
> > > +++ gdb/completer.h     5 Oct 2002 02:49:11 -0000
> > > @@ -39,6 +39,6 @@ extern char *get_gdb_completer_quote_cha
> > >
> > >  /* Exported to linespec.c */
> > >
> > > -extern char *skip_quoted (char *str);
> > > +extern char *skip_quoted (char *str, char *);
> > >
> > >  #endif /* defined (COMPLETER_H) */
> > > Index: gdb/defs.h
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/defs.h,v
> > > retrieving revision 1.99
> > > diff -u -p -r1.99 defs.h
> > > --- gdb/defs.h  27 Sep 2002 22:08:51 -0000      1.99
> > > +++ gdb/defs.h  5 Oct 2002 02:49:13 -0000
> > > @@ -532,8 +532,6 @@ extern void print_transfer_performance (
> > >
> > >  typedef void initialize_file_ftype (void);
> > >
> > > -extern char *skip_quoted (char *);
> > > -
> > >  extern char *gdb_readline (char *);
> > >
> > >  extern char *gdb_readline_wrapper (char *);
> > > Index: gdb/jv-exp.y
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/jv-exp.y,v
> > > retrieving revision 1.11
> > > diff -u -p -r1.11 jv-exp.y
> > > --- gdb/jv-exp.y        19 Sep 2002 03:58:41 -0000      1.11
> > > +++ gdb/jv-exp.y        5 Oct 2002 02:49:14 -0000
> > > @@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suit
> > >  #include "bfd.h" /* Required by objfiles.h.  */
> > >  #include "symfile.h" /* Required by objfiles.h.  */
> > >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> > > +#include "completer.h"
> > >
> > >  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
> > >     as well as gratuitiously global symbol names, so we can have multiple
> > > @@ -918,7 +919,9 @@ yylex ()
> > >        c = *lexptr++;
> > >        if (c != '\'')
> > >         {
> > > -         namelen = skip_quoted (tokstart) - tokstart;
> > > +         namelen = skip_quoted (tokstart,
> > > +                                get_gdb_completer_word_break_characters())
> > > +           - tokstart;
> > >           if (namelen > 2)
> > >             {
> > >               lexptr = tokstart + namelen;
> > > Index: gdb/linespec.c
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/linespec.c,v
> > > retrieving revision 1.23
> > > diff -u -p -r1.23 linespec.c
> > > --- gdb/linespec.c      22 Sep 2002 22:18:41 -0000      1.23
> > > +++ gdb/linespec.c      5 Oct 2002 02:49:14 -0000
> > > @@ -761,7 +761,8 @@ decode_line_1 (char **argptr, int funfir
> > >                       && strchr (get_gdb_completer_quote_characters (),
> > >                                  **argptr) != NULL)
> > >                     {
> > > -                     p = skip_quoted (*argptr);
> > > +                     p = skip_quoted (*argptr,
> > > +                                      get_gdb_completer_word_break_characters());
> > >                       *argptr = *argptr + 1;
> > >                     }
> > >                   else
> > > @@ -1094,10 +1095,14 @@ decode_line_1 (char **argptr, int funfir
> > >       Find the next token (everything up to end or next whitespace).  */
> > >
> > >    if (**argptr == '$')         /* May be a convenience variable */
> > > -    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));       /* One or two $ chars possible */
> > > +    {
> > > +      /* One or two $ chars possible */
> > > +      p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1),
> > > +                      get_gdb_completer_word_break_characters());
> > > +    }
> > >    else if (is_quoted)
> > >      {
> > > -      p = skip_quoted (*argptr);
> > > +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
> > >        if (p[-1] != '\'')
> > >         error ("Unmatched single quote.");
> > >      }
> > > @@ -1107,7 +1112,7 @@ decode_line_1 (char **argptr, int funfir
> > >      }
> > >    else
> > >      {
> > > -      p = skip_quoted (*argptr);
> > > +      p = skip_quoted (*argptr, get_gdb_completer_word_break_characters());
> > >      }
> > >
> > >    copy = (char *) alloca (p - *argptr + 1);
> > > Index: gdb/p-exp.y
> > > ===================================================================
> > > RCS file: /cvs/src/src/gdb/p-exp.y,v
> > > retrieving revision 1.15
> > > diff -u -p -r1.15 p-exp.y
> > > --- gdb/p-exp.y 19 Sep 2002 03:58:41 -0000      1.15
> > > +++ gdb/p-exp.y 5 Oct 2002 02:49:15 -0000
> > > @@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suit
> > >  #include "bfd.h" /* Required by objfiles.h.  */
> > >  #include "symfile.h" /* Required by objfiles.h.  */
> > >  #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
> > > +#include "completer.h"
> > >
> > >  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
> > >     as well as gratuitiously global symbol names, so we can have multiple
> > > @@ -1100,8 +1101,10 @@ yylex ()
> > >        c = *lexptr++;
> > >        if (c != '\'')
> > >         {
> > > -         namelen = skip_quoted (tokstart) - tokstart;
> > > -         if (namelen > 2)
> > > +         namelen = skip_quoted (tokstart,
> > > +                                get_gdb_completer_word_break_characters())
> > > +           - tokstart;
> > > +         if (namelen > 2)
> > >             {
> > >               lexptr = tokstart + namelen;
> > >               if (lexptr[-1] != '\'')

Re: [PATCH] Redefine skip_quoted

[Klee Dienes]

In the Apple code, we use skip_quoted to allow for the possibility of 
spaces in Objective-C function names.

I'm actually coming to think that allowing people to break on unquoted 
Objective-C methods was a mistake: it's caused us no end of trouble 
trying to shoehorn decode_line_1() into handling every possible 
edge-case.  I'm not sure how practical it is for us to remove it at 
this point, though --- we'd have to do some research among our 
Objective-C developers to find out how important a feature it is to 
them, I think.

Here's the appropriate diff from our linespec.c:

diff -u -r1.1.1.10 -r1.17
--- linespec.c  2002/09/26 20:57:05     1.1.1.10
+++ linespec.c  2002/09/26 22:19:22     1.17
@@ -1094,10 +1245,15 @@
      }
    else if (is_quoted)
      {
-      p = skip_quoted (*argptr);
+      /* allow word separators in function names for Obj-C */
+      p = skip_quoted (*argptr, "");
        if (p[-1] != '\'')
         error ("Unmatched single quote.");
      }
@@ -1105,9 +1261,10 @@
      }
   else
      {
-      p = skip_quoted (*argptr);
+      /* allow word separators in function names for Obj-C */
+      p = skip_quoted (*argptr, "");
      }

    copy = (char *) alloca (p - *argptr + 1);


On Monday, October 14, 2002, at 04:29 PM, Jim Blandy wrote:

>
> I don't understand the purpose of this patch.
>
> Instead of havingb skip_quoted use gdb_completer_word_break_characters
> directly, it adds an argument to skip_quoted, and then passes the
> return value from get_gdb_completer_word_break_characters () in every
> case.  But the Objective-C case does exactly the same thing as all the
> other cases; it doesn't behave any differently.
>
> Is this some sort of preparatory patch for something else?  What's
> coming down the line?
>
> Michael Snyder <msnyder@redhat.com> writes:
>
>> Adam Fedor wrote:
>>>
>>> Objective-C has a different idea of what word break characters are.
>>> Hence this patch (although the new usage isn't actually apparent in 
>>> this
>>> patch).
>>
>> I think you need Jim or Elena's buy-in for the change in linespec.c,
>> but I'll approve the rest.  Jim, Elena's on vacation -- can you give
>> a quick look at this?
>>
>>>
>>> 2002-10-04  Adam Fedor  <fedor@gnu.org>
>>>
>>>         * Makefile.in (c-exp.tab.o): Add $(completer_h) to 
>>> dependancies.
>>>         (jv-exp.tarb.o): Likewise.
>>>         (p-exp.tab.o): Likewise.
>>>         * completer.c (skip_quoted): Take additional "word break
>>>         characters" argument.
>>>         * completer.h: Update definition of skip_quoted.
>>>         * defs.h (skip_quoted): Delete, declared in completer.h.
>>>         * c-exp.y: Include completer.h.  Update definition of 
>>> skip_quoted.
>>>         * p-exp.y: Likewise.
>>>         * jv-exp.y: Likewise.
>>>         * linespec.c (decode_line_1): Likewise.

Re: [PATCH] Redefine skip_quoted

[Jim Blandy]

Klee Dienes <klee@apple.com> writes:
> In the Apple code, we use skip_quoted to allow for the possibility of
> spaces in Objective-C function names.
> 
> I'm actually coming to think that allowing people to break on unquoted
> Objective-C methods was a mistake: it's caused us no end of trouble
> trying to shoehorn decode_line_1() into handling every possible
> edge-case.  I'm not sure how practical it is for us to remove it at
> this point, though --- we'd have to do some research among our
> Objective-C developers to find out how important a feature it is to
> them, I think.

So, the original patch posted is preparation for a behavior which you
now suspect was a mistake, and which has caused you no end of trouble?
(Or do I have the sense of what you were saying reversed?)  You can
forgive me if hearing that makes me a bit hesitant to approve the
patch, right?  :)

[PATCH] minor nit in read_tilde_fields

[Klee Dienes]

The following patch fixes what I suspect is an "oops" in the 2002-10-11 
patch to stabsread.c:

2002-10-16  Klee Dienes  <kdienes@apple.com>

         * stabsread.c (read_tilde_fields): Use name[sizeof(vptr_name)-2]
         to get the last character of a char[] buffer, not
         name[sizeof(vptr_name)-1].

diff -u -r1.21 stabsread.c
--- stabsread.c 2002/10/12 18:23:58     1.21
+++ stabsread.c 2002/10/16 10:29:05
@@ -4189,7 +4189,7 @@
                 {
                   char *name = TYPE_FIELD_NAME (t, i);
                   if (!strncmp (name, vptr_name, sizeof (vptr_name) - 2)
-                     && is_cplus_marker (name[sizeof (vptr_name) - 1]))
+                     && is_cplus_marker (name[sizeof (vptr_name) - 2]))
                     {
                       TYPE_VPTR_FIELDNO (type) = i;
                       goto gotit;

Re: [PATCH] minor nit in read_tilde_fields

[Daniel Jacobowitz]

You're right, please commit this.  Not sure how this didn't show up in
my testing...

On Wed, Oct 16, 2002 at 06:29:16AM -0400, Klee Dienes wrote:
> The following patch fixes what I suspect is an "oops" in the 2002-10-11 
> patch to stabsread.c:
> 
> 2002-10-16  Klee Dienes  <kdienes@apple.com>
> 
>         * stabsread.c (read_tilde_fields): Use name[sizeof(vptr_name)-2]
>         to get the last character of a char[] buffer, not
>         name[sizeof(vptr_name)-1].
> 
> diff -u -r1.21 stabsread.c
> --- stabsread.c 2002/10/12 18:23:58     1.21
> +++ stabsread.c 2002/10/16 10:29:05
> @@ -4189,7 +4189,7 @@
>                 {
>                   char *name = TYPE_FIELD_NAME (t, i);
>                   if (!strncmp (name, vptr_name, sizeof (vptr_name) - 2)
> -                     && is_cplus_marker (name[sizeof (vptr_name) - 1]))
> +                     && is_cplus_marker (name[sizeof (vptr_name) - 2]))
>                     {
>                       TYPE_VPTR_FIELDNO (type) = i;
>                       goto gotit;
> 
> 

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

Re: [PATCH] Redefine skip_quoted

[Adam Fedor]

Jim Blandy wrote:
> Klee Dienes <klee@apple.com> writes:
> 
>>In the Apple code, we use skip_quoted to allow for the possibility of
>>spaces in Objective-C function names.
>>
>>I'm actually coming to think that allowing people to break on unquoted
>>Objective-C methods was a mistake: it's caused us no end of trouble
>>trying to shoehorn decode_line_1() into handling every possible
>>edge-case.  I'm not sure how practical it is for us to remove it at
>>this point, though --- we'd have to do some research among our
>>Objective-C developers to find out how important a feature it is to
>>them, I think.
> 
> 
> So, the original patch posted is preparation for a behavior which you
> now suspect was a mistake, and which has caused you no end of trouble?
> (Or do I have the sense of what you were saying reversed?)  You can
> forgive me if hearing that makes me a bit hesitant to approve the
> patch, right?  :)
> 

Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
submitted yet), really has more to do with handling the canonical form 
of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
comes from objc-lang.c. Most of the breakpoint cases that a user would 
enter are handled elsewhere (in a patch that I also haven't submitted).

I'd have to look more closely at how the canonical form is generated 
(really, demangled) to see if the gdb machinery could handle having 
quotes around the symbol. I don't know if that would cause other problems.


-- 
Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
http://www.doc.com                    | if I didn't, I'd eat it, and you
                                       | know how I hate the stuff.

Re: [PATCH] Redefine skip_quoted

[Elena Zannoni]

Adam Fedor writes:
 > Jim Blandy wrote:
 > > Klee Dienes <klee@apple.com> writes:
 > > 
 > >>In the Apple code, we use skip_quoted to allow for the possibility of
 > >>spaces in Objective-C function names.
 > >>
 > >>I'm actually coming to think that allowing people to break on unquoted
 > >>Objective-C methods was a mistake: it's caused us no end of trouble
 > >>trying to shoehorn decode_line_1() into handling every possible
 > >>edge-case.  I'm not sure how practical it is for us to remove it at
 > >>this point, though --- we'd have to do some research among our
 > >>Objective-C developers to find out how important a feature it is to
 > >>them, I think.
 > > 
 > > 
 > > So, the original patch posted is preparation for a behavior which you
 > > now suspect was a mistake, and which has caused you no end of trouble?
 > > (Or do I have the sense of what you were saying reversed?)  You can
 > > forgive me if hearing that makes me a bit hesitant to approve the
 > > patch, right?  :)
 > > 
 > 
 > Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
 > submitted yet), really has more to do with handling the canonical form 
 > of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
 > comes from objc-lang.c. Most of the breakpoint cases that a user would 
 > enter are handled elsewhere (in a patch that I also haven't submitted).
 > 

I have to agree with Jim here, I think we should wait on the parts you
haven't submitted before deciding on this one. Could you just have
added the chars you need to the gdb_completer_word_break_characters
variable?

Elena


 > I'd have to look more closely at how the canonical form is generated 
 > (really, demangled) to see if the gdb machinery could handle having 
 > quotes around the symbol. I don't know if that would cause other problems.
 > 
 > 
 > -- 
 > Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
 > http://www.doc.com                    | if I didn't, I'd eat it, and you
 >                                        | know how I hate the stuff.

Re: [PATCH] Redefine skip_quoted

[Adam Fedor]

Elena Zannoni wrote:
> Adam Fedor writes:
>  > Jim Blandy wrote:
>  > > Klee Dienes <klee@apple.com> writes:
>  > > 
>  > >>In the Apple code, we use skip_quoted to allow for the possibility of
>  > >>spaces in Objective-C function names.
>  > >>
>  > >>I'm actually coming to think that allowing people to break on unquoted
>  > >>Objective-C methods was a mistake: it's caused us no end of trouble
>  > >>trying to shoehorn decode_line_1() into handling every possible
>  > >>edge-case.  I'm not sure how practical it is for us to remove it at
>  > >>this point, though --- we'd have to do some research among our
>  > >>Objective-C developers to find out how important a feature it is to
>  > >>them, I think.
>  > > 
>  > > 
>  > > So, the original patch posted is preparation for a behavior which you
>  > > now suspect was a mistake, and which has caused you no end of trouble?
>  > > (Or do I have the sense of what you were saying reversed?)  You can
>  > > forgive me if hearing that makes me a bit hesitant to approve the
>  > > patch, right?  :)
>  > > 
>  > 
>  > Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
>  > submitted yet), really has more to do with handling the canonical form 
>  > of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
>  > comes from objc-lang.c. Most of the breakpoint cases that a user would 
>  > enter are handled elsewhere (in a patch that I also haven't submitted).
>  > 
> 
> I have to agree with Jim here, I think we should wait on the parts you
> haven't submitted before deciding on this one. Could you just have
> added the chars you need to the gdb_completer_word_break_characters
> variable?
> 

No. It involves removing characters. Another option would be to define a 
new function, say skip_objc_quoted, just for objc which would be similar 
to skip_quoted. How about that?


-- 
Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
http://www.doc.com                    | if I didn't, I'd eat it, and you
                                       | know how I hate the stuff.

Re: [PATCH] Redefine skip_quoted

[Elena Zannoni]

Adam Fedor writes:
 > Elena Zannoni wrote:
 > > Adam Fedor writes:
 > >  > Jim Blandy wrote:
 > >  > > Klee Dienes <klee@apple.com> writes:
 > >  > > 
 > >  > >>In the Apple code, we use skip_quoted to allow for the possibility of
 > >  > >>spaces in Objective-C function names.
 > >  > >>
 > >  > >>I'm actually coming to think that allowing people to break on unquoted
 > >  > >>Objective-C methods was a mistake: it's caused us no end of trouble
 > >  > >>trying to shoehorn decode_line_1() into handling every possible
 > >  > >>edge-case.  I'm not sure how practical it is for us to remove it at
 > >  > >>this point, though --- we'd have to do some research among our
 > >  > >>Objective-C developers to find out how important a feature it is to
 > >  > >>them, I think.
 > >  > > 
 > >  > > 
 > >  > > So, the original patch posted is preparation for a behavior which you
 > >  > > now suspect was a mistake, and which has caused you no end of trouble?
 > >  > > (Or do I have the sense of what you were saying reversed?)  You can
 > >  > > forgive me if hearing that makes me a bit hesitant to approve the
 > >  > > patch, right?  :)
 > >  > > 
 > >  > 
 > >  > Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
 > >  > submitted yet), really has more to do with handling the canonical form 
 > >  > of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
 > >  > comes from objc-lang.c. Most of the breakpoint cases that a user would 
 > >  > enter are handled elsewhere (in a patch that I also haven't submitted).
 > >  > 
 > > 
 > > I have to agree with Jim here, I think we should wait on the parts you
 > > haven't submitted before deciding on this one. Could you just have
 > > added the chars you need to the gdb_completer_word_break_characters
 > > variable?
 > > 
 > 
 > No. It involves removing characters. Another option would be to define a 
 > new function, say skip_objc_quoted, just for objc which would be similar 
 > to skip_quoted. How about that?

Hmmm,...
I think the best approach would be to continue what you started, then,
and define another set (sonething like
gdb_objc_completer_word_break_characters), and have the
get_... function return the correct one based on the current
language. Is that what you were going to do?

Elena


 > 
 > 
 > -- 
 > Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
 > http://www.doc.com                    | if I didn't, I'd eat it, and you
 >                                        | know how I hate the stuff.

Re: [PATCH] Redefine skip_quoted

[Adam Fedor]

Elena Zannoni wrote:
> Adam Fedor writes:
>  > Elena Zannoni wrote:
>  > > Adam Fedor writes:
>  > >  > Jim Blandy wrote:
>  > >  > > Klee Dienes <klee@apple.com> writes:
>  > >  > > 
>  > >  > >>In the Apple code, we use skip_quoted to allow for the possibility of
>  > >  > >>spaces in Objective-C function names.
>  > >  > >>
>  > >  > >>I'm actually coming to think that allowing people to break on unquoted
>  > >  > >>Objective-C methods was a mistake: it's caused us no end of trouble
>  > >  > >>trying to shoehorn decode_line_1() into handling every possible
>  > >  > >>edge-case.  I'm not sure how practical it is for us to remove it at
>  > >  > >>this point, though --- we'd have to do some research among our
>  > >  > >>Objective-C developers to find out how important a feature it is to
>  > >  > >>them, I think.
>  > >  > > 
>  > >  > > 
>  > >  > > So, the original patch posted is preparation for a behavior which you
>  > >  > > now suspect was a mistake, and which has caused you no end of trouble?
>  > >  > > (Or do I have the sense of what you were saying reversed?)  You can
>  > >  > > forgive me if hearing that makes me a bit hesitant to approve the
>  > >  > > patch, right?  :)
>  > >  > > 
>  > >  > 
>  > >  > Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
>  > >  > submitted yet), really has more to do with handling the canonical form 
>  > >  > of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
>  > >  > comes from objc-lang.c. Most of the breakpoint cases that a user would 
>  > >  > enter are handled elsewhere (in a patch that I also haven't submitted).
>  > >  > 
>  > > 
>  > > I have to agree with Jim here, I think we should wait on the parts you
>  > > haven't submitted before deciding on this one. Could you just have
>  > > added the chars you need to the gdb_completer_word_break_characters
>  > > variable?
>  > > 
>  > 
>  > No. It involves removing characters. Another option would be to define a 
>  > new function, say skip_objc_quoted, just for objc which would be similar 
>  > to skip_quoted. How about that?
> 
> Hmmm,...
> I think the best approach would be to continue what you started, then,
> and define another set (sonething like
> gdb_objc_completer_word_break_characters), and have the
> get_... function return the correct one based on the current
> language. Is that what you were going to do?
> 

That wasn't my intention, but I could look at that. However, I don't 
know if there is a global variable that holds the current language, is 
there? If it involved adding another paramter to skip_quoted, then that 
goes back to the original complaint that it involves changing the usage 
of skip_quoted in a bunch of places (I think?).

I'm sure it would nice for everyone to see how this works (in fact you 
can, by looking at the (now outdated) original patch at 
ftp://ftp.gnustep.org/pub/gnustep/contrib/gdb-objc-patch.tar.gz). But 
submitting an  everything-becomes-clear patch goes against Andrew's 
original suggestion of breaking the patch up into pieces.



-- 
Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
http://www.doc.com                    | if I didn't, I'd eat it, and you
                                       | know how I hate the stuff.

Re: [PATCH] Redefine skip_quoted

[Elena Zannoni]

Adam Fedor writes:
 > Elena Zannoni wrote:
 > > Adam Fedor writes:
 > >  > Elena Zannoni wrote:
 > >  > > Adam Fedor writes:
 > >  > >  > Jim Blandy wrote:
 > >  > >  > > Klee Dienes <klee@apple.com> writes:
 > >  > >  > > 
 > >  > >  > >>In the Apple code, we use skip_quoted to allow for the possibility of
 > >  > >  > >>spaces in Objective-C function names.
 > >  > >  > >>
 > >  > >  > >>I'm actually coming to think that allowing people to break on unquoted
 > >  > >  > >>Objective-C methods was a mistake: it's caused us no end of trouble
 > >  > >  > >>trying to shoehorn decode_line_1() into handling every possible
 > >  > >  > >>edge-case.  I'm not sure how practical it is for us to remove it at
 > >  > >  > >>this point, though --- we'd have to do some research among our
 > >  > >  > >>Objective-C developers to find out how important a feature it is to
 > >  > >  > >>them, I think.
 > >  > >  > > 
 > >  > >  > > 
 > >  > >  > > So, the original patch posted is preparation for a behavior which you
 > >  > >  > > now suspect was a mistake, and which has caused you no end of trouble?
 > >  > >  > > (Or do I have the sense of what you were saying reversed?)  You can
 > >  > >  > > forgive me if hearing that makes me a bit hesitant to approve the
 > >  > >  > > patch, right?  :)
 > >  > >  > > 
 > >  > >  > 
 > >  > >  > Well, really the use of skip_quoted for ObjC (in a patch that I haven't 
 > >  > >  > submitted yet), really has more to do with handling the canonical form 
 > >  > >  > of an Objective-C method symbol (e.g. -[MyObject myMethod:arg2:]) that 
 > >  > >  > comes from objc-lang.c. Most of the breakpoint cases that a user would 
 > >  > >  > enter are handled elsewhere (in a patch that I also haven't submitted).
 > >  > >  > 
 > >  > > 
 > >  > > I have to agree with Jim here, I think we should wait on the parts you
 > >  > > haven't submitted before deciding on this one. Could you just have
 > >  > > added the chars you need to the gdb_completer_word_break_characters
 > >  > > variable?
 > >  > > 
 > >  > 
 > >  > No. It involves removing characters. Another option would be to define a 
 > >  > new function, say skip_objc_quoted, just for objc which would be similar 
 > >  > to skip_quoted. How about that?
 > > 
 > > Hmmm,...
 > > I think the best approach would be to continue what you started, then,
 > > and define another set (sonething like
 > > gdb_objc_completer_word_break_characters), and have the
 > > get_... function return the correct one based on the current
 > > language. Is that what you were going to do?
 > > 
 > 
 > That wasn't my intention, but I could look at that. However, I don't 
 > know if there is a global variable that holds the current language, is 
 > there? If it involved adding another paramter to skip_quoted, then that 
 > goes back to the original complaint that it involves changing the usage 
 > of skip_quoted in a bunch of places (I think?).
 > 

current_language->la_language, maybe? but it could be set to language_auto,
so it doesn't seem too useful...

 > I'm sure it would nice for everyone to see how this works (in fact you 
 > can, by looking at the (now outdated) original patch at 
 > ftp://ftp.gnustep.org/pub/gnustep/contrib/gdb-objc-patch.tar.gz). But 
 > submitting an  everything-becomes-clear patch goes against Andrew's 
 > original suggestion of breaking the patch up into pieces.
 > 

I think that it would actually be beneficial to post a list of patches
that are still pending. I am getting a bit confused about the status
of objective C, given that everything was under the same mail subject.
That would help.

Thanks
Elena


 > 
 > 
 > -- 
 > Adam Fedor, Digital Optics Corp.      | I'm glad I hate spinach, because
 > http://www.doc.com                    | if I didn't, I'd eat it, and you
 >                                        | know how I hate the stuff.

GDB ObjC plan (was: Re: [PATCH] Redefine skip_quoted)

[Adam Fedor]

Elena Zannoni wrote:
> 
> I think that it would actually be beneficial to post a list of patches
> that are still pending. I am getting a bit confused about the status
> of objective C, given that everything was under the same mail subject.
> That would help.
> 
> 
OK, here's my plan.  None of the patches under the original
Objective-C language mail subject remain.  Listed below are the
subject lines of the current patches that have been submitted and my
plan for future submissions.


Patches waiting approval:
------------------------

1. Add rules for ObjC files
2. Rename ObjC ops (Andrew requested this one).
3. Handle ObjC ops in expprint.c
4. Add ObjC struct to parser-defs.h
5. Redefine skip_quoted.

Future Patches (in rough order):
--------------------------

6. maint.c (maintenance_demangle): Demangle ObjC names.
7. Change puts_filtered_tabular to fputs_filtered_tabular (Requested).

8. Enable compilation of objc-lang.c

9. infrun.c (handle_inferior_event): Step into ObjC method call.
10. symtab.c (symbol_init_demangled_name): Demangle ObjC symbols.
11. eval.c (evaluate_subexp_standard): Handle new ObjC ops.
12. linespec.c (decode_line_1): Decode ObjC method symbols.
13. Add ObjC testsuite
14. Add ObjC documentation to gdb.texinfo

That's all!

Re: [PATCH] Redefine skip_quoted

[Jim Blandy]

Adam Fedor <fedor@doc.com> writes:
> >  > >  >  > Well, really the use of skip_quoted for ObjC (in a patch
> > that I haven't  > submitted yet), really has more to do with
> > handling the canonical form  > of an Objective-C method symbol
> > (e.g. -[MyObject myMethod:arg2:]) that  > comes from
> > objc-lang.c. Most of the breakpoint cases that a user would  > enter
> > are handled elsewhere (in a patch that I also haven't submitted).
> >  > I have to agree with Jim here, I think we should wait on the
> > parts you
> > haven't submitted before deciding on this one. Could you just have
> > added the chars you need to the gdb_completer_word_break_characters
> > variable?
> 
> No. It involves removing characters. Another option would be to define
> a new function, say skip_objc_quoted, just for objc which would be
> similar to skip_quoted. How about that?

So, the change would become local to the Objective-C code, right?  If
it doesn't hurt the functionality you're trying to provide, that
certainly sounds better to me, at least.

RE: [PATCH] Redefine skip_quoted

[Adam Fedor]

> From: Klee Dienes [mailto:klee@apple.com]
> 
> In the Apple code, we use skip_quoted to allow for the possibility of 
> spaces in Objective-C function names.
> 
> I'm actually coming to think that allowing people to break on 
> unquoted 
> Objective-C methods was a mistake: it's caused us no end of trouble 
> trying to shoehorn decode_line_1() into handling every possible 
> edge-case.  I'm not sure how practical it is for us to remove it at 
> this point, though --- we'd have to do some research among our 
> Objective-C developers to find out how important a feature it is to 
> them, I think.
> 
> Here's the appropriate diff from our linespec.c:
>
In the patch I made also, the only place this change is used is in decode_line_1. I must say that 99% of the problems I had getting Objective-C to work in gdb on multiple platforms was in this function. It's a nightmare, at least for Objective-C method names.