Improved Token::get_kind to make Structured binding declarations work properly

b8ff60c0 · Ole Christian Eidheim · 2edcb84b · b8ff60c0
Commit b8ff60c0 authored Apr 07, 2020 by Ole Christian Eidheim
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/token.cc src/token.cc +3 -3

No files found.
--- a/src/token.cc
+++ b/src/token.cc
@@ -26,10 +26,10 @@ clangmm::Token::Kind clangmm::Token::get_kind() const {

 bool clangmm::Token::is_identifier() const {
  auto token_kind = get_kind();
-  auto cursor = get_cursor();
-  if(token_kind == clangmm::Token::Kind::Identifier && cursor.is_valid_kind())
+  if(token_kind == clangmm::Token::Kind::Identifier)
    return true;
-  else if(token_kind == clangmm::Token::Kind::Keyword && cursor.is_valid_kind()) {
+  auto cursor = get_cursor();
+  if(token_kind == clangmm::Token::Kind::Keyword && cursor.is_valid_kind()) {
    auto spelling = get_spelling();
    if(spelling == "operator" || (spelling == "bool" && get_cursor().get_spelling() == "operator bool"))
      return true;