X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fpack_unpack.c;h=4fb8c1bc606c7ca0c245f78f2d991e81b351ad84;hb=50dc64a7af3664ca55ac74b393459a6d54e6958f;hp=8dc31fe7e1c445639f95c9db4672c5477aeef03e;hpb=2770dca2c091a9c5c898ff0922d905449111ff95;p=jansson.git

diff --git a/src/pack_unpack.c b/src/pack_unpack.c
index 8dc31fe..4fb8c1b 100644
--- a/src/pack_unpack.c
+++ b/src/pack_unpack.c
@@ -6,21 +6,32 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-
 #include <jansson.h>
 #include "jansson_private.h"
 
 typedef struct {
+    const char *start;
     const char *fmt;
     char token;
     json_error_t *error;
+    size_t flags;
     int line;
     int column;
 } scanner_t;
 
+static const char *type_names[] = {
+    "object",
+    "array",
+    "string",
+    "integer",
+    "real",
+    "true",
+    "false",
+    "null"
+};
+
+#define type_name(x) type_names[json_typeof(x)]
+
 static void next_token(scanner_t *s)
 {
     const char *t = s->fmt;
@@ -47,8 +58,12 @@ static void next_token(scanner_t *s)
 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);
 }
 
@@ -143,8 +158,7 @@ static json_t *pack(scanner_t *s, va_list *ap)
         case 's': /* string */
         {
             const char *str = va_arg(*ap, const char *);
-            if(!str)
-            {
+            if(!str) {
                 set_error(s, "NULL string");
                 return NULL;
             }
@@ -157,10 +171,13 @@ static json_t *pack(scanner_t *s, va_list *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 'f': /* double-precision float */
+        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));
 
         case 'O': /* a json_t object; increments refcount */
@@ -169,7 +186,7 @@ static json_t *pack(scanner_t *s, va_list *ap)
         case 'o': /* a json_t object; doesn't increment refcount */
             return va_arg(*ap, json_t *);
 
-        default: /* Whoops! */
+        default:
             set_error(s, "Unrecognized format character '%c'", s->token);
             return NULL;
     }
@@ -180,7 +197,13 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap);
 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;
 
     if(hashtable_init(&key_set, jsonp_hash_key, jsonp_key_equal, NULL, NULL)) {
@@ -189,8 +212,8 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
     }
 
     if(!json_is_object(root)) {
-        set_error(s, "Expected object, got %i", json_typeof(root));
-        goto error;
+        set_error(s, "Expected object, got %s", type_name(root));
+        goto out;
     }
     next_token(s);
 
@@ -198,51 +221,56 @@ static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
         const char *key;
         json_t *value;
 
-        if(wildcard) {
-            set_error(s, "Expected '}', 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;
+            goto out;
 
         hashtable_set(&key_set, (void *)key, NULL);
         next_token(s);
     }
 
-    if(!wildcard && key_set.size != json_object_size(root)) {
+    if(strict == 0 && (s->flags & JSON_STRICT))
+        strict = 1;
+
+    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:
+out:
     hashtable_close(&key_set);
     return ret;
 }
@@ -250,10 +278,10 @@ error:
 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 %d", json_typeof(root));
+        set_error(s, "Expected array, got %s", type_name(root));
         return -1;
     }
     next_token(s);
