Remove compressed token feature

Author: mejedi

README.md

@@ -89,8 +89,6 @@ return value indicates a failure. Possible failures:
 `JSTR_NOMEM (-2)` Token array is too small. Grow the array. Resume
 the parser by calling `jstr_parse` again.
 
-`JSTR_2BIG  (-3)` String is too large or too many tokens produced.
-
 ### Tokens
 
 Token is an opaque `jstr_token_t` structure. No cleanup is necessary.

jstr-test.c

@@ -54,11 +54,11 @@ static void test(int lineno, const char *json, ssize_t rc_expected, ... ) {
             }
             if (type_expected&(JSTR_ARRAY|JSTR_OBJECT)) {
                 size_t offset_expected = va_arg(ap, size_t);
-                if (type_match && jstr__offset(token+i) != offset_expected) {
+                if (type_match && (token+i)->value__ != offset_expected) {
                     fprintf(
                         stderr, "@%04d: [%03zu] %6s (expected) %zu != %zu\n",
                         lineno, i, jstr_type_to_str(type_expected),
-                        offset_expected, jstr__offset(token + i)
+                        offset_expected, (token + i)->value__
                     );
                 }
             } else {

jstr.c

@@ -3,12 +3,8 @@
 static inline void token_init(
     jstr_token_t *token, jstr_type_t type, uintptr_t value
 ) {
-#if JSTR_TOKEN_COMPRESSED
-    token->type_and_value__ = value<<8 | type;
-#else
     token->type__ = type;
     token->value__ = value;
-#endif
 }
 
 // > 0: success, end pos
@@ -28,9 +24,6 @@ ssize_t jstr_parse(
     enum {
         TOP, OBJECT_VALUE = JSTR_OBJECT, ARRAY_ITEM = JSTR_ARRAY, OBJECT_KEY
     } cs = token_parent == token_cur ? TOP : jstr_type(token_parent);
-#if JSTR_TOKEN_COMPRESSED
-    if (((uintptr_t)-1>>8) <= token_count) return JSTR_2BIG;
-#endif
 parse_generic:
     if (token_end - token_cur < 2) {
         parser->parse_pos = (char *)p-str;
@@ -193,9 +186,6 @@ commit_token: {
         switch (cs) {
         case TOP:
             if (c) return JSTR_INVAL;
-#if JSTR_TOKEN_COMPRESSED
-            if ((uintptr_t)p > ((uintptr_t)-1>>8)) return JSTR_2BIG;
-#endif
             return (char *)p-str-1;
         case OBJECT_KEY:
             if (c != ':') return JSTR_INVAL;
@@ -214,9 +204,8 @@ commit_token: {
 
 pop_context: {
         jstr_token_t *token_grandparent = token_parent
-            - jstr__offset(token_parent);
-        token_init(
-            token_parent, jstr_type(token_parent), token_cur-token_parent);
+            - token_parent->value__;
+        token_parent->value__ = token_cur-token_parent;
         cs = token_parent == token_grandparent
             ? TOP : jstr_type(token_grandparent);
         token_parent = token_grandparent;

jstr.h

@@ -13,48 +13,22 @@ typedef enum {
     JSTR_NULL   = 0x40
 } jstr_type_t;
 
-#ifndef JSTR_TOKEN_COMPRESSED
-#if __x86_64__
-#define JSTR_TOKEN_COMPRESSED 1
-#endif
-#endif
-
 typedef struct {
-#if JSTR_TOKEN_COMPRESSED
-    uintptr_t type_and_value__;
-#else
     jstr_type_t type__;
     uintptr_t value__;
-#endif
 } jstr_token_t;
 
 static inline jstr_type_t jstr_type(const jstr_token_t *token) {
-#if JSTR_TOKEN_COMPRESSED
-    return 0xff & token->type_and_value__;
-#else
     return token->type__;
-#endif
 }
 
 static inline const char *jstr_value(const jstr_token_t *token) {
-#if JSTR_TOKEN_COMPRESSED
-    return (const char *)(token->type_and_value__ >> 8);
-#else
     return (const char *)token->value__;
-#endif
-}
-
-static inline size_t jstr__offset(const jstr_token_t *token) {
-#if JSTR_TOKEN_COMPRESSED
-    return token->type_and_value__ >> 8;
-#else
-    return token->value__;
-#endif
 }
 
 static inline const jstr_token_t *jstr_next(const jstr_token_t *token) {
-    return token + ((jstr_type(token)&(JSTR_OBJECT|JSTR_ARRAY)) ?
-        jstr__offset(token) : 1);
+    return token + ((token->type__&(JSTR_OBJECT|JSTR_ARRAY)) ?
+        token->value__ : 1);
 }
 
 typedef struct {
@@ -72,7 +46,6 @@ static inline void jstr_init(jstr_parser_t *parser) {
 enum {
     JSTR_INVAL = -1, // parse error
     JSTR_NOMEM = -2, // token array too small
-    JSTR_2BIG  = -3  // not enough bits in token to store pointer/offset
 };
 
 ssize_t jstr_parse(