diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-09 17:56:37 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-09 17:56:37 +0000 |
| commit | 4ccf2a8fa8856d140557692bf986757e72cac00d (patch) | |
| tree | b2e6d968b57914b1172d96a3e996ef9f4ac49b52 | |
| parent | 1f170a8e4b16467f06101b982edf5ad1517dd7ef (diff) | |
| download | ppe42-gcc-4ccf2a8fa8856d140557692bf986757e72cac00d.tar.gz ppe42-gcc-4ccf2a8fa8856d140557692bf986757e72cac00d.zip | |
2002-09-09 Ranjit Mathew <rmathew@hotmail.com>
* parse.y (DIR_SEPARATOR): Don't define.
(check_class_interface_creation): Use IS_DIR_SEPARATOR.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56973 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2eb6a9d2d92..b95e8aec40b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2002-09-09 Ranjit Mathew <rmathew@hotmail.com> + + * parse.y (DIR_SEPARATOR): Don't define. + (check_class_interface_creation): Use IS_DIR_SEPARATOR. + 2002-08-28 Andrew Haley <aph@redhat.com> * verify.c (verify_jvm_instructions): Allow exception handler diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 30a2dce28ac..aa593f9f072 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -69,10 +69,6 @@ definitions and other extensions. */ #include "debug.h" #include "tree-inline.h" -#ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' -#endif - /* Local function prototypes */ static char *java_accstring_lookup PARAMS ((int)); static void classitf_redefinition_error PARAMS ((const char *,tree, tree, tree)); @@ -3449,12 +3445,11 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d { const char *f; - /* Contains OS dependent assumption on path separator. FIXME */ for (f = &input_filename [strlen (input_filename)]; - f != input_filename && f[0] != '/' && f[0] != DIR_SEPARATOR; + f != input_filename && ! IS_DIR_SEPARATOR (f[0]); f--) ; - if (f[0] == '/' || f[0] == DIR_SEPARATOR) + if (IS_DIR_SEPARATOR (f[0])) f++; if (strncmp (IDENTIFIER_POINTER (raw_name), f , IDENTIFIER_LENGTH (raw_name)) || @@ -12916,7 +12911,7 @@ try_builtin_assignconv (wfl_op1, lhs_type, rhs) /* Try a narrowing primitive conversion (5.1.3): - expression is a constant expression of type byte, short, char, - or int, AND + or int, AND - variable is byte, short or char AND - The value of the expression is representable in the type of the variable */ |
