Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add ABSL_CONST_INIT and change std::pair<uint8_t, uint8_t> to std::pair<const uint8_t, const uint8_t> #575

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Add ABSL_CONST_INIT and change std::pair<uint8_t, uint8_t> to std::pair<const uint8_t, const uint8_t> #575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions internal/utf8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
#include <string>
#include <utility>

#include "absl/base/attributes.h"
#include "absl/base/macros.h"
#include "absl/base/optimization.h"
#include "absl/log/absl_check.h"
#include "absl/strings/cord.h"
#include "absl/strings/string_view.h"
#include "internal/unicode.h"

Expand All @@ -34,35 +36,35 @@ namespace cel::internal {

namespace {

constexpr uint8_t kUtf8RuneSelf = 0x80;
constexpr size_t kUtf8Max = 4;
ABSL_CONST_INIT constexpr uint8_t kUtf8RuneSelf = 0x80;
ABSL_CONST_INIT constexpr size_t kUtf8Max = 4;

constexpr uint8_t kLow = 0x80;
constexpr uint8_t kHigh = 0xbf;
ABSL_CONST_INIT constexpr uint8_t kLow = 0x80;
ABSL_CONST_INIT constexpr uint8_t kHigh = 0xbf;

constexpr uint8_t kMaskX = 0x3f;
constexpr uint8_t kMask2 = 0x1f;
constexpr uint8_t kMask3 = 0xf;
constexpr uint8_t kMask4 = 0x7;
ABSL_CONST_INIT constexpr uint8_t kMaskX = 0x3f;
ABSL_CONST_INIT constexpr uint8_t kMask2 = 0x1f;
ABSL_CONST_INIT constexpr uint8_t kMask3 = 0xf;
ABSL_CONST_INIT constexpr uint8_t kMask4 = 0x7;

constexpr uint8_t kTX = 0x80;
constexpr uint8_t kT2 = 0xc0;
constexpr uint8_t kT3 = 0xe0;
constexpr uint8_t kT4 = 0xf0;
ABSL_CONST_INIT constexpr uint8_t kTX = 0x80;
ABSL_CONST_INIT constexpr uint8_t kT2 = 0xc0;
ABSL_CONST_INIT constexpr uint8_t kT3 = 0xe0;
ABSL_CONST_INIT constexpr uint8_t kT4 = 0xf0;

constexpr uint8_t kXX = 0xf1;
constexpr uint8_t kAS = 0xf0;
constexpr uint8_t kS1 = 0x02;
constexpr uint8_t kS2 = 0x13;
constexpr uint8_t kS3 = 0x03;
constexpr uint8_t kS4 = 0x23;
constexpr uint8_t kS5 = 0x34;
constexpr uint8_t kS6 = 0x04;
constexpr uint8_t kS7 = 0x44;
ABSL_CONST_INIT constexpr uint8_t kXX = 0xf1;
ABSL_CONST_INIT constexpr uint8_t kAS = 0xf0;
ABSL_CONST_INIT constexpr uint8_t kS1 = 0x02;
ABSL_CONST_INIT constexpr uint8_t kS2 = 0x13;
ABSL_CONST_INIT constexpr uint8_t kS3 = 0x03;
ABSL_CONST_INIT constexpr uint8_t kS4 = 0x23;
ABSL_CONST_INIT constexpr uint8_t kS5 = 0x34;
ABSL_CONST_INIT constexpr uint8_t kS6 = 0x04;
ABSL_CONST_INIT constexpr uint8_t kS7 = 0x44;

// NOLINTBEGIN
// clang-format off
constexpr uint8_t kLeading[256] = {
ABSL_CONST_INIT constexpr uint8_t kLeading[256] = {
// 1 2 3 4 5 6 7 8 9 A B C D E F
kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, // 0x00-0x0F
kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, kAS, // 0x10-0x1F
Expand All @@ -85,11 +87,12 @@ constexpr uint8_t kLeading[256] = {
// clang-format on
// NOLINTEND

constexpr std::pair<uint8_t, uint8_t> kAccept[16] = {
{kLow, kHigh}, {0xa0, kHigh}, {kLow, 0x9f}, {0x90, kHigh},
{kLow, 0x8f}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
{0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
{0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
ABSL_CONST_INIT constexpr std::pair<const uint8_t, const uint8_t> kAccept[16] =
{
{kLow, kHigh}, {0xa0, kHigh}, {kLow, 0x9f}, {0x90, kHigh},
{kLow, 0x8f}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
{0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
{0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0}, {0x0, 0x0},
};

class StringReader final {
Expand Down