Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Reverts changes to sajson::globals_struct::parse_flags #54

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reverts changes to sajson::globals_struct::parse_flags #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a4885f
Revert "Use an inline definition of sajson::globals_struct::parse_fla…
wojdyr Apr 8, 2021
2057639
change the definition of parse_flags to match the declaration
wojdyr Apr 8, 2021
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
13 changes: 8 additions & 5 deletions include/sajson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,17 @@ constexpr inline size_t make_element(tag t, size_t value) {
// header. This trick courtesy of Rich Geldreich's Purple JSON parser.
template <typename unused = void>
struct globals_struct {
static const unsigned char parse_flags[256];
};
typedef globals_struct<> globals;

// clang-format off

// bit 0 (1) - set if: plain ASCII string character
// bit 1 (2) - set if: whitespace
// bit 4 (0x10) - set if: 0-9 e E .
constexpr static const uint8_t parse_flags[256] = {
template <typename unused>
const unsigned char globals_struct<unused>::parse_flags[256] = {
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 2, 0, 0, // 0
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
Expand All @@ -162,15 +167,13 @@ struct globals_struct {
};

// clang-format on
};
typedef globals_struct<> globals;

constexpr inline bool is_plain_string_character(char c) {
inline bool is_plain_string_character(char c) {
// return c >= 0x20 && c <= 0x7f && c != 0x22 && c != 0x5c;
return (globals::parse_flags[static_cast<unsigned char>(c)] & 1) != 0;
}

constexpr inline bool is_whitespace(char c) {
inline bool is_whitespace(char c) {
// return c == '\r' || c == '\n' || c == '\t' || c == ' ';
return (globals::parse_flags[static_cast<unsigned char>(c)] & 2) != 0;
}
Expand Down