@@ -261,8 +289,10 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
     while(s->token != ']') {
         json_t *value;
 
-        if(wildcard) {
-            set_error(s, "Expected ']', got '%c'", s->token);
+        if(strict != 0) {
+            set_error(s, "Expected ']' after '%c', got '%c'",
+                      (strict == 1 ? '!' : '*'),
+                      s->token);
             return -1;
         }
 
@@ -271,8 +301,8 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
             return -1;
         }
 
-        if(s->token == '*') {
-            wildcard = 1;
+        if(s->token == '!' || s->token == '*') {
+            strict = (s->token == '!' ? 1 : -1);
             next_token(s);
             continue;
         }
@@ -290,7 +320,10 @@ static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
         i++;
     }
 
-    if(!wildcard && i != json_array_size(root)) {
+    if(strict == 0 && (s->flags & JSON_STRICT))
+        strict = 1;
+
+    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;
@@ -310,70 +343,95 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap)
             return unpack_array(s, root, ap);
 
         case 's':
-        {
-            const char **str;
-
-            if(!json_is_string(root))
-            {
-                set_error(s, "Type mismatch! Object (%i) wasn't a string.",
-                          json_typeof(root));
+            if(!json_is_string(root)) {
+                set_error(s, "Expected string, got %s", type_name(root));
                 return -1;
             }
 
-            str = va_arg(*ap, const char **);
-            if(!str) {
-                set_error(s, "Passed a NULL string pointer!");
+            if(!(s->flags & JSON_VALIDATE_ONLY)) {
+                const char **str;
+
+                str = va_arg(*ap, const char **);
+                if(!str) {
+                    set_error(s, "NULL string");
+                    return -1;
+                }
+
+                *str = json_string_value(root);
+            }
+            return 0;
+
+        case 'i':
+            if(!json_is_integer(root)) {
+                set_error(s, "Expected integer, got %s", type_name(root));
                 return -1;
             }
 
-            *str = json_string_value(root);
+            if(!(s->flags & JSON_VALIDATE_ONLY))
+                *va_arg(*ap, int*) = json_integer_value(root);
+
             return 0;
-        }
 
-        case 'i':
-            if(!json_is_integer(root))
-            {
-                set_error(s, "Type mismatch! Object (%i) wasn't an integer.",
-                      json_typeof(root));
+        case 'I':
+            if(!json_is_integer(root)) {
+                set_error(s, "Expected integer, got %s", type_name(root));
                 return -1;
             }
-            *va_arg(*ap, int*) = json_integer_value(root);
+
+            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, "Type mismatch! Object (%i) wasn't a boolean.",
-                      json_typeof(root));
+            if(!json_is_boolean(root)) {
+                set_error(s, "Expected true or false, got %s", type_name(root));
                 return -1;
             }
-            *va_arg(*ap, int*) = json_is_true(root);
+
+            if(!(s->flags & JSON_VALIDATE_ONLY))
+                *va_arg(*ap, int*) = json_is_true(root);
+
             return 0;
 
         case 'f':
-            if(!json_is_number(root))
-            {
-                set_error(s, "Type mismatch! Object (%i) wasn't a real.",
-                      json_typeof(root));
+            if(!json_is_real(root)) {
+                set_error(s, "Expected real, got %s", type_name(root));
                 return -1;
             }
-            *va_arg(*ap, double*) = json_number_value(root);
+
+            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;
 
         case 'O':
-            json_incref(root);
+            if(!(s->flags & JSON_VALIDATE_ONLY))
+                json_incref(root);
             /* Fall through */
 
         case 'o':
-            *va_arg(*ap, json_t**) = root;
+            if(!(s->flags & JSON_VALIDATE_ONLY))
+                *va_arg(*ap, json_t**) = root;
+
             return 0;
 
         case 'n':
-            /* Don't assign, just validate */
-            if(!json_is_null(root))
-            {
-                set_error(s, "Type mismatch! Object (%i) wasn't null.",
-                      json_typeof(root));
+            /* Never assign, just validate */
+            if(!json_is_null(root)) {
+                set_error(s, "Expected null, got %s", type_name(root));
                 return -1;
             }
             return 0;
@@ -384,32 +442,34 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap)
     }
 }
 
-json_t *json_pack(json_error_t *error, const char *fmt, ...)
+json_t *json_vpack_ex(json_error_t *error, size_t flags,
+                      const char *fmt, va_list ap)
 {
     scanner_t s;
+    va_list ap_copy;
     json_t *value;
-    va_list ap;
 
     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.fmt = fmt;
+    s.flags = flags;
+    s.fmt = s.start = fmt;
     s.line = 1;
     s.column = 0;
 
     next_token(&s);
-
-    va_start(ap, fmt);
-    value = pack(&s, &ap);
-    va_end(ap);
+    va_copy(ap_copy, ap);
+    value = pack(&s, &ap_copy);
+    va_end(ap_copy);
 
     next_token(&s);
     if(s.token) {
+        json_decref(value);
         set_error(&s, "Garbage after format string");
         return NULL;
     }
@@ -417,32 +477,57 @@ json_t *json_pack(json_error_t *error, const char *fmt, ...)
     return value;
 }
 
-int json_unpack(json_t *root, json_error_t *error, const char *fmt, ...)
+json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
 {
-    scanner_t s;
+    json_t *value;
     va_list ap;
-    int result;
+
+    va_start(ap, fmt);
+    value = json_vpack_ex(error, flags, fmt, ap);
+    va_end(ap);
+
+    return value;
+}
+
+json_t *json_pack(const char *fmt, ...)
+{
+    json_t *value;
+    va_list ap;
+
+    va_start(ap, fmt);
+    value = json_vpack_ex(NULL, 0, fmt, ap);
+    va_end(ap);
+
+    return value;
+}
+
+int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
+                    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.fmt = fmt;
+    s.flags = flags;
+    s.fmt = s.start = fmt;
     s.line = 1;
     s.column = 0;
 
     next_token(&s);
 
-    va_start(ap, fmt);
-    result = unpack(&s, root, &ap);
-    va_end(ap);
-
-    if(result)
+    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) {
@@ -452,3 +537,27 @@ int json_unpack(json_t *root, json_error_t *error, const char *fmt, ...)
 
     return 0;
 }
+
+int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
+{
+    int ret;
+    va_list ap;
+
+    va_start(ap, fmt);
+    ret = json_vunpack_ex(root, error, flags, fmt, ap);
+    va_end(ap);
+
+    return ret;
+}
+
+int json_unpack(json_t *root, const char *fmt, ...)
+{
+    int ret;
+    va_list ap;
+
+    va_start(ap, fmt);
+    ret = json_vunpack_ex(root, NULL, 0, fmt, ap);
+    va_end(ap);
+
+    return ret;
+}