OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/39027 (double floating point suffix of 'd' and 'D' not accepted) 

gcc/
	PR c/29027
	* c-lex.c (interpret_float): Default (no suffix) is double.

libcpp/
	PR c/29027
	* include/cpplib.h (CPP_N_DEFAULT): Define.
	* expr.c (interpret_float_suffix): Recognize d or D for double,
	return new value for default.
	(cpp_classify_number): Issue pedwarn for use of d or D in suffix.

gcc/testsuite/
	PR c/29027
	* gcc.dg/fltconst-1.c: Don't error for use of d or D in suffix.
	* gcc.dg/fltconst-2.c: New test.
	* gcc.dg/fltconst-double-pedantic-1.c: New test.
	* gcc.dg/fltconst-double-pedantic-2.c: New test.

From-SVN: r145422
This commit is contained in:
Janis Johnson 2009-04-01 17:31:26 +00:00 committed by Janis Johnson
parent 667e8acbce
commit 839a3b8ab5
10 changed files with 111 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-01 Janis Johnson <janis187@us.ibm.com>
PR c/29027
* c-lex.c (interpret_float): Default (no suffix) is double.
2009-04-1 Xinliang David Li <davidxl@google.com>
* config/i386/i386.c (legitimate_constant_p): Recognize

7
gcc/c-lex.c
View File

@ -612,6 +612,13 @@ interpret_float (const cpp_token *token, unsigned int flags)
char *copy;
size_t copylen;
/* Default (no suffix) is double. */
if (flags & CPP_N_DEFAULT)
{
flags ^= CPP_N_DEFAULT;
flags |= CPP_N_MEDIUM;
}
/* Decode _Fract and _Accum. */
if (flags & CPP_N_FRACT || flags & CPP_N_ACCUM)
return interpret_fixed (token, flags);

6
gcc/testsuite/ChangeLog
View File

@ -4,6 +4,12 @@
2009-04-01 Janis Johnson <janis187@us.ibm.com>
PR c/39027
* gcc.dg/fltconst-1.c: Don't error for use of d or D in suffix.
* gcc.dg/fltconst-2.c: New test.
* gcc.dg/fltconst-double-pedantic-1.c: New test.
* gcc.dg/fltconst-double-pedantic-2.c: New test.
PR c/33466
* gcc.dg/cpp/pr33466.c: New test.
* gcc.dg/dfp/pr33466.c: New test.

8
gcc/testsuite/gcc.dg/fltconst-1.c
View File

@ -3,10 +3,10 @@
double a = 1.ld; /* { dg-error "12:invalid suffix" } */
double b = 1.fd; /* { dg-error "12:invalid suffix" } */
double c = 1.di; /* { dg-error "12:invalid suffix" } */
double d = 1.dj; /* { dg-error "12:invalid suffix" } */
double e = 1.id; /* { dg-error "12:invalid suffix" } */
double f = 1.jd; /* { dg-error "12:invalid suffix" } */
double c = 1.di;
double d = 1.dj;
double e = 1.id;
double f = 1.jd;
double g = 1.ddd; /* { dg-error "12:invalid suffix" } */
double h = 1.ldd; /* { dg-error "12:invalid suffix" } */
double i = 1.dld; /* { dg-error "12:invalid suffix" } */

40
gcc/testsuite/gcc.dg/fltconst-2.c Normal file
View File

@ -0,0 +1,40 @@
/* { dg-do compile } */
/* { dg-options "-std=gnu99" } */
/* Check that d or D is recognized as a float constant suffix. */
double d = 0.5d;
double D = 0.5D;
/* Check that d or D is recognized in a hexadecimal floating constant. */
double hd1 = 0x1.8p1d;
double hd2 = 0x1.p+1D;
double hd3 = 0x0.8p-1d;
/* Check that imaginary constant suffixes are still recognized with
only i, I, j, or J. */
double i = 0.5i;
double I = 0.5I;
double j = 0.5j;
double J = 0.5J;
/* Check that imaginary constant suffixes are allowed with d or D. */
double di = 0.5di;
double dI = 0.5dI;
double Di = 0.5Di;
double DI = 0.5DI;
double dj = 0.5dj;
double dJ = 0.5dJ;
double Dj = 0.5Dj;
double DJ = 0.5DJ;
double id = 0.5id;
double iD = 0.5iD;
double Id = 0.5Id;
double ID = 0.5ID;
double jd = 0.5jd;
double jD = 0.5jD;
double Jd = 0.5Jd;
double JD = 0.5JD;

13
gcc/testsuite/gcc.dg/fltconst-double-pedantic-1.c Normal file
View File

