#include "jansson_private.h"
typedef struct {
+ const char *start;
const char *fmt;
char token;
json_error_t *error;
static void set_error(scanner_t *s, const char *fmt, ...)
{
va_list ap;
+ size_t pos;
va_start(ap, fmt);
- jsonp_error_vset(s->error, s->line, s->column, fmt, ap);
+
+ pos = (size_t)(s->fmt - s->start);
+ jsonp_error_vset(s->error, s->line, s->column, pos, fmt, ap);
+
va_end(ap);
}
case 'b': /* boolean */
return va_arg(*ap, int) ? json_true() : json_false();
- case 'i': /* integer */
+ case 'i': /* integer from int */
return json_integer(va_arg(*ap, int));
+ case 'I': /* integer from json_int_t */
+ return json_integer(va_arg(*ap, json_int_t));
+
case 'f': /* real */
return json_real(va_arg(*ap, double));
static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
{
int ret = -1;
- int wildcard = 0;
+ int strict = 0;
/* Use a set (emulated by a hashtable) to check that all object
keys are accessed. Checking that the correct number of keys
were accessed is not enough, as the same key can be unpacked
multiple times.
*/
- hashtable_t *key_set;
+ hashtable_t key_set;
- if(!(s->flags & JSON_UNPACK_ONLY)) {
- key_set = hashtable_create(jsonp_hash_key, jsonp_key_equal, NULL, NULL);
- if(!key_set) {
- set_error(s, "Out of memory");
- return -1;
- }
+ if(hashtable_init(&key_set, jsonp_hash_key, jsonp_key_equal, NULL, NULL)) {
+ set_error(s, "Out of memory");
+ return -1;
}
if(!json_is_object(root)) {
set_error(s, "Expected object, got %s", type_name(root));
- goto error;
+ goto out;
}
next_token(s);
const char *key;
json_t *value;
- if(wildcard) {
- set_error(s, "Expected '}' after '*', got '%c'", s->token);
- goto error;
+ if(strict != 0) {
+ set_error(s, "Expected '}' after '%c', got '%c'",
+ (strict == 1 ? '!' : '*'), s->token);
+ goto out;
}
if(!s->token) {
set_error(s, "Unexpected end of format string");
- goto error;
+ goto out;
}
- if(s->token == '*') {
- wildcard = 1;
+ if(s->token == '!' || s->token == '*') {
+ strict = (s->token == '!' ? 1 : -1);
next_token(s);
continue;
}
if(s->token != 's') {
set_error(s, "Expected format 's', got '%c'\n", *s->fmt);
- goto error;
+ goto out;
}
key = va_arg(*ap, const char *);
if(!key) {
set_error(s, "NULL object key");
- goto error;
+ goto out;
}
next_token(s);
value = json_object_get(root, key);
if(unpack(s, value, ap))
- goto error;
-
- if(!(s->flags & JSON_UNPACK_ONLY))
- hashtable_set(key_set, (void *)key, NULL);
+ goto out;
+ hashtable_set(&key_set, (void *)key, NULL);
next_token(s);
}
- if(s->flags & JSON_UNPACK_ONLY)
- wildcard = 1;
+ if(strict == 0 && (s->flags & JSON_STRICT))
+ strict = 1;
- if(!wildcard && key_set->size != json_object_size(root)) {
- long diff = (long)json_object_size(root) - (long)key_set->size;
+ if(strict == 1 && key_set.size != json_object_size(root)) {
+ long diff = (long)json_object_size(root) - (long)key_set.size;
set_error(s, "%li object items left unpacked", diff);
- goto error;
+ goto out;
}
ret = 0;
-error:
- if(!(s->flags & JSON_UNPACK_ONLY))
- hashtable_destroy(key_set);
-
+out:
+ hashtable_close(&key_set);
return ret;
}
static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
{
size_t i = 0;
- int wildcard = 0;
+ int strict = 0;
if(!json_is_array(root)) {
set_error(s, "Expected array, got %s", type_name(root));
while(s->token != ']') {
json_t *value;
- if(wildcard) {
- set_error(s, "Expected ']' after '*', got '%c'", s->token);
+ if(strict != 0) {
+ set_error(s, "Expected ']' after '%c', got '%c'",
+ (strict == 1 ? '!' : '*'),
+ s->token);
return -1;
}
return -1;
}
- if(s->token == '*') {
- wildcard = 1;
+ if(s->token == '!' || s->token == '*') {
+ strict = (s->token == '!' ? 1 : -1);
next_token(s);
continue;
}
i++;
}
- if(s->flags & JSON_UNPACK_ONLY)
- wildcard = 1;
+ if(strict == 0 && (s->flags & JSON_STRICT))
+ strict = 1;
- if(!wildcard && i != json_array_size(root)) {
+ if(strict == 1 && i != json_array_size(root)) {
long diff = (long)json_array_size(root) - (long)i;
set_error(s, "%li array items left upacked", diff);
return -1;
return 0;
+ case 'I':
+ if(!json_is_integer(root)) {
+ set_error(s, "Expected integer, got %s", type_name(root));
+ return -1;
+ }
+
+ if(!(s->flags & JSON_VALIDATE_ONLY))
+ *va_arg(*ap, json_int_t*) = json_integer_value(root);
+
+ return 0;
+
case 'b':
if(!json_is_boolean(root)) {
set_error(s, "Expected true or false, got %s", type_name(root));
return 0;
case 'f':
- if(!json_is_number(root)) {
+ if(!json_is_real(root)) {
set_error(s, "Expected real, got %s", type_name(root));
return -1;
}
if(!(s->flags & JSON_VALIDATE_ONLY))
+ *va_arg(*ap, double*) = json_real_value(root);
+
+ return 0;
+
+ case 'F':
+ if(!json_is_number(root)) {
+ set_error(s, "Expected real or integer, got %s",
+ type_name(root));
+ return -1;
+ }
+
+ if(!(s->flags & JSON_VALIDATE_ONLY))
*va_arg(*ap, double*) = json_number_value(root);
return 0;
const char *fmt, va_list ap)
{
scanner_t s;
+ va_list ap_copy;
json_t *value;
jsonp_error_init(error, "");
if(!fmt || !*fmt) {
- jsonp_error_set(error, 1, 1, "Null or empty format string");
+ jsonp_error_set(error, -1, -1, 0, "Null or empty format string");
return NULL;
}
s.error = error;
s.flags = flags;
- s.fmt = fmt;
+ s.fmt = s.start = fmt;
s.line = 1;
s.column = 0;
next_token(&s);
- value = pack(&s, &ap);
+ va_copy(ap_copy, ap);
+ value = pack(&s, &ap_copy);
+ va_end(ap_copy);
next_token(&s);
if(s.token) {
const char *fmt, va_list ap)
{
scanner_t s;
+ va_list ap_copy;
jsonp_error_init(error, "");
if(!fmt || !*fmt) {
- jsonp_error_set(error, 1, 1, "Null or empty format string");
+ jsonp_error_set(error, -1, -1, 0, "Null or empty format string");
return -1;
}
s.error = error;
s.flags = flags;
- s.fmt = fmt;
+ s.fmt = s.start = fmt;
s.line = 1;
s.column = 0;
next_token(&s);
- if(unpack(&s, root, &ap))
+ va_copy(ap_copy, ap);
+ if(unpack(&s, root, &ap_copy)) {
+ va_end(ap_copy);
return -1;
+ }
+ va_end(ap_copy);
next_token(&s);
if(s.token) {
projects / jansson.git / blobdiff