AIR
/
parson
mirror of https://github.com/kgabis/parson.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code clea up

Browse Source
pull/1/head
sduclos 12 years ago
parent ee9be98974
commit 684096eb0f
3 changed files with 94 additions and 90 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 67
      parson.c
  2. 85
      parson.h
  3. 4
      tests.c

67
parson.c
Unescape View File

@ -19,59 +19,60 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include "parson.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stddef.h>
#include "parson.h"
#define STARTING_CAPACITY 10 #define STARTING_CAPACITY 10
#define MAX_CAPACITY 10000 #define MAX_CAPACITY 10000
#define MAX_NESTING 19 #define MAX_NESTING 19
#define sizeof_token(a) (sizeof(a) - 1) #define sizeof_token(a) (sizeof(a) - 1)
#define parson_malloc(a) malloc(a) #define parson_malloc(a) malloc(a)
#define parson_free(a) free((void*)a) #define parson_free(a) free((void*)a)
#define parson_realloc(a, b) realloc(a, b) #define parson_realloc(a, b) realloc(a, b)
/* Type definitions */ /* Type definitions */
union json_value_value { typedef union json_value_value {
const char * string; const char *string;
double number; double number;
JSON_Object *object; JSON_Object *object;
JSON_Array *array; JSON_Array *array;
int boolean; int boolean;
int null; int null;
}; } json_value_value;
struct json_value_t { typedef struct json_value_t {
enum json_value_type type; JSON_value_t type;
union json_value_value value; json_value_value value;
}; } json_value_t;
struct json_object_t { typedef struct json_object_t {
const char **names; const char **names;
JSON_Value **values; JSON_Value **values;
size_t count; size_t count;
size_t capacity; size_t capacity;
}; } json_object_t;
struct json_array_t { typedef struct json_array_t {
JSON_Value **items; JSON_Value **items;
size_t count; size_t count;
size_t capacity; size_t capacity;
}; } json_array_t;
/* JSON Object */ /* JSON Object */
static JSON_Object * json_object_init(void); static JSON_Object * json_object_init(void);
static int json_object_add(JSON_Object *object, const char *name, JSON_Value *value); static int json_object_add(JSON_Object *object, const char *name, JSON_Value *value);
static void json_object_free(JSON_Object *object); static void json_object_free(JSON_Object *object);
/* JSON Array */ /* JSON Array */
static JSON_Array * json_array_init(void); static JSON_Array * json_array_init(void);
static int json_array_add(JSON_Array *array, JSON_Value *value); static int json_array_add(JSON_Array *array, JSON_Value *value);
static void json_array_free(JSON_Array *array); static void json_array_free(JSON_Array *array);
/* JSON Value */ /* JSON Value */
static JSON_Value * json_value_init_object(void); static JSON_Value * json_value_init_object(void);
@ -338,7 +339,7 @@ static const char * parse_escaped_characters(const char *string) {
current_char = ((utf_val | 0x80) & 0xBF); current_char = ((utf_val | 0x80) & 0xBF);
} }
string_ptr += 3; string_ptr += 3;
break; break;
default: default:
parson_free(output_string); parson_free(output_string);
return NULL; return NULL;
@ -641,7 +642,7 @@ size_t json_array_get_count(const JSON_Array *array) {
} }
/* JSON Value API */ /* JSON Value API */
enum json_value_type json_value_get_type(const JSON_Value *value) { JSON_value_t json_value_get_type(const JSON_Value *value) {
return value ? value->type : JSONError; return value ? value->type : JSONError;
} }

85
parson.h
Unescape View File

