--- JSON-XS/XS.xs 2007/03/22 17:28:50 1.2 +++ JSON-XS/XS.xs 2010/03/17 01:45:43 1.107 @@ -2,73 +2,314 @@ #include "perl.h" #include "XSUB.h" -#include "assert.h" -#include "string.h" -#include "stdlib.h" - -#define F_ASCII 0x00000001 -#define F_UTF8 0x00000002 -#define F_INDENT 0x00000004 -#define F_CANONICAL 0x00000008 -#define F_SPACE_BEFORE 0x00000010 -#define F_SPACE_AFTER 0x00000020 -#define F_JSON_RPC 0x00000040 +#include +#include +#include +#include +#include +#include + +#if defined(__BORLANDC__) || defined(_MSC_VER) +# define snprintf _snprintf // C compilers have this in stdio.h +#endif + +// some old perls do not have this, try to make it work, no +// guarantees, though. if it breaks, you get to keep the pieces. +#ifndef UTF8_MAXBYTES +# define UTF8_MAXBYTES 13 +#endif + +// three extra for rounding, sign, and end of string +#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) + +#define F_ASCII 0x00000001UL +#define F_LATIN1 0x00000002UL +#define F_UTF8 0x00000004UL +#define F_INDENT 0x00000008UL +#define F_CANONICAL 0x00000010UL +#define F_SPACE_BEFORE 0x00000020UL +#define F_SPACE_AFTER 0x00000040UL +#define F_ALLOW_NONREF 0x00000100UL +#define F_SHRINK 0x00000200UL +#define F_ALLOW_BLESSED 0x00000400UL +#define F_CONV_BLESSED 0x00000800UL +#define F_RELAXED 0x00001000UL +#define F_ALLOW_UNKNOWN 0x00002000UL +#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing #define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER -#define F_DEFAULT 0 #define INIT_SIZE 32 // initial scalar size to be allocated +#define INDENT_STEP 3 // spaces per indentation level + +#define SHORT_STRING_LEN 16384 // special-case strings of up to this size #define SB do { #define SE } while (0) -static HV *json_stash; +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr), (value)) +# define INLINE static inline +#else +# define expect(expr,value) (expr) +# define INLINE static +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + +#define IN_RANGE_INC(type,val,beg,end) \ + ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ + <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) + +#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" + +#ifdef USE_ITHREADS +# define JSON_SLOW 1 +# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) +#else +# define JSON_SLOW 0 +# define JSON_STASH json_stash +#endif + +static HV *json_stash, *json_boolean_stash; // JSON::XS:: +static SV *json_true, *json_false; + +enum { + INCR_M_WS = 0, // initial whitespace skipping, must be 0 + INCR_M_STR, // inside string + INCR_M_BS, // inside backslash + INCR_M_C0, // inside comment in initial whitespace sequence + INCR_M_C1, // inside comment in other places + INCR_M_JSON // outside anything, count nesting +}; + +#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) + +typedef struct { + U32 flags; + U32 max_depth; + STRLEN max_size; + + SV *cb_object; + HV *cb_sk_object; + + // for the incremental parser + SV *incr_text; // the source text so far + STRLEN incr_pos; // the current offset into the text + int incr_nest; // {[]}-nesting level + unsigned char incr_mode; +} JSON; -// structure used for encoding JSON -typedef struct +INLINE void +json_init (JSON *json) { - char *cur; - STRLEN len; // SvLEN (sv) - char *end; // SvEND (sv) - SV *sv; - UV flags; - int max_recurse; - int indent; -} enc_t; + Zero (json, 1, JSON); + json->max_depth = 512; +} -// structure used for decoding JSON -typedef struct +///////////////////////////////////////////////////////////////////////////// +// utility functions + +INLINE SV * +get_bool (const char *name) { - char *cur; - char *end; - char *err; - UV flags; -} dec_t; + SV *sv = get_sv (name, 1); + + SvREADONLY_on (sv); + SvREADONLY_on (SvRV (sv)); -static UV * -SvJSON (SV *sv) + return sv; +} + +INLINE void +shrink (SV *sv) { - if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash)) - croak ("object is not of type JSON::XS"); + sv_utf8_downgrade (sv, 1); - return &SvUVX (SvRV (sv)); + if (SvLEN (sv) > SvCUR (sv) + 1) + { +#ifdef SvPV_shrink_to_cur + SvPV_shrink_to_cur (sv); +#elif defined (SvPV_renew) + SvPV_renew (sv, SvCUR (sv) + 1); +#endif + } +} + +// decode an utf-8 character and return it, or (UV)-1 in +// case of an error. +// we special-case "safe" characters from U+80 .. U+7FF, +// but use the very good perl function to parse anything else. +// note that we never call this function for a ascii codepoints +INLINE UV +decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) +{ + if (expect_true (len >= 2 + && IN_RANGE_INC (char, s[0], 0xc2, 0xdf) + && IN_RANGE_INC (char, s[1], 0x80, 0xbf))) + { + *clen = 2; + return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); + } + else + return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); +} + +// likewise for encoding, also never called for ascii codepoints +// this function takes advantage of this fact, although current gccs +// seem to optimise the check for >= 0x80 away anyways +INLINE unsigned char * +encode_utf8 (unsigned char *s, UV ch) +{ + if (expect_false (ch < 0x000080)) + *s++ = ch; + else if (expect_true (ch < 0x000800)) + *s++ = 0xc0 | ( ch >> 6), + *s++ = 0x80 | ( ch & 0x3f); + else if ( ch < 0x010000) + *s++ = 0xe0 | ( ch >> 12), + *s++ = 0x80 | ((ch >> 6) & 0x3f), + *s++ = 0x80 | ( ch & 0x3f); + else if ( ch < 0x110000) + *s++ = 0xf0 | ( ch >> 18), + *s++ = 0x80 | ((ch >> 12) & 0x3f), + *s++ = 0x80 | ((ch >> 6) & 0x3f), + *s++ = 0x80 | ( ch & 0x3f); + + return s; +} + +// convert offset pointer to character index, sv must be string +static STRLEN +ptr_to_index (SV *sv, char *offset) +{ + return SvUTF8 (sv) + ? utf8_distance (offset, SvPVX (sv)) + : offset - SvPVX (sv); } ///////////////////////////////////////////////////////////////////////////// +// fp hell +// scan a group of digits, and a trailing exponent static void +json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth) +{ + UV uaccum = 0; + int eaccum = 0; + + // if we recurse too deep, skip all remaining digits + // to avoid a stack overflow attack + if (expect_false (--maxdepth <= 0)) + while (((U8)*s - '0') < 10) + ++s; + + for (;;) + { + U8 dig = (U8)*s - '0'; + + if (expect_false (dig >= 10)) + { + if (dig == (U8)((U8)'.' - (U8)'0')) + { + ++s; + json_atof_scan1 (s, accum, expo, 1, maxdepth); + } + else if ((dig | ' ') == 'e' - '0') + { + int exp2 = 0; + int neg = 0; + + ++s; + + if (*s == '-') + { + ++s; + neg = 1; + } + else if (*s == '+') + ++s; + + while ((dig = (U8)*s - '0') < 10) + exp2 = exp2 * 10 + *s++ - '0'; + + *expo += neg ? -exp2 : exp2; + } + + break; + } + + ++s; + + uaccum = uaccum * 10 + dig; + ++eaccum; + + // if we have too many digits, then recurse for more + // we actually do this for rather few digits + if (uaccum >= (UV_MAX - 9) / 10) + { + if (postdp) *expo -= eaccum; + json_atof_scan1 (s, accum, expo, postdp, maxdepth); + if (postdp) *expo += eaccum; + + break; + } + } + + // this relies greatly on the quality of the pow () + // implementation of the platform, but a good + // implementation is hard to beat. + if (postdp) *expo -= eaccum; + *accum += uaccum * Perl_pow (10., *expo); + *expo += eaccum; +} + +static NV +json_atof (const char *s) +{ + NV accum = 0.; + int expo = 0; + int neg = 0; + + if (*s == '-') + { + ++s; + neg = 1; + } + + // a recursion depth of ten gives us >>500 bits + json_atof_scan1 (s, &accum, &expo, 0, 10); + + return neg ? -accum : accum; +} +///////////////////////////////////////////////////////////////////////////// +// encoder + +// structure used for encoding JSON +typedef struct +{ + char *cur; // SvPVX (sv) + current output position + char *end; // SvEND (sv) + SV *sv; // result scalar + JSON json; + U32 indent; // indentation level + UV limit; // escape character values >= this value when encoding +} enc_t; + +INLINE void need (enc_t *enc, STRLEN len) { - if (enc->cur + len >= enc->end) + if (expect_false (enc->cur + len >= enc->end)) { - STRLEN cur = enc->cur - SvPVX (enc->sv); - SvGROW (enc->sv, cur + len + 1); + STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); + SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); enc->cur = SvPVX (enc->sv) + cur; - enc->end = SvEND (enc->sv); + enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; } } -static void +INLINE void encode_ch (enc_t *enc, char ch) { need (enc, 1); @@ -80,84 +321,152 @@ { char *end = str + len; + need (enc, len); + while (str < end) { unsigned char ch = *(unsigned char *)str; - if (ch >= 0x20 && ch < 0x80) // most common case - { - *enc->cur++ = ch; - str++; - } - else - { - STRLEN clen; - UV uch; - if (is_utf8) + if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case + { + if (expect_false (ch == '"')) // but with slow exceptions { - uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); - if (clen < 0) - croak ("malformed UTF-8 character in string, cannot convert to JSON"); + need (enc, len += 1); + *enc->cur++ = '\\'; + *enc->cur++ = '"'; } - else + else if (expect_false (ch == '\\')) { - uch = ch; - clen = 1; + need (enc, len += 1); + *enc->cur++ = '\\'; + *enc->cur++ = '\\'; } + else + *enc->cur++ = ch; - need (enc, len += 6); - - if (uch < 0xa0 || enc->flags & F_ASCII) + ++str; + } + else + { + switch (ch) { - if (uch > 0xFFFFUL) - { - len += 6; - need (enc, len += 6); - sprintf (enc->cur, "\\u%04x\\u%04x", - (uch - 0x10000) / 0x400 + 0xD800, - (uch - 0x10000) % 0x400 + 0xDC00); - enc->cur += 12; - } - else + case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; + case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; + case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; + case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; + case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; + + default: { - sprintf (enc->cur, "\\u%04x", uch); - enc->cur += 6; + STRLEN clen; + UV uch; + + if (is_utf8) + { + uch = decode_utf8 (str, end - str, &clen); + if (clen == (STRLEN)-1) + croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); + } + else + { + uch = ch; + clen = 1; + } + + if (uch < 0x80/*0x20*/ || uch >= enc->limit) + { + if (uch >= 0x10000UL) + { + if (uch >= 0x110000UL) + croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); + + need (enc, len += 11); + sprintf (enc->cur, "\\u%04x\\u%04x", + (int)((uch - 0x10000) / 0x400 + 0xD800), + (int)((uch - 0x10000) % 0x400 + 0xDC00)); + enc->cur += 12; + } + else + { + need (enc, len += 5); + *enc->cur++ = '\\'; + *enc->cur++ = 'u'; + *enc->cur++ = PL_hexdigit [ uch >> 12 ]; + *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; + *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; + *enc->cur++ = PL_hexdigit [(uch >> 0) & 15]; + } + + str += clen; + } + else if (enc->json.flags & F_LATIN1) + { + *enc->cur++ = uch; + str += clen; + } + else if (is_utf8) + { + need (enc, len += clen); + do + { + *enc->cur++ = *str++; + } + while (--clen); + } + else + { + need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed + enc->cur = encode_utf8 (enc->cur, uch); + ++str; + } } } - else if (is_utf8) - { - memcpy (enc->cur, str, clen); - enc->cur += clen; - } - else - enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); - - str += clen; } --len; } } -#define INDENT SB \ - if (enc->flags & F_INDENT) \ - { \ - int i_; \ - need (enc, enc->indent); \ - for (i_ = enc->indent * 3; i_--; )\ - encode_ch (enc, ' '); \ - } \ - SE +INLINE void +encode_indent (enc_t *enc) +{ + if (enc->json.flags & F_INDENT) + { + int spaces = enc->indent * INDENT_STEP; -#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE -#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE -#define COMMA SB \ - encode_ch (enc, ','); \ - if (enc->flags & F_INDENT) \ - NL; \ - else if (enc->flags & F_SPACE_AFTER) \ - SPACE; \ - SE + need (enc, spaces); + memset (enc->cur, ' ', spaces); + enc->cur += spaces; + } +} + +INLINE void +encode_space (enc_t *enc) +{ + need (enc, 1); + encode_ch (enc, ' '); +} + +INLINE void +encode_nl (enc_t *enc) +{ + if (enc->json.flags & F_INDENT) + { + need (enc, 1); + encode_ch (enc, '\n'); + } +} + +INLINE void +encode_comma (enc_t *enc) +{ + encode_ch (enc, ','); + + if (enc->json.flags & F_INDENT) + encode_nl (enc); + else if (enc->json.flags & F_SPACE_AFTER) + encode_space (enc); +} static void encode_sv (enc_t *enc, SV *sv); @@ -166,26 +475,38 @@ { int i, len = av_len (av); - encode_ch (enc, '['); NL; - ++enc->indent; + if (enc->indent >= enc->json.max_depth) + croak (ERR_NESTING_EXCEEDED); - for (i = 0; i <= len; ++i) + encode_ch (enc, '['); + + if (len >= 0) { - INDENT; - encode_sv (enc, *av_fetch (av, i, 0)); + encode_nl (enc); ++enc->indent; - if (i < len) - COMMA; - } + for (i = 0; i <= len; ++i) + { + SV **svp = av_fetch (av, i, 0); - NL; + encode_indent (enc); - --enc->indent; - INDENT; encode_ch (enc, ']'); + if (svp) + encode_sv (enc, *svp); + else + encode_str (enc, "null", 4, 0); + + if (i < len) + encode_comma (enc); + } + + encode_nl (enc); --enc->indent; encode_indent (enc); + } + + encode_ch (enc, ']'); } static void -encode_he (enc_t *enc, HE *he) +encode_hk (enc_t *enc, HE *he) { encode_ch (enc, '"'); @@ -193,7 +514,10 @@ { SV *sv = HeSVKEY (he); STRLEN len; - char *str = SvPV (sv, len); + char *str; + + SvGETMAGIC (sv); + str = SvPV (sv, len); encode_str (enc, str, len, SvUTF8 (sv)); } @@ -202,10 +526,9 @@ encode_ch (enc, '"'); - if (enc->flags & F_SPACE_BEFORE) SPACE; + if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); encode_ch (enc, ':'); - if (enc->flags & F_SPACE_AFTER ) SPACE; - encode_sv (enc, HeVAL (he)); + if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); } // compare hash entries, used when all keys are bytestrings @@ -220,8 +543,8 @@ STRLEN la = HeKLEN (a); STRLEN lb = HeKLEN (b); - if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) - cmp = la < lb ? -1 : la == lb ? 0 : 1; + if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la))) + cmp = lb - la; return cmp; } @@ -230,26 +553,49 @@ static int he_cmp_slow (const void *a, const void *b) { - return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); + return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a)); } static void encode_hv (enc_t *enc, HV *hv) { - int count, i; + HE *he; - encode_ch (enc, '{'); NL; ++enc->indent; + if (enc->indent >= enc->json.max_depth) + croak (ERR_NESTING_EXCEEDED); - if ((count = hv_iterinit (hv))) + encode_ch (enc, '{'); + + // for canonical output we have to sort by keys first + // actually, this is mostly due to the stupid so-called + // security workaround added somewhere in 5.8.x + // that randomises hash orderings + if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv)) { - // for canonical output we have to sort by keys first - // actually, this is mostly due to the stupid so-called - // security workaround added somewhere in 5.8.x. - // that randomises hash orderings - if (enc->flags & F_CANONICAL) + int count = hv_iterinit (hv); + + if (SvMAGICAL (hv)) + { + // need to count by iterating. could improve by dynamically building the vector below + // but I don't care for the speed of this special case. + // note also that we will run into undefined behaviour when the two iterations + // do not result in the same count, something I might care for in some later release. + + count = 0; + while (hv_iternext (hv)) + ++count; + + hv_iterinit (hv); + } + + if (count) { - HE *he, *hes [count]; - int fast = 1; + int i, fast = 1; +#if defined(__BORLANDC__) || defined(_MSC_VER) + HE **hes = _alloca (count * sizeof (HE)); +#else + HE *hes [count]; // if your compiler dies here, you need to enable C99 mode +#endif i = 0; while ((he = hv_iternext (hv))) @@ -265,55 +611,166 @@ qsort (hes, count, sizeof (HE *), he_cmp_fast); else { - // hack to disable "use bytes" - COP *oldcop = PL_curcop, cop; + // hack to forcefully disable "use bytes" + COP cop = *PL_curcop; cop.op_private = 0; - PL_curcop = &cop; + ENTER; SAVETMPS; + + SAVEVPTR (PL_curcop); + PL_curcop = &cop; + qsort (hes, count, sizeof (HE *), he_cmp_slow); - FREETMPS; - PL_curcop = oldcop; + FREETMPS; + LEAVE; } - for (i = 0; i < count; ++i) + encode_nl (enc); ++enc->indent; + + while (count--) { - INDENT; - encode_he (enc, hes [i]); + encode_indent (enc); + he = hes [count]; + encode_hk (enc, he); + encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he)); - if (i < count - 1) - COMMA; + if (count) + encode_comma (enc); } - NL; + encode_nl (enc); --enc->indent; encode_indent (enc); + } + } + else + { + if (hv_iterinit (hv) || SvMAGICAL (hv)) + if ((he = hv_iternext (hv))) + { + encode_nl (enc); ++enc->indent; + + for (;;) + { + encode_indent (enc); + encode_hk (enc, he); + encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he)); + + if (!(he = hv_iternext (hv))) + break; + + encode_comma (enc); + } + + encode_nl (enc); --enc->indent; encode_indent (enc); + } + } + + encode_ch (enc, '}'); +} + +// encode objects, arrays and special \0=false and \1=true values. +static void +encode_rv (enc_t *enc, SV *sv) +{ + svtype svt; + + SvGETMAGIC (sv); + svt = SvTYPE (sv); + + if (expect_false (SvOBJECT (sv))) + { + HV *stash = !JSON_SLOW || json_boolean_stash + ? json_boolean_stash + : gv_stashpv ("JSON::XS::Boolean", 1); + + if (SvSTASH (sv) == stash) + { + if (SvIV (sv)) + encode_str (enc, "true", 4, 0); + else + encode_str (enc, "false", 5, 0); } else { - SV *sv; - HE *he = hv_iternext (hv); - - for (;;) +#if 0 + if (0 && sv_derived_from (rv, "JSON::Literal")) + { + // not yet + } +#endif + if (enc->json.flags & F_CONV_BLESSED) { - INDENT; - encode_he (enc, he); + // we re-bless the reference to get overload and other niceties right + GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0); - if (!(he = hv_iternext (hv))) - break; + if (to_json) + { + dSP; - COMMA; - } + ENTER; SAVETMPS; PUSHMARK (SP); + XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); + + // calling with G_SCALAR ensures that we always get a 1 return value + PUTBACK; + call_sv ((SV *)GvCV (to_json), G_SCALAR); + SPAGAIN; + + // catch this surprisingly common error + if (SvROK (TOPs) && SvRV (TOPs) == sv) + croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); + + sv = POPs; + PUTBACK; + + encode_sv (enc, sv); - NL; + FREETMPS; LEAVE; + } + else if (enc->json.flags & F_ALLOW_BLESSED) + encode_str (enc, "null", 4, 0); + else + croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", + SvPV_nolen (sv_2mortal (newRV_inc (sv)))); + } + else if (enc->json.flags & F_ALLOW_BLESSED) + encode_str (enc, "null", 4, 0); + else + croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", + SvPV_nolen (sv_2mortal (newRV_inc (sv)))); } } + else if (svt == SVt_PVHV) + encode_hv (enc, (HV *)sv); + else if (svt == SVt_PVAV) + encode_av (enc, (AV *)sv); + else if (svt < SVt_PVAV) + { + STRLEN len = 0; + char *pv = svt ? SvPV (sv, len) : 0; - --enc->indent; INDENT; encode_ch (enc, '}'); + if (len == 1 && *pv == '1') + encode_str (enc, "true", 4, 0); + else if (len == 1 && *pv == '0') + encode_str (enc, "false", 5, 0); + else if (enc->json.flags & F_ALLOW_UNKNOWN) + encode_str (enc, "null", 4, 0); + else + croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", + SvPV_nolen (sv_2mortal (newRV_inc (sv)))); + } + else if (enc->json.flags & F_ALLOW_UNKNOWN) + encode_str (enc, "null", 4, 0); + else + croak ("encountered %s, but JSON can only represent references to arrays or hashes", + SvPV_nolen (sv_2mortal (newRV_inc (sv)))); } static void encode_sv (enc_t *enc, SV *sv) { + SvGETMAGIC (sv); + if (SvPOKp (sv)) { STRLEN len; @@ -324,86 +781,158 @@ } else if (SvNOKp (sv)) { + // trust that perl will do the right thing w.r.t. JSON syntax. need (enc, NV_DIG + 32); Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); enc->cur += strlen (enc->cur); } else if (SvIOKp (sv)) { - need (enc, 64); - enc->cur += - SvIsUV(sv) - ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) - : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); - } - else if (SvROK (sv)) - { - if (!--enc->max_recurse) - croak ("data structure too deep (hit recursion limit)"); - - sv = SvRV (sv); - - switch (SvTYPE (sv)) + // we assume we can always read an IV as a UV and vice versa + // we assume two's complement + // we assume no aliasing issues in the union + if (SvIsUV (sv) ? SvUVX (sv) <= 59000 + : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000) { - case SVt_PVAV: encode_av (enc, (AV *)sv); break; - case SVt_PVHV: encode_hv (enc, (HV *)sv); break; - - default: - croak ("JSON can only represent references to arrays or hashes"); + // optimise the "small number case" + // code will likely be branchless and use only a single multiplication + // works for numbers up to 59074 + I32 i = SvIVX (sv); + U32 u; + char digit, nz = 0; + + need (enc, 6); + + *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0; + u = i < 0 ? -i : i; + + // convert to 4.28 fixed-point representation + u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits + + // now output digit by digit, each time masking out the integer part + // and multiplying by 5 while moving the decimal point one to the right, + // resulting in a net multiplication by 10. + // we always write the digit to memory but conditionally increment + // the pointer, to enable the use of conditional move instructions. + digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5; + digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5; + digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5; + digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5; + digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' + } + else + { + // large integer, use the (rather slow) snprintf way. + need (enc, IVUV_MAXCHARS); + enc->cur += + SvIsUV(sv) + ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) + : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); } } - else if (!SvOK (sv)) + else if (SvROK (sv)) + encode_rv (enc, SvRV (sv)); + else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) encode_str (enc, "null", 4, 0); else - croak ("encountered perl type that JSON cannot handle"); + croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", + SvPV_nolen (sv), SvFLAGS (sv)); } static SV * -encode_json (SV *scalar, UV flags) +encode_json (SV *scalar, JSON *json) { enc_t enc; - enc.flags = flags; - enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); - enc.cur = SvPVX (enc.sv); - enc.end = SvEND (enc.sv); - enc.max_recurse = 0; - enc.indent = 0; + + if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) + croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); + + enc.json = *json; + enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); + enc.cur = SvPVX (enc.sv); + enc.end = SvEND (enc.sv); + enc.indent = 0; + enc.limit = enc.json.flags & F_ASCII ? 0x000080UL + : enc.json.flags & F_LATIN1 ? 0x000100UL + : 0x110000UL; SvPOK_only (enc.sv); encode_sv (&enc, scalar); + encode_nl (&enc); + + SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); + *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings - if (!(flags & (F_ASCII | F_UTF8))) + if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) SvUTF8_on (enc.sv); - SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); + if (enc.json.flags & F_SHRINK) + shrink (enc.sv); + return enc.sv; } ///////////////////////////////////////////////////////////////////////////// +// decoder + +// structure used for decoding JSON +typedef struct +{ + char *cur; // current parser pointer + char *end; // end of input string + const char *err; // parse error, if != 0 + JSON json; + U32 depth; // recursion depth + U32 maxdepth; // recursion depth limit +} dec_t; + +INLINE void +decode_comment (dec_t *dec) +{ + // only '#'-style comments allowed a.t.m. + + while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d) + ++dec->cur; +} + +INLINE void +decode_ws (dec_t *dec) +{ + for (;;) + { + char ch = *dec->cur; -#define WS \ - for (;;) \ - { \ - char ch = *dec->cur; \ - if (ch > 0x20 \ - || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ - break; \ - ++dec->cur; \ + if (ch > 0x20) + { + if (expect_false (ch == '#')) + { + if (dec->json.flags & F_RELAXED) + decode_comment (dec); + else + break; + } + else + break; + } + else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09) + break; // parse error, but let higher level handle it, gives better error messages + + ++dec->cur; } +} #define ERR(reason) SB dec->err = reason; goto fail; SE + #define EXPECT_CH(ch) SB \ if (*dec->cur != ch) \ ERR (# ch " expected"); \ ++dec->cur; \ SE -static SV *decode_sv (dec_t *dec); +#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED) +#define DEC_DEC_DEPTH --dec->depth -#define APPEND_CH(ch) SB \ - SvGROW (sv, cur + 1 + 1); \ - SvPVX (sv)[cur++] = (ch); \ - SE +static SV *decode_sv (dec_t *dec); static signed char decode_hexdigit[256]; @@ -411,15 +940,12 @@ decode_4hex (dec_t *dec) { signed char d1, d2, d3, d4; + unsigned char *cur = (unsigned char *)dec->cur; - d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]]; - if (d1 < 0) ERR ("four hexadecimal digits expected"); - d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]]; - if (d2 < 0) ERR ("four hexadecimal digits expected"); - d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]]; - if (d3 < 0) ERR ("four hexadecimal digits expected"); - d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]]; - if (d4 < 0) ERR ("four hexadecimal digits expected"); + d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected"); + d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected"); + d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected"); + d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected"); dec->cur += 4; @@ -435,103 +961,155 @@ static SV * decode_str (dec_t *dec) { - SV *sv = NEWSV (0,2); - STRLEN cur = 0; + SV *sv = 0; int utf8 = 0; + char *dec_cur = dec->cur; - for (;;) + do { - unsigned char ch = *(unsigned char *)dec->cur; + char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; + char *cur = buf; - if (ch == '"') - break; - else if (ch == '\\') + do { - switch (*++dec->cur) - { - case '\\': - case '/': - case '"': APPEND_CH (*dec->cur++); break; + unsigned char ch = *(unsigned char *)dec_cur++; - case 'b': APPEND_CH ('\010'); ++dec->cur; break; - case 't': APPEND_CH ('\011'); ++dec->cur; break; - case 'n': APPEND_CH ('\012'); ++dec->cur; break; - case 'f': APPEND_CH ('\014'); ++dec->cur; break; - case 'r': APPEND_CH ('\015'); ++dec->cur; break; - - case 'u': + if (expect_false (ch == '"')) + { + --dec_cur; + break; + } + else if (expect_false (ch == '\\')) + { + switch (*dec_cur) { - UV lo, hi; - ++dec->cur; - - hi = decode_4hex (dec); - if (hi == (UV)-1) - goto fail; + case '\\': + case '/': + case '"': *cur++ = *dec_cur++; break; + + case 'b': ++dec_cur; *cur++ = '\010'; break; + case 't': ++dec_cur; *cur++ = '\011'; break; + case 'n': ++dec_cur; *cur++ = '\012'; break; + case 'f': ++dec_cur; *cur++ = '\014'; break; + case 'r': ++dec_cur; *cur++ = '\015'; break; - // possibly a surrogate pair - if (hi >= 0xd800 && hi < 0xdc00) + case 'u': { - if (dec->cur [0] != '\\' || dec->cur [1] != 'u') - ERR ("illegal surrogate character"); + UV lo, hi; + ++dec_cur; - dec->cur += 2; - - lo = decode_4hex (dec); - if (lo == (UV)-1) + dec->cur = dec_cur; + hi = decode_4hex (dec); + dec_cur = dec->cur; + if (hi == (UV)-1) goto fail; - if (lo < 0xdc00 || lo >= 0xe000) - ERR ("surrogate pair expected"); - - hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; + // possibly a surrogate pair + if (hi >= 0xd800) + if (hi < 0xdc00) + { + if (dec_cur [0] != '\\' || dec_cur [1] != 'u') + ERR ("missing low surrogate character in surrogate pair"); + + dec_cur += 2; + + dec->cur = dec_cur; + lo = decode_4hex (dec); + dec_cur = dec->cur; + if (lo == (UV)-1) + goto fail; + + if (lo < 0xdc00 || lo >= 0xe000) + ERR ("surrogate pair expected"); + + hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; + } + else if (hi < 0xe000) + ERR ("missing high surrogate character in surrogate pair"); + + if (hi >= 0x80) + { + utf8 = 1; + + cur = encode_utf8 (cur, hi); + } + else + *cur++ = hi; } - else if (lo >= 0xdc00 && lo < 0xe000) - ERR ("illegal surrogate character"); - - if (hi >= 0x80) - { - utf8 = 1; + break; - SvGROW (sv, cur + 4 + 1); // at most 4 bytes for 21 bits - cur = (char *)uvuni_to_utf8_flags (SvPVX (sv) + cur, hi, 0) - SvPVX (sv); - } - else - APPEND_CH (hi); + default: + --dec_cur; + ERR ("illegal backslash escape sequence in string"); } - break; + } + else if (expect_true (ch >= 0x20 && ch < 0x80)) + *cur++ = ch; + else if (ch >= 0x80) + { + STRLEN clen; + + --dec_cur; + + decode_utf8 (dec_cur, dec->end - dec_cur, &clen); + if (clen == (STRLEN)-1) + ERR ("malformed UTF-8 character in JSON string"); + + do + *cur++ = *dec_cur++; + while (--clen); + + utf8 = 1; + } + else + { + --dec_cur; + + if (!ch) + ERR ("unexpected end of string while parsing JSON string"); + else + ERR ("invalid character encountered while parsing JSON string"); } } - else if (ch >= 0x20 && ch <= 0x7f) - APPEND_CH (*dec->cur++); - else if (ch >= 0x80) - { - STRLEN clen; - UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY); - if (clen < 0) - ERR ("malformed UTF-8 character in string, cannot convert to JSON"); - - SvGROW (sv, cur + clen + 1); // at most 4 bytes for 21 bits - memcpy (SvPVX (sv) + cur, dec->cur, clen); - dec->cur += clen; - } - else - ERR ("invalid character encountered"); - } + while (cur < buf + SHORT_STRING_LEN); - ++dec->cur; + { + STRLEN len = cur - buf; - SvPOK_only (sv); + if (sv) + { + STRLEN cur = SvCUR (sv); - SvCUR_set (sv, cur); - *SvEND (sv) = 0; + if (SvLEN (sv) <= cur + len) + SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); - if (utf8) - SvUTF8_on (sv); + memcpy (SvPVX (sv) + SvCUR (sv), buf, len); + SvCUR_set (sv, SvCUR (sv) + len); + } + else + sv = newSVpvn (buf, len); + } + } + while (*dec_cur != '"'); + ++dec_cur; + + if (sv) + { + SvPOK_only (sv); + *SvEND (sv) = 0; + + if (utf8) + SvUTF8_on (sv); + } + else + sv = newSVpvn ("", 0); + + dec->cur = dec_cur; return sv; fail: - SvREFCNT_dec (sv); + dec->cur = dec_cur; return 0; } @@ -551,51 +1129,102 @@ if (*dec->cur >= '0' && *dec->cur <= '9') ERR ("malformed number (leading zero must not be followed by another digit)"); } - - // int - while (*dec->cur >= '0' && *dec->cur <= '9') - ++dec->cur; + else if (*dec->cur < '0' || *dec->cur > '9') + ERR ("malformed number (no digits after initial minus)"); + else + do + { + ++dec->cur; + } + while (*dec->cur >= '0' && *dec->cur <= '9'); // [frac] if (*dec->cur == '.') { - is_nv = 1; + ++dec->cur; + + if (*dec->cur < '0' || *dec->cur > '9') + ERR ("malformed number (no digits after decimal point)"); do { ++dec->cur; } while (*dec->cur >= '0' && *dec->cur <= '9'); + + is_nv = 1; } // [exp] if (*dec->cur == 'e' || *dec->cur == 'E') { - is_nv = 1; - ++dec->cur; + if (*dec->cur == '-' || *dec->cur == '+') ++dec->cur; - while (*dec->cur >= '0' && *dec->cur <= '9') - ++dec->cur; + if (*dec->cur < '0' || *dec->cur > '9') + ERR ("malformed number (no digits after exp sign)"); + + do + { + ++dec->cur; + } + while (*dec->cur >= '0' && *dec->cur <= '9'); + + is_nv = 1; } if (!is_nv) { - UV uv; - int numtype = grok_number (start, dec->cur - start, &uv); - if (numtype & IS_NUMBER_IN_UV) - if (numtype & IS_NUMBER_NEG) + int len = dec->cur - start; + + // special case the rather common 1..5-digit-int case + if (*start == '-') + switch (len) { - if (uv < (UV)IV_MIN) - return newSViv (-(IV)uv); + case 2: return newSViv (-(IV)( start [1] - '0' * 1)); + case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11)); + case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); + case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); + case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); } - else - return newSVuv (uv); + else + switch (len) + { + case 1: return newSViv ( start [0] - '0' * 1); + case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); + case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); + case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); + case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); + } + + { + UV uv; + int numtype = grok_number (start, len, &uv); + if (numtype & IS_NUMBER_IN_UV) + if (numtype & IS_NUMBER_NEG) + { + if (uv < (UV)IV_MIN) + return newSViv (-(IV)uv); + } + else + return newSVuv (uv); + } + + len -= *start == '-' ? 1 : 0; + + // does not fit into IV or UV, try NV + if (len <= NV_DIG) + // fits into NV without loss of precision + return newSVnv (json_atof (start)); + + // everything else fails, convert it to a string + return newSVpvn (start, dec->cur - start); } - return newSVnv (Atof (start)); + // loss of precision here + return newSVnv (json_atof (start)); fail: return 0; @@ -606,94 +1235,230 @@ { AV *av = newAV (); - for (;;) - { - SV *value; + DEC_INC_DEPTH; + decode_ws (dec); - value = decode_sv (dec); - if (!value) - goto fail; + if (*dec->cur == ']') + ++dec->cur; + else + for (;;) + { + SV *value; - av_push (av, value); + value = decode_sv (dec); + if (!value) + goto fail; - WS; + av_push (av, value); - if (*dec->cur == ']') - { - ++dec->cur; - break; - } - - if (*dec->cur != ',') - ERR (", or ] expected while parsing array"); + decode_ws (dec); - ++dec->cur; - } + if (*dec->cur == ']') + { + ++dec->cur; + break; + } + + if (*dec->cur != ',') + ERR (", or ] expected while parsing array"); + + ++dec->cur; + + decode_ws (dec); + if (*dec->cur == ']' && dec->json.flags & F_RELAXED) + { + ++dec->cur; + break; + } + } + + DEC_DEC_DEPTH; return newRV_noinc ((SV *)av); fail: SvREFCNT_dec (av); + DEC_DEC_DEPTH; return 0; } static SV * decode_hv (dec_t *dec) { + SV *sv; HV *hv = newHV (); - for (;;) - { - SV *key, *value; + DEC_INC_DEPTH; + decode_ws (dec); + + if (*dec->cur == '}') + ++dec->cur; + else + for (;;) + { + EXPECT_CH ('"'); + + // heuristic: assume that + // a) decode_str + hv_store_ent are abysmally slow. + // b) most hash keys are short, simple ascii text. + // => try to "fast-match" such strings to avoid + // the overhead of decode_str + hv_store_ent. + { + SV *value; + char *p = dec->cur; + char *e = p + 24; // only try up to 24 bytes + + for (;;) + { + // the >= 0x80 is false on most architectures + if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') + { + // slow path, back up and use decode_str + SV *key = decode_str (dec); + if (!key) + goto fail; + + decode_ws (dec); EXPECT_CH (':'); - WS; EXPECT_CH ('"'); + decode_ws (dec); + value = decode_sv (dec); + if (!value) + { + SvREFCNT_dec (key); + goto fail; + } - key = decode_str (dec); - if (!key) - goto fail; + hv_store_ent (hv, key, value, 0); + SvREFCNT_dec (key); + + break; + } + else if (*p == '"') + { + // fast path, got a simple key + char *key = dec->cur; + int len = p - key; + dec->cur = p + 1; + + decode_ws (dec); EXPECT_CH (':'); + + decode_ws (dec); + value = decode_sv (dec); + if (!value) + goto fail; - WS; EXPECT_CH (':'); + hv_store (hv, key, len, value, 0); - value = decode_sv (dec); - if (!value) - { - SvREFCNT_dec (key); - goto fail; + break; + } + + ++p; + } } - //TODO: optimise - hv_store_ent (hv, key, value, 0); + decode_ws (dec); + + if (*dec->cur == '}') + { + ++dec->cur; + break; + } + + if (*dec->cur != ',') + ERR (", or } expected while parsing object/hash"); + + ++dec->cur; + + decode_ws (dec); + + if (*dec->cur == '}' && dec->json.flags & F_RELAXED) + { + ++dec->cur; + break; + } + } - WS; + DEC_DEC_DEPTH; + sv = newRV_noinc ((SV *)hv); - if (*dec->cur == '}') + // check filter callbacks + if (dec->json.flags & F_HOOK) + { + if (dec->json.cb_sk_object && HvKEYS (hv) == 1) { - ++dec->cur; - break; + HE *cb, *he; + + hv_iterinit (hv); + he = hv_iternext (hv); + hv_iterinit (hv); + + // the next line creates a mortal sv each time its called. + // might want to optimise this for common cases. + cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); + + if (cb) + { + dSP; + int count; + + ENTER; SAVETMPS; PUSHMARK (SP); + XPUSHs (HeVAL (he)); + sv_2mortal (sv); + + PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; + + if (count == 1) + { + sv = newSVsv (POPs); + FREETMPS; LEAVE; + return sv; + } + + SvREFCNT_inc (sv); + FREETMPS; LEAVE; + } } - if (*dec->cur != ',') - ERR (", or } expected while parsing object/hash"); + if (dec->json.cb_object) + { + dSP; + int count; + + ENTER; SAVETMPS; PUSHMARK (SP); + XPUSHs (sv_2mortal (sv)); - ++dec->cur; + PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; + + if (count == 1) + { + sv = newSVsv (POPs); + FREETMPS; LEAVE; + return sv; + } + + SvREFCNT_inc (sv); + FREETMPS; LEAVE; + } } - return newRV_noinc ((SV *)hv); + return sv; fail: SvREFCNT_dec (hv); + DEC_DEC_DEPTH; return 0; } static SV * decode_sv (dec_t *dec) { - WS; + // the beauty of JSON: you need exactly one character lookahead + // to parse everything. switch (*dec->cur) { case '"': ++dec->cur; return decode_str (dec); - case '[': ++dec->cur; return decode_av (dec); - case '{': ++dec->cur; return decode_hv (dec); + case '[': ++dec->cur; return decode_av (dec); + case '{': ++dec->cur; return decode_hv (dec); case '-': case '0': case '1': case '2': case '3': case '4': @@ -704,7 +1469,10 @@ if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) { dec->cur += 4; - return newSViv (1); +#if JSON_SLOW + json_true = get_bool ("JSON::XS::true"); +#endif + return newSVsv (json_true); } else ERR ("'true' expected"); @@ -715,7 +1483,10 @@ if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) { dec->cur += 5; - return newSViv (0); +#if JSON_SLOW + json_false = get_bool ("JSON::XS::false"); +#endif + return newSVsv (json_false); } else ERR ("'false' expected"); @@ -726,7 +1497,7 @@ if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) { dec->cur += 4; - return newSViv (1); + return newSVsv (&PL_sv_undef); } else ERR ("'null' expected"); @@ -734,7 +1505,7 @@ break; default: - ERR ("malformed json string"); + ERR ("malformed JSON string, neither array, object, number, string or atom"); break; } @@ -743,102 +1514,546 @@ } static SV * -decode_json (SV *string, UV flags) +decode_json (SV *string, JSON *json, char **offset_return) { + dec_t dec; SV *sv; - if (!(flags & F_UTF8)) + /* work around bugs in 5.10 where manipulating magic values + * will perl ignore the magic in subsequent accesses + */ + /*SvGETMAGIC (string);*/ + if (SvMAGICAL (string)) + string = sv_2mortal (newSVsv (string)); + + SvUPGRADE (string, SVt_PV); + + /* work around a bug in perl 5.10, which causes SvCUR to fail an + * assertion with -DDEBUGGING, although SvCUR is documented to + * return the xpv_cur field which certainly exists after upgrading. + * according to nicholas clark, calling SvPOK fixes this. + * But it doesn't fix it, so try another workaround, call SvPV_nolen + * and hope for the best. + * Damnit, SvPV_nolen still trips over yet another assertion. This + * assertion business is seriously broken, try yet another workaround + * for the broken -DDEBUGGING. + */ + { +#ifdef DEBUGGING + STRLEN offset = SvOK (string) ? sv_len (string) : 0; +#else + STRLEN offset = SvCUR (string); +#endif + + if (offset > json->max_size && json->max_size) + croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", + (unsigned long)SvCUR (string), (unsigned long)json->max_size); + } + + if (json->flags & F_UTF8) + sv_utf8_downgrade (string, 0); + else sv_utf8_upgrade (string); SvGROW (string, SvCUR (string) + 1); // should basically be a NOP - dec_t dec; - dec.flags = flags; + dec.json = *json; dec.cur = SvPVX (string); dec.end = SvEND (string); dec.err = 0; + dec.depth = 0; + + if (dec.json.cb_object || dec.json.cb_sk_object) + dec.json.flags |= F_HOOK; - *dec.end = 1; // invalid anywhere + *dec.end = 0; // this should basically be a nop, too, but make sure it's there + + decode_ws (&dec); sv = decode_sv (&dec); - *dec.end = 0; + + if (offset_return) + *offset_return = dec.cur; + + if (!(offset_return || !sv)) + { + // check for trailing garbage + decode_ws (&dec); + + if (*dec.cur) + { + dec.err = "garbage after JSON object"; + SvREFCNT_dec (sv); + sv = 0; + } + } if (!sv) { - IV offset = utf8_distance (dec.cur, SvPVX (string)); SV *uni = sv_newmortal (); + // horrible hack to silence warning inside pv_uni_display + COP cop = *PL_curcop; + cop.cop_warnings = pWARN_NONE; + ENTER; + SAVEVPTR (PL_curcop); + PL_curcop = &cop; pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); - croak ("%s, at character %d (%s)", + LEAVE; + + croak ("%s, at character offset %d (before \"%s\")", dec.err, - (int)offset, + ptr_to_index (string, dec.cur), dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); } - sv_dump (sv);//D - return sv_2mortal (sv); + sv = sv_2mortal (sv); + + if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) + croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); + + return sv; } +///////////////////////////////////////////////////////////////////////////// +// incremental parser + +static void +incr_parse (JSON *self) +{ + const char *p = SvPVX (self->incr_text) + self->incr_pos; + + // the state machine here is a bit convoluted and could be simplified a lot + // but this would make it slower, so... + + for (;;) + { + //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D + switch (self->incr_mode) + { + // only used for initial whitespace skipping + case INCR_M_WS: + for (;;) + { + if (*p > 0x20) + { + if (*p == '#') + { + self->incr_mode = INCR_M_C0; + goto incr_m_c; + } + else + { + self->incr_mode = INCR_M_JSON; + goto incr_m_json; + } + } + else if (!*p) + goto interrupt; + + ++p; + } + + // skip a single char inside a string (for \\-processing) + case INCR_M_BS: + if (!*p) + goto interrupt; + + ++p; + self->incr_mode = INCR_M_STR; + goto incr_m_str; + + // inside #-style comments + case INCR_M_C0: + case INCR_M_C1: + incr_m_c: + for (;;) + { + if (*p == '\n') + { + self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON; + break; + } + else if (!*p) + goto interrupt; + + ++p; + } + + break; + + // inside a string + case INCR_M_STR: + incr_m_str: + for (;;) + { + if (*p == '"') + { + ++p; + self->incr_mode = INCR_M_JSON; + + if (!self->incr_nest) + goto interrupt; + + goto incr_m_json; + } + else if (*p == '\\') + { + ++p; // "virtually" consumes character after \ + + if (!*p) // if at end of string we have to switch modes + { + self->incr_mode = INCR_M_BS; + goto interrupt; + } + } + else if (!*p) + goto interrupt; + + ++p; + } + + // after initial ws, outside string + case INCR_M_JSON: + incr_m_json: + for (;;) + { + switch (*p++) + { + case 0: + --p; + goto interrupt; + + case 0x09: + case 0x0a: + case 0x0d: + case 0x20: + if (!self->incr_nest) + { + --p; // do not eat the whitespace, let the next round do it + goto interrupt; + } + break; + + case '"': + self->incr_mode = INCR_M_STR; + goto incr_m_str; + + case '[': + case '{': + if (++self->incr_nest > self->max_depth) + croak (ERR_NESTING_EXCEEDED); + break; + + case ']': + case '}': + if (--self->incr_nest <= 0) + goto interrupt; + break; + + case '#': + self->incr_mode = INCR_M_C1; + goto incr_m_c; + } + } + } + + modechange: + ; + } + +interrupt: + self->incr_pos = p - SvPVX (self->incr_text); + //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D + //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D +} + +///////////////////////////////////////////////////////////////////////////// +// XS interface functions + MODULE = JSON::XS PACKAGE = JSON::XS BOOT: { int i; - memset (decode_hexdigit, 0xff, 256); - for (i = 10; i--; ) - decode_hexdigit ['0' + i] = i; + for (i = 0; i < 256; ++i) + decode_hexdigit [i] = + i >= '0' && i <= '9' ? i - '0' + : i >= 'a' && i <= 'f' ? i - 'a' + 10 + : i >= 'A' && i <= 'F' ? i - 'A' + 10 + : -1; - for (i = 6; --i; ) - { - decode_hexdigit ['a' + i] = 10 + i; - decode_hexdigit ['A' + i] = 10 + i; - } + json_stash = gv_stashpv ("JSON::XS" , 1); + json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); + + json_true = get_bool ("JSON::XS::true"); + json_false = get_bool ("JSON::XS::false"); - json_stash = gv_stashpv ("JSON::XS", 1); + CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ } -SV *new (char *dummy) +PROTOTYPES: DISABLE + +void CLONE (...) CODE: - RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); - OUTPUT: - RETVAL + json_stash = 0; + json_boolean_stash = 0; + +void new (char *klass) + PPCODE: +{ + SV *pv = NEWSV (0, sizeof (JSON)); + SvPOK_only (pv); + json_init ((JSON *)SvPVX (pv)); + XPUSHs (sv_2mortal (sv_bless ( + newRV_noinc (pv), + strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) + ))); +} -SV *ascii (SV *self, int enable) +void ascii (JSON *self, int enable = 1) ALIAS: - ascii = F_ASCII - utf8 = F_UTF8 - indent = F_INDENT - canonical = F_CANONICAL - space_before = F_SPACE_BEFORE - space_after = F_SPACE_AFTER - json_rpc = F_JSON_RPC - pretty = F_PRETTY - CODE: + ascii = F_ASCII + latin1 = F_LATIN1 + utf8 = F_UTF8 + indent = F_INDENT + canonical = F_CANONICAL + space_before = F_SPACE_BEFORE + space_after = F_SPACE_AFTER + pretty = F_PRETTY + allow_nonref = F_ALLOW_NONREF + shrink = F_SHRINK + allow_blessed = F_ALLOW_BLESSED + convert_blessed = F_CONV_BLESSED + relaxed = F_RELAXED + allow_unknown = F_ALLOW_UNKNOWN + PPCODE: { - UV *uv = SvJSON (self); if (enable) - *uv |= ix; + self->flags |= ix; else - *uv &= ~ix; + self->flags &= ~ix; - RETVAL = newSVsv (self); + XPUSHs (ST (0)); } + +void get_ascii (JSON *self) + ALIAS: + get_ascii = F_ASCII + get_latin1 = F_LATIN1 + get_utf8 = F_UTF8 + get_indent = F_INDENT + get_canonical = F_CANONICAL + get_space_before = F_SPACE_BEFORE + get_space_after = F_SPACE_AFTER + get_allow_nonref = F_ALLOW_NONREF + get_shrink = F_SHRINK + get_allow_blessed = F_ALLOW_BLESSED + get_convert_blessed = F_CONV_BLESSED + get_relaxed = F_RELAXED + get_allow_unknown = F_ALLOW_UNKNOWN + PPCODE: + XPUSHs (boolSV (self->flags & ix)); + +void max_depth (JSON *self, U32 max_depth = 0x80000000UL) + PPCODE: + self->max_depth = max_depth; + XPUSHs (ST (0)); + +U32 get_max_depth (JSON *self) + CODE: + RETVAL = self->max_depth; OUTPUT: RETVAL -void encode (SV *self, SV *scalar) +void max_size (JSON *self, U32 max_size = 0) PPCODE: - XPUSHs (encode_json (scalar, *SvJSON (self))); + self->max_size = max_size; + XPUSHs (ST (0)); -void decode (SV *self, SV *jsonstr) +int get_max_size (JSON *self) + CODE: + RETVAL = self->max_size; + OUTPUT: + RETVAL + +void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) PPCODE: - XPUSHs (decode_json (jsonstr, *SvJSON (self))); +{ + SvREFCNT_dec (self->cb_object); + self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; + + XPUSHs (ST (0)); +} -void to_json (SV *scalar) +void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) PPCODE: - XPUSHs (encode_json (scalar, F_UTF8)); +{ + if (!self->cb_sk_object) + self->cb_sk_object = newHV (); -void from_json (SV *jsonstr) + if (SvOK (cb)) + hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); + else + { + hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0); + + if (!HvKEYS (self->cb_sk_object)) + { + SvREFCNT_dec (self->cb_sk_object); + self->cb_sk_object = 0; + } + } + + XPUSHs (ST (0)); +} + +void encode (JSON *self, SV *scalar) + PPCODE: + XPUSHs (encode_json (scalar, self)); + +void decode (JSON *self, SV *jsonstr) + PPCODE: + XPUSHs (decode_json (jsonstr, self, 0)); + +void decode_prefix (JSON *self, SV *jsonstr) + PPCODE: +{ + char *offset; + EXTEND (SP, 2); + PUSHs (decode_json (jsonstr, self, &offset)); + PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); +} + +void incr_parse (JSON *self, SV *jsonstr = 0) + PPCODE: +{ + if (!self->incr_text) + self->incr_text = newSVpvn ("", 0); + + // append data, if any + if (jsonstr) + { + if (SvUTF8 (jsonstr)) + { + if (!SvUTF8 (self->incr_text)) + { + /* utf-8-ness differs, need to upgrade */ + sv_utf8_upgrade (self->incr_text); + + if (self->incr_pos) + self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos) + - (U8 *)SvPVX (self->incr_text); + } + } + else if (SvUTF8 (self->incr_text)) + sv_utf8_upgrade (jsonstr); + + { + STRLEN len; + const char *str = SvPV (jsonstr, len); + STRLEN cur = SvCUR (self->incr_text); + + if (SvLEN (self->incr_text) <= cur + len) + SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); + + Move (str, SvEND (self->incr_text), len, char); + SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); + *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there + } + } + + if (GIMME_V != G_VOID) + do + { + char *offset; + + if (!INCR_DONE (self)) + { + incr_parse (self); + + if (self->incr_pos > self->max_size && self->max_size) + croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", + (unsigned long)self->incr_pos, (unsigned long)self->max_size); + + if (!INCR_DONE (self)) + break; + } + + XPUSHs (decode_json (self->incr_text, self, &offset)); + + self->incr_pos -= offset - SvPVX (self->incr_text); + self->incr_nest = 0; + self->incr_mode = 0; + + sv_chop (self->incr_text, offset); + } + while (GIMME_V == G_ARRAY); +} + +SV *incr_text (JSON *self) + ATTRS: lvalue + CODE: +{ + if (self->incr_pos) + croak ("incr_text can not be called when the incremental parser already started parsing"); + + RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef; +} + OUTPUT: + RETVAL + +void incr_skip (JSON *self) + CODE: +{ + if (self->incr_pos) + { + sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos); + self->incr_pos = 0; + self->incr_nest = 0; + self->incr_mode = 0; + } +} + +void incr_reset (JSON *self) + CODE: +{ + SvREFCNT_dec (self->incr_text); + self->incr_text = 0; + self->incr_pos = 0; + self->incr_nest = 0; + self->incr_mode = 0; +} + +void DESTROY (JSON *self) + CODE: + SvREFCNT_dec (self->cb_sk_object); + SvREFCNT_dec (self->cb_object); + SvREFCNT_dec (self->incr_text); + +PROTOTYPES: ENABLE + +void encode_json (SV *scalar) + ALIAS: + to_json_ = 0 + encode_json = F_UTF8 + PPCODE: +{ + JSON json; + json_init (&json); + json.flags |= ix; + XPUSHs (encode_json (scalar, &json)); +} + +void decode_json (SV *jsonstr) + ALIAS: + from_json_ = 0 + decode_json = F_UTF8 PPCODE: - XPUSHs (decode_json (jsonstr, F_UTF8)); +{ + JSON json; + json_init (&json); + json.flags |= ix; + XPUSHs (decode_json (jsonstr, &json, 0)); +}