From f724acb8aa16d01f998e27bc1822a3f8981a82ff Mon Sep 17 00:00:00 2001 From: Ranjit Mathew Date: Mon, 9 Sep 2002 17:56:37 +0000 Subject: parse.y (DIR_SEPARATOR): Don't define. 2002-09-09 Ranjit Mathew * parse.y (DIR_SEPARATOR): Don't define. (check_class_interface_creation): Use IS_DIR_SEPARATOR. From-SVN: r56973 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.y | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2eb6a9d..b95e8ae 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2002-09-09 Ranjit Mathew + + * parse.y (DIR_SEPARATOR): Don't define. + (check_class_interface_creation): Use IS_DIR_SEPARATOR. + 2002-08-28 Andrew Haley * verify.c (verify_jvm_instructions): Allow exception handler diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 30a2dce..aa593f9 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 */ -- cgit v1.1