Re: [PATCH] Objective-C language support.

Adam Fedor
2002-10-15T03:09:31Z

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

Jim Blandy wrote:
> The function stabsread_objc_colon should be static to stabsread.c, no?
> If that's so, then it should be renamed to something like
> `find_name_end', with a comment above the strchr ('[') != 0 case
> explaining its relevance to Objective-C. Since this function gets
> called on every symbol, it's not an Objective-C specific function;
> only part of it is.
>
> The code needs a comment. Most of GDB's maintainers don't know
> Objective-C, so it would be helpful just to say something like,
> "Objective-C symbols can have names like -[foo:bar:baz]:skun

Updated patch:

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

* stabsread.c (find_name_end): New function.
(define_symbol): Use it.

--
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.

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

Index: stabsread.c
===================================================================
RCS file: /cvs/src/src/gdb/stabsread.c,v
retrieving revision 1.42
diff -u -p -r1.42 stabsread.c
--- stabsread.c 11 Oct 2002 14:02:38 -0000 1.42
+++ stabsread.c 15 Oct 2002 03:06:03 -0000
@@ -169,6 +169,8 @@ static int
read_cfront_member_functions (struct field_info *, char **,
struct type *, struct objfile *);

+static char *find_name_end (char *name);
+
/* end new functions added for cfront support */

static void
@@ -1271,7 +1273,7 @@ define_symbol (CORE_ADDR valu, char *str
struct objfile *objfile)
{
register struct symbol *sym;
- char *p = (char *) strchr (string, ':');
+ char *p = (char *) find_name_end (string);
int deftype;
int synonym = 0;
register int i;
@@ -2004,7 +2006,8 @@ define_symbol (CORE_ADDR valu, char *str
a typedef for "foo". Unfortunately, cfront never makes the typedef
when translating C++ into C. We make the typedef here so that
"ptype foo" works as expected for cfront translated code. */
- else if (current_subfile->language == language_cplus)
+ else if ((current_subfile->language == language_cplus)
+ || (current_subfile->language == language_objc))
synonym = 1;

SYMBOL_TYPE (sym) = read_type (&p, objfile);
@@ -5613,6 +5616,32 @@ finish_global_stabs (struct objfile *obj
patch_block_stabs (global_symbols, global_stabs, objfile);
xfree (global_stabs);
global_stabs = NULL;
+ }
+}
+
+static char *
+find_name_end (char *name)
+{
+ char *s = name;
+ /* Find the end of the name, deliminated by a ':', but don't match
+ ObjC symbols which look like -[Foo bar::]:bla. */
+ if (s[0] == '-' || *s == '+')
+ {
+ /* Must be an ObjC method symbol. */
+ if (s[1] != '[')
+ {
+ error ("invalid symbol name \"%s\"", name);
+ }
+ s = strchr (s, ']');
+ if (s == NULL)
+ {
+ error ("invalid symbol name \"%s\"", name);
+ }
+ return strchr (s, ':');
+ }
+ else
+ {
+ return strchr (s, ':');
}
}