summaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog6
-rw-r--r--libcpp/lex.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 2d84835b7b7..c7599495282 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -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
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 0dc47371183..bca56299132 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -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;
}