From ffa61a5ee88bced356a16485bdf5702d7ee04b1a Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 13 Jul 2009 08:26:38 +0200 Subject: re PR fortran/40588 (Small bug in match_charkind_name) 2009-07-12 Tobias Burnus Philippe Marguinaud PR fortran/40588 * primary.c (match_charkind_name): Fix condition for $ matching. PR libfortran/22423 * libgfortran.h: Typedef the GFC_DTYPE_* enum. 2009-07-12 Tobias Burnus PR libfortran/22423 * io/io.h (namelist_type): Use the proper enum for GFC_DTYPE_*. * intrinsics/iso_c_binding.c (c_f_pointer_u0): Make sure variable is initialized to silence warning. Co-Authored-By: Philippe Marguinaud From-SVN: r149545 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/libgfortran.h | 5 +++-- gcc/fortran/primary.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ec4502f..2206931 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2009-07-12 Tobias Burnus + Philippe Marguinaud + + PR fortran/40588 + * primary.c (match_charkind_name): Fix condition for $ matching. + + PR libfortran/22423 + * libgfortran.h: Typedef the GFC_DTYPE_* enum. + 2009-07-11 Tobias Burnus PR fortran/33197 diff --git a/gcc/fortran/libgfortran.h b/gcc/fortran/libgfortran.h index a18fdce..d660207 100644 --- a/gcc/fortran/libgfortran.h +++ b/gcc/fortran/libgfortran.h @@ -110,7 +110,7 @@ libgfortran_error_codes; #define GFC_DTYPE_TYPE_MASK 0x38 #define GFC_DTYPE_SIZE_SHIFT 6 -enum +typedef enum { GFC_DTYPE_UNKNOWN = 0, GFC_DTYPE_INTEGER, @@ -120,5 +120,6 @@ enum GFC_DTYPE_COMPLEX, GFC_DTYPE_DERIVED, GFC_DTYPE_CHARACTER -}; +} +dtype; diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 8013cc8..0d52c6c 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -832,7 +832,7 @@ match_charkind_name (char *name) if (!ISALNUM (c) && c != '_' - && (gfc_option.flag_dollar_ok && c != '$')) + && (c != '$' || !gfc_option.flag_dollar_ok)) break; *name++ = c; -- cgit v1.1