Replace a bool with an enum for clarity, based on review comment from James Dennett.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@191420 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Lex/LiteralSupport.h b/include/clang/Lex/LiteralSupport.h
index ccc29ae..64d5aa2 100644
--- a/include/clang/Lex/LiteralSupport.h
+++ b/include/clang/Lex/LiteralSupport.h
@@ -102,9 +102,11 @@
static bool isDigitSeparator(char C) { return C == '\''; }
+ enum CheckSeparatorKind { CSK_BeforeDigits, CSK_AfterDigits };
+
/// \brief Ensure that we don't have a digit separator here.
void checkSeparator(SourceLocation TokLoc, const char *Pos,
- bool IsAfterDigits);
+ CheckSeparatorKind IsAfterDigits);
/// SkipHexDigits - Read and skip over any hex digits, up to End.
/// Return a pointer to the first non-hex digit or End.
diff --git a/lib/Lex/LiteralSupport.cpp b/lib/Lex/LiteralSupport.cpp
index e2ff6d6..fce3ff3 100644
--- a/lib/Lex/LiteralSupport.cpp
+++ b/lib/Lex/LiteralSupport.cpp
@@ -498,19 +498,19 @@
hadError = true;
return;
} else if (*s == '.') {
- checkSeparator(TokLoc, s, true);
+ checkSeparator(TokLoc, s, CSK_AfterDigits);
s++;
saw_period = true;
- checkSeparator(TokLoc, s, false);
+ checkSeparator(TokLoc, s, CSK_BeforeDigits);
s = SkipDigits(s);
}
if ((*s == 'e' || *s == 'E')) { // exponent
- checkSeparator(TokLoc, s, true);
+ checkSeparator(TokLoc, s, CSK_AfterDigits);
const char *Exponent = s;
s++;
saw_exponent = true;
if (*s == '+' || *s == '-') s++; // sign
- checkSeparator(TokLoc, s, false);
+ checkSeparator(TokLoc, s, CSK_BeforeDigits);
const char *first_non_digit = SkipDigits(s);
if (first_non_digit != s) {
s = first_non_digit;
@@ -524,7 +524,7 @@
}
SuffixBegin = s;
- checkSeparator(TokLoc, s, true);
+ checkSeparator(TokLoc, s, CSK_AfterDigits);
// Parse the suffix. At this point we can classify whether we have an FP or
// integer constant.
@@ -682,8 +682,9 @@
}
void NumericLiteralParser::checkSeparator(SourceLocation TokLoc,
- const char *Pos, bool IsAfterDigits) {
- if (IsAfterDigits) {
+ const char *Pos,
+ CheckSeparatorKind IsAfterDigits) {
+ if (IsAfterDigits == CSK_AfterDigits) {
assert(Pos != ThisTokBegin);
--Pos;
} else {