RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 22:17:43 +00:00
Code Issues Activity Actions

LibCpp: Use CharacterTypes.h and constexpr functions in Lexer

Browse source
This commit is contained in:
Max Wipfli 2021-06-03 23:35:50 +02:00 • committed by Ali Mohammad Pur
parent d57d7bea1c
commit 2aa0cbaf22
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibCpp/Lexer.cpp
View file

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