From 1a1c8f42c611feb7593f3f418e039c1633a775a8 Mon Sep 17 00:00:00 2001 From: Serge Pavlov Date: Sat, 3 Aug 2019 16:32:49 +0000 Subject: [PATCH] Use switch instead of series of comparisons This is style correction, no functional changes. Differential Revision: https://reviews.llvm.org/D65670 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@367759 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/TokenKinds.h | 8 +------- lib/Basic/TokenKinds.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/clang/Basic/TokenKinds.h b/include/clang/Basic/TokenKinds.h index 8bac28cd39..c25181e682 100644 --- a/include/clang/Basic/TokenKinds.h +++ b/include/clang/Basic/TokenKinds.h @@ -90,13 +90,7 @@ inline bool isLiteral(TokenKind K) { } /// Return true if this is any of tok::annot_* kinds. -inline bool isAnnotation(TokenKind K) { -#define ANNOTATION(NAME) \ - if (K == tok::annot_##NAME) \ - return true; -#include "clang/Basic/TokenKinds.def" - return false; -} +bool isAnnotation(TokenKind K); /// Return true if this is an annotation token representing a pragma. bool isPragmaAnnotation(TokenKind K); diff --git a/lib/Basic/TokenKinds.cpp b/lib/Basic/TokenKinds.cpp index 0426edc316..d55e176c72 100644 --- a/lib/Basic/TokenKinds.cpp +++ b/lib/Basic/TokenKinds.cpp @@ -46,6 +46,16 @@ const char *tok::getKeywordSpelling(TokenKind Kind) { return nullptr; } +bool tok::isAnnotation(TokenKind Kind) { + switch (Kind) { +#define ANNOTATION(X) case annot_ ## X: return true; +#include "clang/Basic/TokenKinds.def" + default: + break; + } + return false; +} + bool tok::isPragmaAnnotation(TokenKind Kind) { switch (Kind) { #define PRAGMA_ANNOTATION(X) case annot_ ## X: return true; -- 2.50.1