mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-19 09:13:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/64626 (C++14 single quote should not always be a digit separator)

Browse Source 
libcpp/

2015-03-16  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR c++/64626
	* lex.c (lex_number): If a number ends with digit-seps (') skip back
	and let lex_string take them.


gcc/testsuite/

2015-03-16  Edward Smith-Rowland  <3dw4rd@verizon.net>

	PR c++/64626
	g++.dg/cpp1y/pr64626-1.C: New.
	g++.dg/cpp1y/pr64626-2.C: New.
	g++.dg/cpp1y/digit-sep-neg.C: Adjust errors and warnings.

From-SVN: r221470
This commit is contained in:
Edward Smith-Rowland 2015-03-17 00:50:55 +00:00 committed by Edward Smith-Rowland
parent ec19b718ba
commit a5858a3dff
6 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2015-03-16 Edward Smith-Rowland <3dw4rd@verizon.net>
PR c++/64626
g++.dg/cpp1y/pr64626-1.C: New.
g++.dg/cpp1y/pr64626-2.C: New.
g++.dg/cpp1y/digit-sep-neg.C: Adjust errors and warnings.
2015-03-16 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/65427

10
gcc/testsuite/g++.dg/cpp1y/digit-sep-neg.C
View File

@ -10,7 +10,7 @@ main()
i = 0004''000'000; // { dg-error "adjacent digit separators" }
i = 0B1'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0; // OK
i = 0b'0001'0000'0000'0000'0000'0000; // { dg-error "digit separator after base indicator" }
i = 0b0001'0000'0000'0000'0000'0000'; // { dg-error "digit separator outside digit sequence" }
i = 0b0001'0000'0000'0000'0000'0000'; // { dg-error "missing terminating" }
unsigned u = 0b0001'0000'0000'0000'0000'0000'U; // { dg-error "digit separator outside digit sequence" }
double d = 0.0;
@ -18,9 +18,13 @@ main()
d = 1.'602'176'565e-19; // { dg-error "digit separator adjacent to decimal point" }
d = 1.602''176'565e-19; // { dg-error "adjacent digit separators" }
d = 1.602'176'565'e-19; // { dg-error "digit separator adjacent to exponent" }
d = 1.602'176'565e'-19; // { dg-error "digit separator adjacent to exponent" }
d = 1.602'176'565e'-19; // { dg-error "missing terminating" }
d = 1.602'176'565e-'19; // { dg-error "digit separator adjacent to exponent" }
d = 1.602'176'565e-1'9; // OK
d = 1.602'176'565e-19'; // { dg-error "digit separator outside digit sequence" }
d = 1.602'176'565e-19'; // { dg-error "missing terminating" }
float f = 1.602'176'565e-19'F; // { dg-error "digit separator outside digit sequence" }
}
// { dg-error "exponent has no digits" "exponent has no digits" { target *-*-* } 21 }
// { dg-error "expected ';' before" "expected ';' before" { target *-*-* } 14 }
// { dg-error "expected ';' before" "expected ';' before" { target *-*-* } 25 }

20
gcc/testsuite/g++.dg/cpp1y/pr64626-1.C Normal file
View File

@ -0,0 +1,20 @@
// PR c++/64626
// { dg-do compile { target c++14 } }
#define STR(s) #s
int
main()
{
int i = 1'2;
const char *s[3]
{
STR(1' '),
STR(..),
STR(%:%),
};
}
#if 0
1' '
..
%:%
#endif

11
gcc/testsuite/g++.dg/cpp1y/pr64626-2.C Normal file
View File

@ -0,0 +1,11 @@
// PR c++/64626
// { dg-do compile { target c++14 } }
0''; // { dg-error "empty character constant" }
123'''; // { dg-error "empty character constant" }
// { dg-error "expected unqualified-id" "expected unqualified-id" { target *-*-* } 4 }
// { dg-error "missing terminating" "missing terminating" { target *-*-* } 6 }
// { dg-error "expected unqualified-id" "expected unqualified-id" { target *-*-* } 6 }

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-03-16 Edward Smith-Rowland <3dw4rd@verizon.net>
PR c++/64626
* lex.c (lex_number): If a number ends with digit-seps (') skip back
and let lex_string take them.
2015-03-02 Markus Trippelsdorf <markus@trippelsdorf.de>
PR target/65261

3
libcpp/lex.c
View File

@ -1400,6 +1400,9 @@ lex_number (cpp_reader *pfile, cpp_string *number,
NORMALIZE_STATE_UPDATE_IDNUM (nst, *cur);
cur++;
}
/* A number can't end with a digit separator. */
while (cur > pfile->buffer->cur && DIGIT_SEP (cur[-1]))
--cur;
pfile->buffer->cur = cur;
}