1
This commit is contained in:
Alex Yatskov 2016-11-21 21:08:15 -08:00
parent fb8f86dde1
commit d3d7f760d0
2 changed files with 80 additions and 6 deletions

77
gaiji.c
View File

@ -21,6 +21,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "jansson/include/jansson.h"
#include "util.h" #include "util.h"
#include "gaiji.h" #include "gaiji.h"
@ -117,6 +119,67 @@ static void encode_sequence(char output[], int size, const char utf8[]) {
strncat(output, "}", size); strncat(output, "}", size);
} }
static void parse_entry(Gaiji_Entry* entry, const json_t* entry_json) {
entry->code = json_integer_value(json_array_get(entry_json, 0));
const char* utf8 = json_string_value(json_array_get(entry_json, 1));
if (utf8 == NULL) {
*entry->utf8 = 0;
}
else {
strncpy(entry->utf8, utf8, ARRSIZE(entry->utf8));
entry->utf8[ARRSIZE(entry->utf8) - 1] = 0;
}
}
static void parse_entries(Gaiji_Entry** entries, int* count, const json_t* entry_array_json) {
*count = json_array_size(entry_array_json);
if (*count == 0) {
*entries = NULL;
}
else {
*entries = malloc(sizeof(Gaiji_Entry) * *count);
for (int i = 0; i < *count; ++i) {
parse_entry(*entries + i, json_array_get(entry_array_json, i));
}
}
}
static void parse_table(Gaiji_Table* table, const json_t* table_json) {
const char* name = json_string_value(json_object_get(table_json, "name"));
if (name == NULL) {
*table->name = 0;
}
else {
strncpy(table->name, name, ARRSIZE(table->name));
table->name[ARRSIZE(table->name) - 1] = 0;
}
parse_entries(
(Gaiji_Entry**)&table->table_wide,
&table->count_wide,
json_object_get(table_json, "wide")
);
parse_entries(
(Gaiji_Entry**)&table->table_narrow,
&table->count_narrow,
json_object_get(table_json, "narrow")
);
}
static void parse_table_array(Gaiji_Context* context, const json_t* table_array_json) {
context->count = json_array_size(table_array_json);
if (context->count == 0) {
context->tables = NULL;
}
else {
context->tables = malloc(sizeof(Gaiji_Table) * context->count);
for (int i = 0; i < context->count; ++i) {
parse_table(context->tables + i, json_array_get(table_array_json, i));
}
}
}
/* /*
* Exported functions * Exported functions
*/ */
@ -210,13 +273,25 @@ void gaiji_stub_decode(char output[], int size, const char input[]) {
} }
bool gaiji_context_init(Gaiji_Context* context, const char path[]) { bool gaiji_context_init(Gaiji_Context* context, const char path[]) {
(void)path; json_t* table_array_json = json_load_file(path, 0, NULL);
if (table_array_json == NULL) {
context->count = 0; context->count = 0;
context->tables = NULL; context->tables = NULL;
return false;
}
parse_table_array(context, table_array_json);
json_decref(table_array_json);
return true; return true;
} }
void gaiji_context_destroy(Gaiji_Context* context) { void gaiji_context_destroy(Gaiji_Context* context) {
for (int i = 0; i < context->count; ++i) {
Gaiji_Table* table = context->tables + i;
free((Gaiji_Entry*)table->table_wide);
free((Gaiji_Entry*)table->table_narrow);
}
free(context->tables); free(context->tables);
context->tables = NULL; context->tables = NULL;
context->count = 0; context->count = 0;

View File

@ -25,9 +25,8 @@
* Constants * Constants
*/ */
#define MAX_UTF8_BYTES 9 #define MAX_UTF8_BYTES 10
#define MAX_STUB_BYTES 32 #define MAX_STUB_BYTES 32
#define MAX_TABLE_NAME 256
/* /*
* Types * Types
@ -39,7 +38,7 @@ typedef struct {
} Gaiji_Entry; } Gaiji_Entry;
typedef struct { typedef struct {
char name[MAX_TABLE_NAME]; char name[256];
const Gaiji_Entry* table_wide; const Gaiji_Entry* table_wide;
int count_wide; int count_wide;
const Gaiji_Entry* table_narrow; const Gaiji_Entry* table_narrow;