@ -0,0 +1,13 @@
/* { dg-do compile } */
/* { dg-options "-std=c99 -pedantic" } */
double a = 1.d; /* { dg-warning "double constant" } */
double b = 1.D; /* { dg-warning "double constant" } */
double c = 1.1e+2d; /* { dg-warning "double constant" } */
double d = 1.di; /* { dg-warning "imaginary constants" } */
double e = 1.dj; /* { dg-warning "imaginary constants" } */
double f = 1.id; /* { dg-warning "imaginary constants" } */
double g = 1.jd; /* { dg-warning "imaginary constants" } */
double h = 0x1.5p1d; /* { dg-warning "double constant" } */

13
gcc/testsuite/gcc.dg/fltconst-double-pedantic-2.c Normal file
View File

@ -0,0 +1,13 @@
/* { dg-do compile } */
/* { dg-options "-std=c99 -pedantic-errors" } */
double a = 1.d; /* { dg-error "double constant" } */
double b = 1.D; /* { dg-error "double constant" } */
double c = 1.1e+2d; /* { dg-error "double constant" } */
double d = 1.di; /* { dg-error "imaginary constants" } */
double e = 1.dj; /* { dg-error "imaginary constants" } */
double f = 1.id; /* { dg-error "imaginary constants" } */
double g = 1.jd; /* { dg-error "imaginary constants" } */
double h = 0x1.5p1d; /* { dg-error "double constant" } */

6
libcpp/ChangeLog
View File

@ -1,5 +1,11 @@
2009-04-01 Janis Johnson <janis187@us.ibm.com>
PR c/39027
* include/cpplib.h (CPP_N_DEFAULT): Define.
* expr.c (interpret_float_suffix): Recognize d or D for double,
return new value for default.
(cpp_classify_number): Issue pedwarn for use of d or D in suffix.
PR c/33466
* expr.c (interpret_float_suffix): Reject invalid suffix that uses
letters from decimal float and fixed-point suffixes.

21
libcpp/expr.c
View File

@ -84,10 +84,10 @@ static unsigned int
interpret_float_suffix (const uchar *s, size_t len)
{
size_t flags;
size_t f, l, w, q, i;
size_t f, d, l, w, q, i;
flags = 0;
f = l = w = q = i = 0;
f = d = l = w = q = i = 0;
/* Process decimal float suffixes, which are two letters starting
with d or D. Order and case are significant. */
@ -103,7 +103,9 @@ interpret_float_suffix (const uchar *s, size_t len)
case 'l': return (!uppercase ? (CPP_N_DFLOAT | CPP_N_LARGE) : 0); break;
case 'L': return (uppercase ? (CPP_N_DFLOAT | CPP_N_LARGE) : 0); break;
default:
return 0;
/* Additional two-character suffixes beginning with D are not
for decimal float constants. */
break;
}
}
@ -162,6 +164,7 @@ interpret_float_suffix (const uchar *s, size_t len)
switch (s[len])
{
case 'f': case 'F': f++; break;
case 'd': case 'D': d++; break;
case 'l': case 'L': l++; break;
case 'w': case 'W': w++; break;
case 'q': case 'Q': q++; break;
@ -171,14 +174,15 @@ interpret_float_suffix (const uchar *s, size_t len)
return 0;
}
if (f + l + w + q > 1 || i > 1)
if (f + d + l + w + q > 1 || i > 1)
return 0;
return ((i ? CPP_N_IMAGINARY : 0)
| (f ? CPP_N_SMALL :
d ? CPP_N_MEDIUM :
l ? CPP_N_LARGE :
w ? CPP_N_MD_W :
q ? CPP_N_MD_Q : CPP_N_MEDIUM));
q ? CPP_N_MD_Q : CPP_N_DEFAULT));
}
/* Subroutine of cpp_classify_number. S points to an integer suffix
@ -365,6 +369,13 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token)
"traditional C rejects the \"%.*s\" suffix",
(int) (limit - str), str);
/* A suffix for double is a GCC extension via decimal float support.
If the suffix also specifies an imaginary value we'll catch that
later. */
if ((result == CPP_N_MEDIUM) && CPP_PEDANTIC (pfile))
cpp_error (pfile, CPP_DL_PEDWARN,
"suffix for double constant is a GCC extension");
/* Radix must be 10 for decimal floats. */
if ((result & CPP_N_DFLOAT) && radix != 10)
{

1
libcpp/include/cpplib.h
View File

@ -780,6 +780,7 @@ struct cpp_num
#define CPP_N_UNSIGNED 0x1000 /* Properties. */
#define CPP_N_IMAGINARY 0x2000
#define CPP_N_DFLOAT 0x4000
#define CPP_N_DEFAULT 0x8000
#define CPP_N_FRACT 0x100000 /* Fract types. */
#define CPP_N_ACCUM 0x200000 /* Accum types. */