Merge branch '2.3'

Closes #70.

diff --combined src/load.c
index e245476,9ad4752..245244e
--- 1/src/load.c
--- 2/src/load.c
+++ b/src/load.c
@@@ -32,12 -32,12 +32,12 @@@
  #define TOKEN_NULL           261
  
  /* Locale independent versions of isxxx() functions */
- #define l_isupper(c)  ('A' <= c && c <= 'Z')
- #define l_islower(c)  ('a' <= c && c <= 'z')
+ #define l_isupper(c)  ('A' <= (c) && (c) <= 'Z')
+ #define l_islower(c)  ('a' <= (c) && (c) <= 'z')
  #define l_isalpha(c)  (l_isupper(c) || l_islower(c))
- #define l_isdigit(c)  ('0' <= c && c <= '9')
+ #define l_isdigit(c)  ('0' <= (c) && (c) <= '9')
  #define l_isxdigit(c) \
-     (l_isdigit(c) || 'A' <= c || c <= 'F' || 'a' <= c || c <= 'f')
+     (l_isdigit(c) || 'A' <= (c) || (c) <= 'F' || 'a' <= (c) || (c) <= 'f')
  
  /* Read one byte from stream, convert to unsigned char, then int, and
     return. return EOF on end of file. This corresponds to the
@@@ -48,7 -48,7 +48,7 @@@ typedef struct 
      get_func get;
      void *data;
      char buffer[5];
-     int buffer_pos;
+     size_t buffer_pos;
      int state;
      int line;
      int column, last_column;
@@@ -990,58 -990,3 +990,58 @@@ json_t *json_load_file(const char *path
      fclose(fp);
      return result;
  }
 +
 +#define MAX_BUF_LEN 1024
 +
 +typedef struct
 +{
 +    char data[MAX_BUF_LEN];
 +    size_t len;
 +    size_t pos;
 +    json_load_callback_t callback;
 +    void *arg;
 +} callback_data_t;
 +
 +static int callback_get(void *data)
 +{
 +    char c;
 +    callback_data_t *stream = data;
 +
 +    if(stream->pos >= stream->len) {
 +        stream->pos = 0;
 +        stream->len = stream->callback(stream->data, MAX_BUF_LEN, stream->arg);
 +        if(stream->len == 0 || stream->len == (size_t)-1)
 +            return EOF;
 +    }
 +
 +    c = stream->data[stream->pos];
 +    stream->pos++;
 +    return (unsigned char)c;
 +}
 +
 +json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error)
 +{
 +    lex_t lex;
 +    json_t *result;
 +
 +    callback_data_t stream_data;
 +
 +    memset(&stream_data, 0, sizeof(stream_data));
 +    stream_data.callback = callback;
 +    stream_data.arg = arg;
 +
 +    jsonp_error_init(error, "<callback>");
 +
 +    if (callback == NULL) {
 +        error_set(error, NULL, "wrong arguments");
 +        return NULL;
 +    }
 +
 +    if(lex_init(&lex, (get_func)callback_get, &stream_data))
 +        return NULL;
 +
 +    result = parse_json(&lex, flags, error);
 +
 +    lex_close(&lex);
 +    return result;
 +}