From b8ff60c0f30b0f8bb163c83c2861219d3ec6028e Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Tue, 7 Apr 2020 12:03:31 +0200
Subject: [PATCH] Improved Token::get_kind to make Structured binding
 declarations work properly

---
 src/token.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/token.cc b/src/token.cc
index d0ee71e..47576ae 100644
--- 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;