diff options
| author | Feng Wang <fengwang@nudt.edu.cn> | 2006-01-09 01:00:23 +0000 |
|---|---|---|
| committer | Feng Wang <fengwang@gcc.gnu.org> | 2006-01-09 01:00:23 +0000 |
| commit | 7d60270a87ee95b8b67b3f86442a648600ba36cb (patch) | |
| tree | ebf27dc1cfdb137a32d951947f32385e95248a72 /gcc | |
| parent | 3b0a1d3659895ba5b361f24ed81913876ca628e0 (diff) | |
| download | gcc-7d60270a87ee95b8b67b3f86442a648600ba36cb.zip gcc-7d60270a87ee95b8b67b3f86442a648600ba36cb.tar.gz gcc-7d60270a87ee95b8b67b3f86442a648600ba36cb.tar.bz2 | |
simplify.c (gfc_simplify_char): Use UCHAR_MAX instead of literal constant.
fortran/
2006-01-09 Feng Wang <fengwang@nudt.edu.cn>
* simplify.c (gfc_simplify_char): Use UCHAR_MAX instead of literal
constant.
(gfc_simplify_ichar): Get the result from unsinged char and in the
range 0 to UCHAR_MAX instead of CHAR_MIN to CHAR_MAX.
Testsuite ChangeLog entry:
2006-01-09 Feng Wang <fengwang@nudt.edu.cn>
* gfortran.dg/intrinsic_i_char.f90: New test.
From-SVN: r109488
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/simplify.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/ichar_2.f90 | 16 |
4 files changed, 30 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5cb9a7b..45fb5fe 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2006-01-09 Feng Wang <fengwang@nudt.edu.cn> + + * simplify.c (gfc_simplify_char): Use UCHAR_MAX instead of literal + constant. + (gfc_simplify_ichar): Get the result from unsinged char and in the + range 0 to UCHAR_MAX instead of CHAR_MIN to CHAR_MAX. + 2005-01-08 Erik Edelmann <eedelman@gcc.gnu.org> PR fortran/25093 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 5b47e93..7c66504 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -662,7 +662,7 @@ gfc_simplify_char (gfc_expr * e, gfc_expr * k) if (e->expr_type != EXPR_CONSTANT) return NULL; - if (gfc_extract_int (e, &c) != NULL || c < 0 || c > 255) + if (gfc_extract_int (e, &c) != NULL || c < 0 || c > UCHAR_MAX) { gfc_error ("Bad character in CHAR function at %L", &e->where); return &gfc_bad_expr; @@ -1370,9 +1370,9 @@ gfc_simplify_ichar (gfc_expr * e) return &gfc_bad_expr; } - index = (int) e->value.character.string[0]; + index = (unsigned char) e->value.character.string[0]; - if (index < CHAR_MIN || index > CHAR_MAX) + if (index < 0 || index > UCHAR_MAX) { gfc_error ("Argument of ICHAR at %L out of range of this processor", &e->where); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2d143ce..0743d0a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2006-01-09 Feng Wang <fengwang@nudt.edu.cn> + + * gfortran.dg/ichar_2.f90: New test. + 2005-01-08 Erik Edelmann <eedelman@gcc.gnu.org> PR fortran/25093 diff --git a/gcc/testsuite/gfortran.dg/ichar_2.f90 b/gcc/testsuite/gfortran.dg/ichar_2.f90 new file mode 100644 index 0000000..27b9ffc --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ichar_2.f90 @@ -0,0 +1,16 @@ +! { dg-do run } +! Test char and ichar intrinsic functions +Program test +integer i + +if (ichar (char (0)) .ne. 0) call abort () +if (ichar (char (255)) .ne. 255) call abort () +if (ichar (char (127)) .ne. 127) call abort () + +i = 0 +if (ichar (char (i)) .ne. i) call abort () +i = 255 +if (ichar (char (i)) .ne. i) call abort () +i = 127 +if (ichar (char (i)) .ne. i) call abort () +end |