aboutsummaryrefslogtreecommitdiff
path: root/src/json-gram.y
diff options
context:
space:
mode:
Diffstat (limited to 'src/json-gram.y')
-rw-r--r--src/json-gram.y76
1 files changed, 38 insertions, 38 deletions
diff --git a/src/json-gram.y b/src/json-gram.y
index fe8996b..4f7da29 100644
--- a/src/json-gram.y
+++ b/src/json-gram.y
@@ -18,12 +18,12 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "grecs.h"
+#include "argot.h"
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include "json-gram.h"
-#include "grecs/json.h"
+#include "argot/json.h"
struct json_value *json_return_obj;
@@ -34,7 +34,7 @@ static void
pairfree(void *ptr)
{
struct json_pair *p = ptr;
- grecs_free(p->k);
+ argot_free(p->k);
json_value_free(p->v);
free(p);
}
@@ -65,9 +65,9 @@ objfree(void *ptr)
int b;
double n;
char *s;
- struct grecs_symtab *o;
+ struct argot_symtab *o;
struct json_value *obj;
- struct grecs_list *list;
+ struct argot_list *list;
struct json_pair *p;
}
%%
@@ -121,32 +121,32 @@ objects : /* empty */
objlist : object
{
- $$ = grecs_list_create();
- grecs_list_append($$, $1);
+ $$ = argot_list_create();
+ argot_list_append($$, $1);
}
| objlist ',' object
{
- grecs_list_append($1, $3);
+ argot_list_append($1, $3);
}
;
assoc : '{' pairs '}'
{
- struct grecs_symtab *s;
+ struct argot_symtab *s;
s = json_assoc_create();
if ($2) {
- struct grecs_list_entry *ep;
+ struct argot_list_entry *ep;
for (ep = $2->head; ep; ep = ep->next) {
struct json_pair *p = ep->data;
int install = 1;
- grecs_symtab_lookup_or_install(s, p, &install);
+ argot_symtab_lookup_or_install(s, p, &install);
if (install) {
p->k = NULL;
p->v = NULL;
}
}
- grecs_list_free($2);
+ argot_list_free($2);
}
$$ = s;
}
@@ -161,19 +161,19 @@ pairs : /* empty */
pairlist: pair
{
- $$ = grecs_list_create();
+ $$ = argot_list_create();
$$->free_entry = pairfree;
- grecs_list_append($$, $1);
+ argot_list_append($$, $1);
}
| pairlist ',' pair
{
- grecs_list_append($1, $3);
+ argot_list_append($1, $3);
}
;
pair : T_STRING ':' object
{
- struct json_pair *p = grecs_malloc(sizeof(*p));
+ struct json_pair *p = argot_malloc(sizeof(*p));
p->k = $1;
p->v = $3;
$$ = p;
@@ -191,7 +191,7 @@ yyerror(char const *s)
struct json_value *
json_value_create(int type)
{
- struct json_value *obj = grecs_zalloc(sizeof(*obj));
+ struct json_value *obj = argot_zalloc(sizeof(*obj));
obj->type = type;
return obj;
}
@@ -210,20 +210,20 @@ json_value_free(struct json_value *obj)
case json_number:
break;
case json_string:
- grecs_free(obj->v.s);
+ argot_free(obj->v.s);
break;
case json_arr:
for (i = 0; i < obj->v.a->oc; i++)
json_value_free(obj->v.a->ov[i]);
- grecs_free (obj->v.a->ov);
+ argot_free (obj->v.a->ov);
if (obj->v.a->ol) {
obj->v.a->ol->free_entry = objfree;
- grecs_list_free(obj->v.a->ol);
+ argot_list_free(obj->v.a->ol);
}
- grecs_free(obj->v.a);
+ argot_free(obj->v.a);
break;
case json_object:
- grecs_symtab_free(obj->v.o);
+ argot_symtab_free(obj->v.o);
}
free(obj);
}
@@ -232,7 +232,7 @@ static unsigned
json_st_hash(void *data, unsigned long n_buckets)
{
struct json_pair *p = data;
- return grecs_hash_string(p->k, n_buckets);
+ return argot_hash_string(p->k, n_buckets);
}
static int
@@ -261,10 +261,10 @@ json_st_free(void *ptr)
free(p);
}
-struct grecs_symtab *
+struct argot_symtab *
json_assoc_create()
{
- return grecs_symtab_create(sizeof(struct json_pair),
+ return argot_symtab_create(sizeof(struct json_pair),
json_st_hash,
json_st_cmp,
json_st_copy,
@@ -303,7 +303,7 @@ json_value_lookup(struct json_value *obj, const char *ident)
l = p - ident + 1;
if (l > qlen) {
qlen = l;
- qbuf = grecs_realloc(qbuf, qlen);
+ qbuf = argot_realloc(qbuf, qlen);
}
q = qbuf;
while (*ident) {
@@ -349,7 +349,7 @@ struct json_value *
json_new_string(char const *str)
{
struct json_value *j = json_value_create(json_string);
- j->v.s = grecs_strdup(str);
+ j->v.s = argot_strdup(str);
return j;
}
@@ -395,9 +395,9 @@ json_object_set(struct json_value *obj, char const *name,
}
pair.k = (char*) name;
pair.v = NULL;
- ret = grecs_symtab_lookup_or_install(obj->v.o, &pair, &install);
+ ret = argot_symtab_lookup_or_install(obj->v.o, &pair, &install);
if (install)
- ret->k = grecs_strdup(ret->k);
+ ret->k = argot_strdup(ret->k);
ret->v = val;
return 0;
}
@@ -413,7 +413,7 @@ json_object_get(struct json_value *obj, char const *name,
}
pair.k = (char*) name;
pair.v = NULL;
- ret = grecs_symtab_lookup_or_install(obj->v.o, &pair, NULL);
+ ret = argot_symtab_lookup_or_install(obj->v.o, &pair, NULL);
if (ret) {
*retval = ret->v;
return 0;
@@ -425,7 +425,7 @@ struct json_value *
json_new_array(void)
{
struct json_value *j = json_value_create(json_arr);
- j->v.a = grecs_malloc(sizeof(*j->v.a));
+ j->v.a = argot_malloc(sizeof(*j->v.a));
j->v.a->oc = 0;
j->v.a->ov = NULL;
j->v.a->ol = NULL;
@@ -439,27 +439,27 @@ json_array_size(struct json_value *j)
errno = EINVAL;
return 0;
}
- return j->v.a->oc + grecs_list_size(j->v.a->ol);
+ return j->v.a->oc + argot_list_size(j->v.a->ol);
}
void
json_array_flatten(struct json_value *j)
{
size_t size, i;
- struct grecs_list_entry *ep;
+ struct argot_list_entry *ep;
- size = grecs_list_size(j->v.a->ol);
+ size = argot_list_size(j->v.a->ol);
if (size == 0)
return;
- j->v.a->ov = grecs_realloc(j->v.a->ov,
+ j->v.a->ov = argot_realloc(j->v.a->ov,
(j->v.a->oc + size) * sizeof(j->v.a->ov[0]));
for (ep = j->v.a->ol->head, i = j->v.a->oc; ep; ep = ep->next, i++)
j->v.a->ov[i] = ep->data;
j->v.a->oc = i;
- grecs_list_clear(j->v.a->ol);
+ argot_list_clear(j->v.a->ol);
}
int
@@ -492,8 +492,8 @@ json_array_append(struct json_value *j, struct json_value *v)
}
if (!j->v.a->ol)
- j->v.a->ol = grecs_list_create();
- grecs_list_append(j->v.a->ol, v);
+ j->v.a->ol = argot_list_create();
+ argot_list_append(j->v.a->ol, v);
return 0;
}

Return to:

Send suggestions and report system problems to the System administrator.