amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Add sajson.

Browse source 
* gnu/packages/cpp.scm (sajson): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
David Elsing 2022-10-13 21:04:12 +00:00 • committed by Liliana Marie Prikler
parent c152902191
commit e34bf9b634
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
2 changed files with 110 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
gnu/packages/patches/sajson-build-with-gcc10.patch Normal file
View file

@ -0,0 +1,45 @@
This patch is from the upstream pull request
https://github.com/chadaustin/sajson/pull/54.
It fixes linking with GCC.
diff --git a/include/sajson.h b/include/sajson.h
index 8b4e05a..1bd045b 100644
--- a/include/sajson.h
+++ b/include/sajson.h
@@ -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
@@ -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;
}