@ -27,66 +27,67 @@ extern "C"
{ {
#endif #endif
#include <stddef.h> /* size_t */
/* Data structures, enums and typedefs */ /* Data structures, enums and typedefs */
struct json_object_t;
typedef struct json_object_t JSON_Object; typedef struct json_object_t JSON_Object;
struct json_array_t; typedef struct json_array_t JSON_Array;
typedef struct json_array_t JSON_Array; typedef struct json_value_t JSON_Value;
struct json_value_t;
typedef struct json_value_t JSON_Value; typedef enum JSON_value_t {
JSONError = 0,
enum json_value_type { JSONNull = 1,
JSONError = 0, JSONString = 2,
JSONNull = 1, JSONNumber = 3,
JSONString = 2, JSONObject = 4,
JSONNumber = 3, JSONArray = 5,
JSONObject = 4,
JSONArray = 5,
JSONBoolean = 6 JSONBoolean = 6
}; } JSON_value_t;
/* Parses first JSON value in a file, returns NULL in case of error */ /* Parses first JSON value in a file, returns NULL in case of error */
JSON_Value * json_parse_file(const char *filename); JSON_Value * json_parse_file(const char *filename);
/* Parses first JSON value in a string, returns NULL in case of error */ /* Parses first JSON value in a string, returns NULL in case of error */
JSON_Value * json_parse_string(const char *string); JSON_Value * json_parse_string(const char *string);
/* JSON Object */ /* JSON Object */
JSON_Value * json_object_get_value(const JSON_Object *object, const char *name); JSON_Value * json_object_get_value (const JSON_Object *object, const char *name);
const char * json_object_get_string(const JSON_Object *object, const char *name); const char * json_object_get_string (const JSON_Object *object, const char *name);
double json_object_get_number(const JSON_Object *object, const char *name); double json_object_get_number (const JSON_Object *object, const char *name);
JSON_Object * json_object_get_object(const JSON_Object *object, const char *name); JSON_Object* json_object_get_object (const JSON_Object *object, const char *name);
JSON_Array * json_object_get_array(const JSON_Object *object, const char *name); JSON_Array * json_object_get_array (const JSON_Object *object, const char *name);
int json_object_get_boolean(const JSON_Object *object, const char *name); int json_object_get_boolean(const JSON_Object *object, const char *name);
/* dotget functions enable addressing values with dot notation in nested objects, /* dotget functions enable addressing values with dot notation in nested objects,
just like in structs or c++/java/c# objects (e.g. objectA.objectB.value). just like in structs or c++/java/c# objects (e.g. objectA.objectB.value).
Because valid names in JSON can contain dots, some values may be inaccessible Because valid names in JSON can contain dots, some values may be inaccessible
this way. */ this way. */
JSON_Value * json_object_dotget_value(const JSON_Object *object, const char *name); JSON_Value * json_object_dotget_value (const JSON_Object *object, const char *name);
const char * json_object_dotget_string(const JSON_Object *object, const char *name); const char * json_object_dotget_string (const JSON_Object *object, const char *name);
double json_object_dotget_number(const JSON_Object *object, const char *name); double json_object_dotget_number (const JSON_Object *object, const char *name);
JSON_Object * json_object_dotget_object(const JSON_Object *object, const char *name); JSON_Object* json_object_dotget_object (const JSON_Object *object, const char *name);
JSON_Array * json_object_dotget_array(const JSON_Object *object, const char *name); JSON_Array * json_object_dotget_array (const JSON_Object *object, const char *name);
int json_object_dotget_boolean(const JSON_Object *object, const char *name); int json_object_dotget_boolean(const JSON_Object *object, const char *name);
/* JSON Array */ /* JSON Array */
JSON_Value * json_array_get_value(const JSON_Array *array, size_t index); JSON_Value * json_array_get_value (const JSON_Array *array, size_t index);
const char * json_array_get_string(const JSON_Array *array, size_t index); const char * json_array_get_string (const JSON_Array *array, size_t index);
double json_array_get_number(const JSON_Array *array, size_t index); double json_array_get_number (const JSON_Array *array, size_t index);
JSON_Object * json_array_get_object(const JSON_Array *array, size_t index); JSON_Object* json_array_get_object (const JSON_Array *array, size_t index);
JSON_Array * json_array_get_array(const JSON_Array *array, size_t index); JSON_Array * json_array_get_array (const JSON_Array *array, size_t index);
int json_array_get_boolean(const JSON_Array *array, size_t index); int json_array_get_boolean(const JSON_Array *array, size_t index);
size_t json_array_get_count(const JSON_Array *array); size_t json_array_get_count (const JSON_Array *array);
/* JSON Value */ /* JSON Value */
enum json_value_type json_value_get_type(const JSON_Value *value); JSON_value_t json_value_get_type (const JSON_Value *value);
JSON_Object * json_value_get_object(const JSON_Value *value); JSON_Object* json_value_get_object (const JSON_Value *value);
JSON_Array * json_value_get_array(const JSON_Value *value); JSON_Array * json_value_get_array (const JSON_Value *value);
const char * json_value_get_string(const JSON_Value *value); const char * json_value_get_string (const JSON_Value *value);
double json_value_get_number(const JSON_Value *value); double json_value_get_number (const JSON_Value *value);
int json_value_get_boolean(const JSON_Value *value); int json_value_get_boolean(const JSON_Value *value);
void json_value_free(JSON_Value *value); void json_value_free (JSON_Value *value);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
tests.c
Unescape View File

@ -19,10 +19,12 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include "parson.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "parson.h"
#define TEST(A) printf("%-72s-",#A); \ #define TEST(A) printf("%-72s-",#A); \
if(A){puts(" OK");tests_passed++;} \ if(A){puts(" OK");tests_passed++;} \

Write Preview
Loading…
Cancel
Save