From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8905 invoked by alias); 20 Nov 2002 09:12:43 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 8896 invoked from network); 20 Nov 2002 09:12:40 -0000 Received: from unknown (HELO dc-mx12.cluster1.charter.net) (209.225.8.22) by sources.redhat.com with SMTP; 20 Nov 2002 09:12:40 -0000 Received: from [66.189.46.2] (HELO platinum.local.) by dc-mx12.cluster1.charter.net (CommuniGate Pro SMTP 3.5.9) with ESMTP id 44724238; Wed, 20 Nov 2002 04:12:39 -0500 Date: Wed, 20 Nov 2002 01:12:00 -0000 Subject: Re: [PATCH] skip_quoted (updated) Content-Type: multipart/mixed; boundary=Apple-Mail-2--653183026 Mime-Version: 1.0 (Apple Message framework v543) Cc: Adam Fedor , gdb-patches@sources.redhat.com To: Jim Blandy From: Klee Dienes In-Reply-To: Message-Id: <376FEADE-FC68-11D6-B722-00039396EEB8@apple.com> X-SW-Source: 2002-11/txt/msg00503.txt.bz2 --Apple-Mail-2--653183026 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Content-length: 20 Committed; thanks. --Apple-Mail-2--653183026 Content-Disposition: attachment; filename=skip-quoted.txt Content-Transfer-Encoding: 7bit Content-Type: text/plain; x-unix-mode=0644; name="skip-quoted.txt" Content-length: 2868 2002-11-19 Klee Dienes Adam Fedor * completer.c (skip_quoted_chars): Renamed from skip_chars. Add the ability to explicitly specify the quote characters and word break characters; if NULL is specified for either, use the old behavior of using the characters used by the completer. (skip_chars): New function. Convenience wrapper around skip_quoted_chars to provide the original skip_chars behavior. * completer.h (skip_quoted_chars): Add prototype. Index: completer.c =================================================================== RCS file: /cvs/src/src/gdb/completer.c,v retrieving revision 1.11 diff -u -r1.11 completer.c --- completer.c 24 Mar 2002 00:40:35 -0000 1.11 +++ completer.c 20 Nov 2002 08:52:45 -0000 @@ -678,16 +678,25 @@ return (output); } -/* Skip over a possibly quoted word (as defined by the quote characters - and word break characters the completer uses). Returns pointer to the - location after the "word". */ + +/* Skip over the possibly quoted word STR (as defined by the quote + characters QUOTECHARS and the the word break characters + BREAKCHARS). Returns pointer to the location after the "word". If + either QUOTECHARS or BREAKCHARS is NULL, use the same values used + by the completer. */ char * -skip_quoted (char *str) +skip_quoted_chars (char *str, char *quotechars, char *breakchars) { char quote_char = '\0'; char *scan; + if (quotechars == NULL) + quotechars = gdb_completer_quote_characters; + + if (breakchars == NULL) + breakchars = gdb_completer_word_break_characters; + for (scan = str; *scan != '\0'; scan++) { if (quote_char != '\0') @@ -700,16 +709,26 @@ break; } } - else if (strchr (gdb_completer_quote_characters, *scan)) + else if (strchr (quotechars, *scan)) { /* Found start of a quoted string. */ quote_char = *scan; } - else if (strchr (gdb_completer_word_break_characters, *scan)) + else if (strchr (breakchars, *scan)) { break; } } + return (scan); } +/* Skip over the possibly quoted word STR (as defined by the quote + characters and word break characters used by the completer). + Returns pointer to the location after the "word". */ + +char * +skip_quoted (char *str) +{ + return skip_quoted_chars (str, NULL, NULL); +} Index: completer.h =================================================================== RCS file: /cvs/src/src/gdb/completer.h,v retrieving revision 1.6 diff -u -r1.6 completer.h --- completer.h 18 Feb 2002 01:12:38 -0000 1.6 +++ completer.h 20 Nov 2002 08:52:45 -0000 @@ -39,6 +39,8 @@ /* Exported to linespec.c */ -extern char *skip_quoted (char *str); +extern char *skip_quoted_chars (char *, char *, char *); + +extern char *skip_quoted (char *); #endif /* defined (COMPLETER_H) */ --Apple-Mail-2--653183026 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Content-length: 529 On Monday, November 18, 2002, at 09:22 PM, Jim Blandy wrote: > > Klee, your patch looks good. Adam, does it do what you need? If it > does, Klee can go ahead and commit it. (With a ChangeLog entry, and a > comment atop the function, of course.) > > Klee Dienes writes: > >> It must be a good name for the function, because we picked the same >> one at Apple. >> >> You might also consider using our patch, which has the advantage of >> not replicating the code between skip_quoted and skip_quoted_chars: > --Apple-Mail-2--653183026--