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. 29
      parson.c
  2. 55
      parson.h
  3. 4
      tests.c

29
parson.c
Unescape View File

@ -19,12 +19,13 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "parson.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stddef.h>
#include "parson.h"
#define STARTING_CAPACITY 10
#define MAX_CAPACITY 10000
@ -36,32 +37,32 @@
#define parson_realloc(a, b) realloc(a, b)
/* Type definitions */
union json_value_value {
const char * string;
typedef union json_value_value {
const char *string;
double number;
JSON_Object *object;
JSON_Array *array;
int boolean;
int null;
};
} json_value_value;
struct json_value_t {
enum json_value_type type;
union json_value_value value;
};
typedef struct json_value_t {
JSON_value_t type;
json_value_value value;
} json_value_t;
struct json_object_t {
typedef struct json_object_t {
const char **names;
JSON_Value **values;
size_t count;
size_t capacity;
};
} json_object_t;
struct json_array_t {
typedef struct json_array_t {
JSON_Value **items;
size_t count;
size_t capacity;
};
} json_array_t;
/* JSON Object */
static JSON_Object * json_object_init(void);
@ -641,7 +642,7 @@ size_t json_array_get_count(const JSON_Array *array) {
}
/* 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;
}

55
parson.h
Unescape View File

@ -27,15 +27,16 @@ extern "C"
{
#endif
#include <stddef.h> /* size_t */
/* Data structures, enums and typedefs */
struct json_object_t;
typedef struct json_object_t JSON_Object;
struct json_array_t;
typedef struct json_array_t JSON_Array;
struct json_value_t;
typedef struct json_value_t JSON_Value;
enum json_value_type {
typedef enum JSON_value_t {
JSONError = 0,
JSONNull = 1,
JSONString = 2,
@ -43,7 +44,7 @@ enum json_value_type {
JSONObject = 4,
JSONArray = 5,
JSONBoolean = 6
};
} JSON_value_t;
/* Parses first JSON value in a file, returns NULL in case of error */
JSON_Value * json_parse_file(const char *filename);
@ -52,41 +53,41 @@ JSON_Value * json_parse_file(const char *filename);
JSON_Value * json_parse_string(const char *string);
/* JSON Object */
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);
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_Array * json_object_get_array(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);
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_Array * json_object_get_array (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,
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
this way. */
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);
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_Array * json_object_dotget_array(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);
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_Array * json_object_dotget_array (const JSON_Object *object, const char *name);
int json_object_dotget_boolean(const JSON_Object *object, const char *name);
/* JSON Array */
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);
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_Array * json_array_get_array(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);
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_Array * json_array_get_array (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 */
enum json_value_type json_value_get_type(const JSON_Value *value);
JSON_Object * json_value_get_object(const JSON_Value *value);
JSON_Array * json_value_get_array(const JSON_Value *value);
const char * json_value_get_string(const JSON_Value *value);
double json_value_get_number(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_Array * json_value_get_array (const JSON_Value *value);
const char * json_value_get_string (const JSON_Value *value);
double json_value_get_number (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
}

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
THE SOFTWARE.
*/
#include "parson.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "parson.h"
#define TEST(A) printf("%-72s-",#A); \
if(A){puts(" OK");tests_passed++;} \

Write Preview
Loading…
Cancel
Save