Changes in lib/json.h [7a80925:5d749ad]

File:

• lib/json.h (modified) (8 diffs)

lib/json.h

@@ -1 +1 @@
 
-/* vim: set et ts=3 sw=3 sts=3 ft=c:
+/* vim: set et ts=3 sw=3 ft=c:
  *
- * Copyright (C) 2012, 2013, 2014 James McLaughlin et al.  All rights reserved.
+ * Copyright (C) 2012 James McLaughlin et al.  All rights reserved.
  * https://github.com/udp/json-parser
  *
@@ -36 +36 @@
 #endif
 
-#ifndef json_int_t
-   #ifndef _MSC_VER
-      #include <inttypes.h>
-      #define json_int_t int64_t
-   #else
-      #define json_int_t __int64
-   #endif
-#endif
-
-#include <stdlib.h>
-
 #ifdef __cplusplus
 
@@ -61 +50 @@
    int settings;
 
-   /* Custom allocator support (leave null to use malloc/free)
-    */
-
-   void * (* mem_alloc) (size_t, int zero, void * user_data);
-   void (* mem_free) (void *, void * user_data);
-
-   void * user_data;  /* will be passed to mem_alloc and mem_free */
-
 } json_settings;
 
-#define json_enable_comments  0x01
+#define json_relaxed_commas 1
 
 typedef enum
@@ -97 +78 @@
    {
       int boolean;
-      json_int_t integer;
+      long long integer;
       double dbl;
 
@@ -114 +95 @@
          {
             json_char * name;
-            unsigned int name_length;
-
             struct _json_value * value;
 
          } * values;
-
-         #if defined(__cplusplus) && __cplusplus >= 201103L
-         decltype(values) begin () const
-         {  return values;
-         }
-         decltype(values) end () const
-         {  return values + length;
-         }
-         #endif
 
       } object;
@@ -135 +105 @@
          unsigned int length;
          struct _json_value ** values;
-
-         #if defined(__cplusplus) && __cplusplus >= 201103L
-         decltype(values) begin () const
-         {  return values;
-         }
-         decltype(values) end () const
-         {  return values + length;
-         }
-         #endif
 
       } array;
@@ -202 +163 @@
          }
 
-         inline operator json_int_t () const
-         {  
-            switch (type)
-            {
-               case json_integer:
-                  return u.integer;
-
-               case json_double:
-                  return (json_int_t) u.dbl;
-
-               default:
-                  return 0;
-            };
+         inline operator long () const
+         {  return u.integer;
          }
 
          inline operator bool () const
-         {  
-            if (type != json_boolean)
-               return false;
-
-            return u.boolean != 0;
-         }
-
-         inline operator double () const
-         {  
-            switch (type)
-            {
-               case json_integer:
-                  return (double) u.integer;
-
-               case json_double:
-                  return u.dbl;
-
-               default:
-                  return 0;
-            };
+         {  return u.boolean != 0;
          }
 
@@ -244 +175 @@
 } json_value;
 
-json_value * json_parse (const json_char * json,
-                         size_t length);
+json_value * json_parse
+   (const json_char * json);
 
-#define json_error_max 128
-json_value * json_parse_ex (json_settings * settings,
-                            const json_char * json,
-                            size_t length,
-                            char * error);
+json_value * json_parse_ex
+   (json_settings * settings, const json_char * json, char * error);
 
 void json_value_free (json_value *);
-
-
-/* Not usually necessary, unless you used a custom mem_alloc and now want to
- * use a custom mem_free.
- */
-void json_value_free_ex (json_settings * settings,
-                         json_value *);