Patchwork [CPP/23827] standard C++ should not have hex float preprocessing tokens

login
register
mail settings
Submitter Ed Smith-Rowland
Date Aug. 27, 2014, 2:55 p.m.
Message ID <53FDF170.7080208@verizon.net>
Download mbox | patch
Permalink /patch/383473/
State New
Headers show

Comments

Ed Smith-Rowland - Aug. 27, 2014, 2:55 p.m.
This old one says the C++98 ANSI doesn't have hex float literals and 
should error gracefully.
Fixed by changing a language feature flag as suggested by the audit 
trail and by adding an error message.

Built and tested on x86_64-linux.

OK?
libcpp/

2014-08-27  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR cpp/23827 - standard C++ should not have hex float preprocessor
	tokens
	* libcpp/init.c (lang_flags): Change CXX98 flag for extended numbers
	from 1 to 0.
	* libcpp/expr.c (cpp_classify_number): Weite error message for improper
	use of hex floating literal.


gcc/testsuite/

2014-08-27  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR cpp/23827 - standard C++ should not have hex float preprocessor
	tokens
	* g++.dg/cpp/pr23827_cxx11.C: New.
	* g++.dg/cpp/pr23827_cxx98.C: New.
	* g++.dg/cpp/pr23827_cxx98_neg.C: New.
	* gcc.dg/cpp/pr23827_c90.c: New.
	* gcc.dg/cpp/pr23827_c90_neg.c: New.
	* gcc.dg/cpp/pr23827_c99.c: New.
Jason Merrill - Aug. 27, 2014, 7:40 p.m.
OK.

Jason

Patch

Index: libcpp/init.c
===================================================================
--- libcpp/init.c	(revision 214556)
+++ libcpp/init.c	(working copy)
@@ -103,7 +103,7 @@ 
   /* STDC99   */  { 1,  0,  1,  0,  0,  1,  1,  1,  0,   0,   0,    0,     0,     1 },
   /* STDC11   */  { 1,  0,  1,  0,  1,  1,  1,  1,  1,   0,   0,    0,     0,     1 },
   /* GNUCXX   */  { 0,  1,  1,  0,  0,  0,  1,  1,  0,   0,   0,    0,     0,     0 },
-  /* CXX98    */  { 0,  1,  1,  0,  0,  1,  1,  1,  0,   0,   0,    0,     0,     1 },
+  /* CXX98    */  { 0,  1,  0,  0,  0,  1,  1,  1,  0,   0,   0,    0,     0,     1 },
   /* GNUCXX11 */  { 1,  1,  1,  0,  1,  0,  1,  1,  1,   1,   1,    0,     0,     0 },
   /* CXX11    */  { 1,  1,  1,  0,  1,  1,  1,  1,  1,   1,   1,    0,     0,     1 },
   /* GNUCXX14 */  { 1,  1,  1,  0,  1,  0,  1,  1,  1,   1,   1,    1,     1,     0 },
Index: libcpp/expr.c
===================================================================
--- libcpp/expr.c	(revision 214556)
+++ libcpp/expr.c	(working copy)
@@ -540,9 +540,16 @@ 
 	SYNTAX_ERROR_AT (virtual_location,
 			 "no digits in hexadecimal floating constant");
 
