OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gjavah.c (add_namelet): Check for standard package names here. 

* gjavah.c (add_namelet): Check for standard package names here.
	(add_class_decl): Don't check for standard package names here.

From-SVN: r25456
This commit is contained in:
Tom Tromey 1999-02-26 11:33:53 +00:00 committed by Tom Tromey
parent 7c11f9d50f
commit f3d50f4227
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
1999-02-26 Tom Tromey <tromey@cygnus.com>
* gjavah.c (add_namelet): Check for standard package names here.
(add_class_decl): Don't check for standard package names here.
1999-02-25 Tom Tromey <tromey@cygnus.com>
* parse.y (read_import_dir): Use `|=', not `+=', to set `found'.

31
gcc/java/gjavah.c
View File

@ -865,6 +865,23 @@ add_namelet (name, name_limit, parent)
unsigned char *p;
struct namelet *n = NULL, *np;
/* We want to skip the standard namespaces that we assume the
runtime already knows about. We only do this at the top level,
though, hence the check for `root'. */
if (parent == &root)
{
#define JAVALANG "java/lang/"
#define JAVAIO "java/io/"
#define JAVAUTIL "java/util/"
if ((name_limit - name >= sizeof (JAVALANG) - 1
&& ! strncmp (name, JAVALANG, sizeof (JAVALANG) - 1))
|| (name_limit - name >= sizeof (JAVAUTIL) - 1
&& ! strncmp (name, JAVAUTIL, sizeof (JAVAUTIL) - 1))
|| (name_limit - name >= sizeof (JAVAIO) - 1
&& ! strncmp (name, JAVAIO, sizeof (JAVAIO) - 1)))
return;
}
for (p = name; p < name_limit && *p != '/' && *p != '$'; ++p)
;
@ -978,20 +995,6 @@ add_class_decl (out, jcf, signature)
}
}
#define JAVALANG "java/lang/"
#define JAVAIO "java/io/"
#define JAVAUTIL "java/util/"
if ((i - start >= sizeof (JAVALANG) - 1
&& ! strncmp (&s[start], JAVALANG, sizeof (JAVALANG) - 1))
|| (i - start >= sizeof (JAVAUTIL) - 1
&& ! strncmp (&s[start], JAVAUTIL, sizeof (JAVAUTIL) - 1))
|| (i - start >= sizeof (JAVAIO) - 1
&& ! strncmp (&s[start], JAVAIO, sizeof (JAVAIO) - 1)))
{
/* Skip all the standard `java.' classes. */
continue;
}
add_namelet (&s[start], &s[i], &root);
}
}