From 2aa0cbaf22365273defc3c1f4fd9bdc14c38f219 Mon Sep 17 00:00:00 2001
From: Max Wipfli <mail@maxwipfli.ch>
Date: Thu, 3 Jun 2021 23:35:50 +0200
Subject: [PATCH] LibCpp: Use CharacterTypes.h and constexpr functions in Lexer

---
 Userland/Libraries/LibCpp/Lexer.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Userland/Libraries/LibCpp/Lexer.cpp b/Userland/Libraries/LibCpp/Lexer.cpp
index 5ccb86d00d..6b02479a16 100644
--- a/Userland/Libraries/LibCpp/Lexer.cpp
+++ b/Userland/Libraries/LibCpp/Lexer.cpp
@@ -5,10 +5,10 @@
  */
 
 #include "Lexer.h"
+#include <AK/CharacterTypes.h>
 #include <AK/HashTable.h>
 #include <AK/StdLibExtras.h>
 #include <AK/String.h>
-#include <ctype.h>
 
 namespace Cpp {
 
@@ -38,14 +38,14 @@ char Lexer::consume()
     return ch;
 }
 
-static bool is_valid_first_character_of_identifier(char ch)
+constexpr bool is_valid_first_character_of_identifier(char ch)
 {
-    return isalpha(ch) || ch == '_' || ch == '$';
+    return is_ascii_alpha(ch) || ch == '_' || ch == '$';
 }
 
-static bool is_valid_nonfirst_character_of_identifier(char ch)
+constexpr bool is_valid_nonfirst_character_of_identifier(char ch)
 {
-    return is_valid_first_character_of_identifier(ch) || isdigit(ch);
+    return is_valid_first_character_of_identifier(ch) || is_ascii_digit(ch);
 }
 
 constexpr char const* s_known_keywords[] = {
@@ -268,7 +268,7 @@ Vector<Token> Lexer::lex()
         }
         case 'x': {
             size_t hex_digits = 0;
-            while (isxdigit(peek(2 + hex_digits)))
+            while (is_ascii_hex_digit(peek(2 + hex_digits)))
                 ++hex_digits;
             return 2 + hex_digits;
         }
@@ -277,7 +277,7 @@ Vector<Token> Lexer::lex()
             bool is_unicode = true;
             size_t number_of_digits = peek(1) == 'u' ? 4 : 8;
             for (size_t i = 0; i < number_of_digits; ++i) {
-                if (!isxdigit(peek(2 + i))) {
+                if (!is_ascii_hex_digit(peek(2 + i))) {
                     is_unicode = false;
                     break;
                 }
@@ -307,9 +307,9 @@ Vector<Token> Lexer::lex()
 
     while (m_index < m_input.length()) {
         auto ch = peek();
-        if (isspace(ch)) {
+        if (is_ascii_space(ch)) {
             begin_token();
-            while (isspace(peek()))
+            while (is_ascii_space(peek()))
                 consume();
             commit_token(Token::Type::Whitespace);
             continue;
@@ -535,7 +535,7 @@ Vector<Token> Lexer::lex()
                 commit_token(Token::Type::IncludeStatement);
 
                 begin_token();
-                while (isspace(peek()))
+                while (is_ascii_space(peek()))
                     consume();
                 commit_token(Token::Type::Whitespace);
 
@@ -667,7 +667,7 @@ Vector<Token> Lexer::lex()
             commit_token(Token::Type::SingleQuotedString);
             continue;
         }
-        if (isdigit(ch) || (ch == '.' && isdigit(peek(1)))) {
+        if (is_ascii_digit(ch) || (ch == '.' && is_ascii_digit(peek(1)))) {
             begin_token();
             consume();
 
@@ -686,7 +686,7 @@ Vector<Token> Lexer::lex()
                 if (ch == '+' || ch == '-') {
                     ++length;
                 }
-                for (ch = peek(length); isdigit(ch); ch = peek(length)) {
+                for (ch = peek(length); is_ascii_digit(ch); ch = peek(length)) {
                     ++length;
                 }
                 return length;
@@ -720,7 +720,7 @@ Vector<Token> Lexer::lex()
                     is_hex = true;
                 }
 
-                for (char ch = peek(); (is_hex ? isxdigit(ch) : isdigit(ch)) || (ch == '\'' && peek(1) != '\'') || ch == '.'; ch = peek()) {
+                for (char ch = peek(); (is_hex ? is_ascii_hex_digit(ch) : is_ascii_digit(ch)) || (ch == '\'' && peek(1) != '\'') || ch == '.'; ch = peek()) {
                     if (ch == '.') {
                         if (type == Token::Type::Integer) {
                             type = Token::Type::Float;