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

Merge pull request #1 from sduclos/master

Browse Source 
Code Clean UP
pull/2/merge
Krzysztof Gabis 12 years ago
parent ee9be98974 684096eb0f
commit ede8ea497a
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. 97
      parson.c
  2. 83
      parson.h
  3. 4
      tests.c

97
parson.c
Unescape View File

@ -1,16 +1,16 @@
/* /*
Copyright (c) 2012 Krzysztof Gabis Copyright (c) 2012 Krzysztof Gabis
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -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);
@ -124,8 +125,8 @@ static int json_object_add(JSON_Object *object, const char *name, JSON_Value *va
if (!reallocated_ptr) { return 0;} if (!reallocated_ptr) { return 0;}
object->values = (JSON_Value**)reallocated_ptr; object->values = (JSON_Value**)reallocated_ptr;
object->capacity = new_capacity; object->capacity = new_capacity;
} }
if (json_object_get_value(object, name) != NULL) { return 0; } if (json_object_get_value(object, name) != NULL) { return 0; }
index = object->count; index = object->count;
object->names[index] = parson_strdup(name); object->names[index] = parson_strdup(name);
if (!object->names[index]) { return 0; } if (!object->names[index]) { return 0; }
@ -260,7 +261,7 @@ static char * copy_and_remove_whitespaces(const char *string) {
char current_char; char current_char;
if (!output_string) { return NULL; } if (!output_string) { return NULL; }
while (*string_ptr) { while (*string_ptr) {
current_char = *string_ptr; current_char = *string_ptr;
switch (current_char) { switch (current_char) {
case ' ': case '\r': case '\n': case '\t': case ' ': case '\r': case '\n': case '\t':
string_ptr++; string_ptr++;
@ -338,16 +339,16 @@ 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;
break; break;
} }
} else if (iscntrl(current_char)) { /* no control characters allowed */ } else if (iscntrl(current_char)) { /* no control characters allowed */
parson_free(output_string); parson_free(output_string);
return NULL; return NULL;
} }
*output_string_ptr = current_char; *output_string_ptr = current_char;
output_string_ptr++; output_string_ptr++;
string_ptr++; string_ptr++;
@ -365,7 +366,7 @@ static const char * parse_escaped_characters(const char *string) {
static const char * get_string(const char **string) { static const char * get_string(const char **string) {
char *quote_contents; char *quote_contents;
const char *parsed_string; const char *parsed_string;
const char *after_closing_quote_ptr = skip_string(*string); const char *after_closing_quote_ptr = skip_string(*string);
if (!after_closing_quote_ptr) { return NULL; } if (!after_closing_quote_ptr) { return NULL; }
quote_contents = parson_strndup(*string + 1, after_closing_quote_ptr - *string - 2); quote_contents = parson_strndup(*string + 1, after_closing_quote_ptr - *string - 2);
if (!quote_contents) { return NULL; } if (!quote_contents) { return NULL; }
@ -431,7 +432,7 @@ static JSON_Value * parse_object_value(const char **string, size_t nesting) {
json_value_free(output_value); json_value_free(output_value);
return NULL; return NULL;
} }
parson_free(new_key); parson_free(new_key);
if (**string != ',') { break; } if (**string != ',') { break; }
(*string)++; (*string)++;
} }
@ -461,7 +462,7 @@ static JSON_Value * parse_array_value(const char **string, size_t nesting) {
return NULL; return NULL;
} }
if (**string != ',') { break; } if (**string != ',') { break; }
(*string)++; (*string)++;
} }
if (**string != ']') { if (**string != ']') {
json_value_free(output_value); json_value_free(output_value);
@ -479,8 +480,8 @@ static JSON_Value * parse_string_value(const char **string) {
static JSON_Value * parse_boolean_value(const char **string) { static JSON_Value * parse_boolean_value(const char **string) {
size_t true_token_size = sizeof_token("true"); size_t true_token_size = sizeof_token("true");
size_t false_token_size = sizeof_token("false"); size_t false_token_size = sizeof_token("false");
if (strncmp("true", *string, true_token_size) == 0) { if (strncmp("true", *string, true_token_size) == 0) {
*string += true_token_size; *string += true_token_size;
return json_value_init_boolean(1); return json_value_init_boolean(1);
} else if (strncmp("false", *string, false_token_size) == 0) { } else if (strncmp("false", *string, false_token_size) == 0) {
@ -504,7 +505,7 @@ static JSON_Value * parse_number_value(const char **string) {
output_value = NULL; output_value = NULL;
} }
free((void*)number_string); free((void*)number_string);
return output_value; return output_value;
} }
static JSON_Value * parse_null_value(const char **string) { static JSON_Value * parse_null_value(const char **string) {
@ -521,7 +522,7 @@ JSON_Value * json_parse_file(const char *filename) {
FILE *fp = fopen(filename, "r"); FILE *fp = fopen(filename, "r");
size_t file_size; size_t file_size;
char *file_contents; char *file_contents;
JSON_Value *output_value; JSON_Value *output_value;
if (!fp) { return NULL; } if (!fp) { return NULL; }
fseek(fp, 0L, SEEK_END); fseek(fp, 0L, SEEK_END);
file_size = ftell(fp); file_size = ftell(fp);
@ -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;
} }

83
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;
enum json_value_type { typedef enum JSON_value_t {
JSONError = 0, JSONError = 0,
JSONNull = 1, JSONNull = 1,
JSONString = 2, JSONString = 2,
JSONNumber = 3, JSONNumber = 3,
JSONObject = 4, JSONObject = 4,
JSONArray = 5, 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