-      if (radix == 16 && CPP_PEDANTIC (pfile) && !CPP_OPTION (pfile, c99))
-	cpp_error_with_line (pfile, CPP_DL_PEDWARN, virtual_location, 0,
-			     "use of C99 hexadecimal floating constant");
+      if (radix == 16 && CPP_PEDANTIC (pfile)
+	  && !CPP_OPTION (pfile, extended_numbers))
+	{
+	  if (CPP_OPTION (pfile, cplusplus))
+	    cpp_error_with_line (pfile, CPP_DL_PEDWARN, virtual_location, 0,
+				 "use of C++11 hexadecimal floating constant");
+	  else
+	    cpp_error_with_line (pfile, CPP_DL_PEDWARN, virtual_location, 0,
+				 "use of C99 hexadecimal floating constant");
+	}
 
       if (float_flag == AFTER_EXPON)
 	{
Index: gcc/testsuite/g++.dg/cpp/pr23827_cxx11.C
===================================================================
--- gcc/testsuite/g++.dg/cpp/pr23827_cxx11.C	(revision 0)
+++ gcc/testsuite/g++.dg/cpp/pr23827_cxx11.C	(working copy)
@@ -0,0 +1,23 @@ 
+// { dg-do run { target c++11 } }
+// { dg-options "-pedantic-errors" }
+
+#define f (
+#define l )
+#define str(x) #x
+#define xstr(x) str(x)
+
+// C90 and C++98: "0x1p+( 0x1p+)"
+// C99 and C++11: "0x1p+f 0x1p+l"
+const char *s = xstr(0x1p+f 0x1p+l);
+
+extern "C" void abort (void);
+extern "C" int strcmp (const char *, const char *);
+
+int
+main()
+{
+  if (strcmp (s, "0x1p+( 0x1p+)"))
+    return 0; // Correct C99 and C++11 behavior.
+  else
+    abort (); // Correct C90 and C++ behavior.
+}
Index: gcc/testsuite/g++.dg/cpp/pr23827_cxx98.C
===================================================================
--- gcc/testsuite/g++.dg/cpp/pr23827_cxx98.C	(revision 0)
+++ gcc/testsuite/g++.dg/cpp/pr23827_cxx98.C	(working copy)
@@ -0,0 +1,23 @@ 
+// { dg-do run { target c++98_only } }
+// { dg-options "-ansi -pedantic-errors" }
+
+#define f (
+#define l )
+#define str(x) #x
+#define xstr(x) str(x)
+
+// C90 and C++98: "0x1p+( 0x1p+)"
+// C99 and C++11: "0x1p+f 0x1p+l"
+const char *s = xstr(0x1p+f 0x1p+l);
+
+extern "C" void abort (void);
+extern "C" int strcmp (const char *, const char *);
+
+int
+main()
+{
+  if (strcmp (s, "0x1p+( 0x1p+)"))
+    abort (); // Correct C99 and C++11 behavior.
+  else
+    return 0; // Correct C90 and C++ behavior.
+}
Index: gcc/testsuite/g++.dg/cpp/pr23827_cxx98_neg.C
===================================================================
--- gcc/testsuite/g++.dg/cpp/pr23827_cxx98_neg.C	(revision 0)
+++ gcc/testsuite/g++.dg/cpp/pr23827_cxx98_neg.C	(working copy)
@@ -0,0 +1,4 @@ 
+// { dg-do compile { target c++98_only } }
+/* { dg-options "-ansi -pedantic-errors" }  */
+
+double x = 0x3.1415babep0; // { dg-error "use of C..11 hexadecimal floating constant" }
Index: gcc/testsuite/gcc.dg/cpp/pr23827_c90.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/pr23827_c90.c	(revision 0)
+++ gcc/testsuite/gcc.dg/cpp/pr23827_c90.c	(working copy)
@@ -0,0 +1,23 @@ 
+/* { dg-do run }  */
+/* { dg-options "-std=c90 -pedantic-errors" }  */
+
+#define f (
+#define l )
+#define str(x) #x
+#define xstr(x) str(x)
+
+/* C90 and C++98: "0x1p+( 0x1p+)"  */
+/* C99 and C++11: "0x1p+f 0x1p+l"  */
+const char *s = xstr(0x1p+f 0x1p+l);
+
+void abort (void);
+int strcmp (const char *, const char *);
+
+int
+main()
+{
+  if (strcmp (s, "0x1p+( 0x1p+)"))
+    abort (); /* Correct C99 and C++11 behavior.  */
+  else
+    return 0; /* Correct C90 and C++ behavior.  */
+}
Index: gcc/testsuite/gcc.dg/cpp/pr23827_c90_neg.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/pr23827_c90_neg.c	(revision 0)
+++ gcc/testsuite/gcc.dg/cpp/pr23827_c90_neg.c	(working copy)
@@ -0,0 +1,4 @@ 
+/* { dg-do compile }  */
+/* { dg-options "-std=c90 -pedantic-errors" }  */
+
+double x = 0x3.1415babep0; /* { dg-error "use of C99 hexadecimal floating constant" }  */
Index: gcc/testsuite/gcc.dg/cpp/pr23827_c99.c
===================================================================
--- gcc/testsuite/gcc.dg/cpp/pr23827_c99.c	(revision 0)
+++ gcc/testsuite/gcc.dg/cpp/pr23827_c99.c	(working copy)
@@ -0,0 +1,23 @@ 
+/* { dg-do run { target c++11 } }  */
+/* { dg-options "-pedantic-errors" }  */
+
+#define f (
+#define l )
+#define str(x) #x
+#define xstr(x) str(x)
+
+/* C90 and C++98: "0x1p+( 0x1p+)"  */
+/* C99 and C++11: "0x1p+f 0x1p+l"  */
+const char *s = xstr(0x1p+f 0x1p+l);
+
+void abort (void);
+int strcmp (const char *, const char *);
+
+int
+main()
+{
+  if (strcmp (s, "0x1p+( 0x1p+)"))
+    return 0; /* Correct C99 and C++11 behavior.  */
+  else
+    abort (); /* Correct C90 and C++ behavior.  */
+}