1.0 is double, 1.0F is a float.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41412 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Lex/LiteralSupport.cpp b/Lex/LiteralSupport.cpp
index 8276552..0428256 100644
--- a/Lex/LiteralSupport.cpp
+++ b/Lex/LiteralSupport.cpp
@@ -202,10 +202,10 @@
s = DigitsBegin = begin;
saw_exponent = false;
saw_period = false;
- saw_float_suffix = false;
isLong = false;
isUnsigned = false;
isLongLong = false;
+ isFloat = false;
isImaginary = false;
hadError = false;
@@ -326,8 +326,8 @@
case 'f': // FP Suffix for "float"
case 'F':
if (!isFPConstant) break; // Error for integer constant.
- if (saw_float_suffix || isLong) break; // FF, LF invalid.
- saw_float_suffix = true;
+ if (isFloat || isLong) break; // FF, LF invalid.
+ isFloat = true;
continue; // Success.
case 'u':
case 'U':
@@ -338,7 +338,7 @@
case 'l':
case 'L':
if (isLong || isLongLong) break; // Cannot be repeated.
- if (saw_float_suffix) break; // LF invalid.
+ if (isFloat) break; // LF invalid.
// Check for long long. The L's need to be adjacent and the same case.
if (s+1 != ThisTokEnd && s[1] == s[0]) {
diff --git a/Lex/PPExpressions.cpp b/Lex/PPExpressions.cpp
index f43243e..590c0ee 100644
--- a/Lex/PPExpressions.cpp
+++ b/Lex/PPExpressions.cpp
@@ -161,7 +161,7 @@
if (Literal.hadError)
return true; // a diagnostic was already reported.
- if (Literal.isFloatingLiteral()) {
+ if (Literal.isFloatingLiteral() || Literal.isImaginary) {
PP.Diag(PeekTok, diag::err_pp_illegal_floating_literal);
return true;
}