OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* linespec.c (is_objc_method_format): New function 

(decode_line_1, locate_first_half): Use it.
Fixes PR objc/1298
This commit is contained in:
Adam Fedor 2003-08-02 03:59:40 +00:00
parent 87505968d5
commit 889f28e262
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2003-08-02 Adam Fedor <fedor@gnu.org>
* linespec.c (is_objc_method_format): New function
(decode_line_1, locate_first_half): Use it.
Fixes PR objc/1298
2003-08-01 Andrew Cagney <cagney@redhat.com>
* NEWS: Mention that m32r is multi-arch.

27
gdb/linespec.c
View File

@ -94,6 +94,8 @@ static void build_canonical_line_spec (struct symtab_and_line *,
static char *find_toplevel_char (char *s, char c);
static int is_objc_method_format (const char *s);
static struct symtabs_and_lines decode_line_2 (struct symbol *[],
int, int, char ***);
@ -443,6 +445,25 @@ find_toplevel_char (char *s, char c)
return 0;
}
/* Determines if the gives string corresponds to an Objective-C method
representation, such as -[Foo bar:] or +[Foo bar]. Objective-C symbols
are allowed to have spaces and parentheses in them. */
static int
is_objc_method_format (const char *s)
{
if (s == NULL || *s == '\0')
return 0;
/* Handle arguments with the format FILENAME:SYMBOL. */
if ((s[0] == ':') && (strchr ("+-", s[1]) != NULL)
&& (s[2] == '[') && strchr(s, ']'))
return 1;
/* Handle arguments that are just SYMBOL. */
else if ((strchr ("+-", s[0]) != NULL) && (s[1] == '[') && strchr(s, ']'))
return 1;
return 0;
}
/* Given a list of NELTS symbols in SYM_ARR, return a list of lines to
operate on (ask user if necessary).
If CANONICAL is non-NULL return a corresponding array of mangled names
@ -669,8 +690,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
/* Check if this is an Objective-C method (anything that starts with
a '+' or '-' and a '['). */
if (*p && (p[0] == ':') && (strchr ("+-", p[1]) != NULL)
&& (p[2] == '['))
if (is_objc_method_format (p))
{
is_objc_method = 1;
paren_pointer = NULL; /* Just a category name. Ignore it. */
@ -972,8 +992,7 @@ locate_first_half (char **argptr, int *is_quote_enclosed)
}
/* Check for a colon and a plus or minus and a [ (which
indicates an Objective-C method) */
if (*p && (p[0] == ':') && (strchr ("+-", p[1]) != NULL)
&& (p[2] == '['))
if (is_objc_method_format (p))
{
break;
}