# HG changeset patch # User jbe # Date 1406854098 -7200 # Node ID e618ccd017a3217b343b332076fa228fd8c71eed # Parent 84497222db4e4580c995f7042950871a49d6039c Cleaned up macros for json.import function diff -r 84497222db4e -r e618ccd017a3 libraries/json/json.c --- a/libraries/json/json.c Fri Aug 01 02:31:13 2014 +0200 +++ b/libraries/json/json.c Fri Aug 01 02:48:18 2014 +0200 @@ -100,10 +100,6 @@ return json_mark(L, json_regpointer(arraymt)); } -#define json_utf16_surrogate(x) ((x) >= 0xD800 && (x) <= 0xDFFF) -#define json_utf16_lead(x) ((x) >= 0xD800 && (x) <= 0xDBFF) -#define json_utf16_tail(x) ((x) >= 0xDC00 && (x) <= 0xDFFF) - // internal states of JSON parser: #define JSON_STATE_VALUE 0 #define JSON_STATE_OBJECT_KEY 1 @@ -119,7 +115,10 @@ #define json_import_arraymt_idx 3 #define json_import_shadowtbl_idx 4 -// macro for hex decoding: +// macros for hex decoding: +#define json_utf16_surrogate(x) ((x) >= 0xD800 && (x) <= 0xDFFF) +#define json_utf16_lead(x) ((x) >= 0xD800 && (x) <= 0xDBFF) +#define json_utf16_tail(x) ((x) >= 0xDC00 && (x) <= 0xDFFF) #define json_import_readhex(x) \ do { \ x = 0; \