diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-22 11:02:17 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-22 11:02:17 +0000 |
| commit | eb5b685e4b32035bb45385de0d980d4220fd6812 (patch) | |
| tree | f398e54c8cb6f6025faa0a96115163d6aa85eb37 | |
| parent | 00ed89e144213f7e7ee98bfb6ab32fff87c17379 (diff) | |
| download | ppe42-gcc-eb5b685e4b32035bb45385de0d980d4220fd6812.tar.gz ppe42-gcc-eb5b685e4b32035bb45385de0d980d4220fd6812.zip | |
* c-lex.c (lex_number): If pedantic and not C99, pedwarn exactly
once for hexadecimal floats, whether or not they contain a decimal
point. Don't let the setting of pedantic otherwise affect the
parsing of hexadecimal floats.
testsuite:
* gcc.dg/c90-hexfloat-1.c: Add more tests.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42440 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/c-lex.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/c90-hexfloat-1.c | 4 |
4 files changed, 19 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d21080bc93f..b9eeac7cf93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-05-22 Joseph S. Myers <jsm28@cam.ac.uk> + + * c-lex.c (lex_number): If pedantic and not C99, pedwarn exactly + once for hexadecimal floats, whether or not they contain a decimal + point. Don't let the setting of pedantic otherwise affect the + parsing of hexadecimal floats. + 2001-05-22 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * README.ACORN: Remove obsolete file. diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 914da81cd92..37d175a4c62 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -1092,9 +1092,7 @@ lex_number (str, len) if (c == '.') { - if (base == 16 && pedantic && !flag_isoc99) - pedwarn ("floating constant may not be in radix 16"); - else if (floatflag == AFTER_POINT) + if (floatflag == AFTER_POINT) ERROR ("too many decimal points in floating constant"); else if (floatflag == AFTER_EXPON) ERROR ("decimal point in exponent - impossible!"); @@ -1190,6 +1188,9 @@ lex_number (str, len) struct pf_args args; char *copy; + if (base == 16 && pedantic && !flag_isoc99) + pedwarn ("floating constant may not be in radix 16"); + if (base == 16 && floatflag != AFTER_EXPON) ERROR ("hexadecimal floating constant has no exponent"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 661d5ea2ba0..e7247cf5aa6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2001-05-22 Joseph S. Myers <jsm28@cam.ac.uk> + + * gcc.dg/c90-hexfloat-1.c: Add more tests. + 2001-05-21 Geoff Keating <geoffk@redhat.com> * gcc.c-torture/compile/920520-1.x: Merge previous contents into diff --git a/gcc/testsuite/gcc.dg/c90-hexfloat-1.c b/gcc/testsuite/gcc.dg/c90-hexfloat-1.c index 9139677cad3..122d5ee5e71 100644 --- a/gcc/testsuite/gcc.dg/c90-hexfloat-1.c +++ b/gcc/testsuite/gcc.dg/c90-hexfloat-1.c @@ -5,3 +5,7 @@ double d = 0x1.2p2; /* { dg-bogus "warning" "warning in place of error" } */ /* { dg-error "radix 16" "hex float error" { target *-*-* } 6 } */ +double d1 = 0x1p2; /* { dg-bogus "warning" "warning in place of error" } */ +/* { dg-error "radix 16" "hex float error" { target *-*-* } 8 } */ +double d2 = 0x1...p2; /* { dg-bogus "warning" "warning in place of error" } */ +/* { dg-error "too many decimal points" "bad hex float" { target *-*-* } 10 } */ |
