Skip to content

Commit

Permalink
ejson 0.9.12: adjust API names
Browse files Browse the repository at this point in the history
  • Loading branch information
@ziyht
ziyht committed Apr 30, 2019
1 parent afc32af commit f2d2e07
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 112 deletions.
36 changes: 18 additions & 18 deletions src/libs/etools/ejson.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define _CRT_SECURE_NO_WARNINGS
#endif

#define EJSON_VERSION "ejson 0.9.12" // adjust API
#define EJSON_VERSION "ejson 0.9.12" // adjust API names

#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -1351,23 +1351,23 @@ eobj ejson_addP(eobj r, constr key, conptr ptr ) { _ejsn_t b = {{0}, {.s = (cs
eobj ejson_addR(eobj r, constr key, uint len ) { _ejsn_t b = {{0}, {.s = (cstr)key}, {._len = len + 1, ._typ = {.t_coe = _EJSON_COE_RAW }}, {0}}; eobj o = __ejson_makeRoom(_eo_rn(r), _n_o(&b), 0, 0); if(o) { _eo_wipeR(o, len ); _eo_typeco (o) = _EJSON_CO_RAW ; } return o; }
eobj ejson_addO(eobj r, constr key, eobj o ) { is0_ret(r, 0); return __ejson_addO(_eo_rn(r), key, o); }

eobj ejson_raddJ(eobj r, constr rawk, constr key, constr json) { return ejson_addJ(_getObjByRawk(_eo_rn(r), rawk), key, json); }
eobj ejson_raddT(eobj r, constr rawk, constr key, etypeo type) { return ejson_addT(_getObjByRawk(_eo_rn(r), rawk), key, type); }
eobj ejson_raddI(eobj r, constr rawk, constr key, i64 val ) { return ejson_addI(_getObjByRawk(_eo_rn(r), rawk), key, val ); }
eobj ejson_raddF(eobj r, constr rawk, constr key, f64 val ) { return ejson_addF(_getObjByRawk(_eo_rn(r), rawk), key, val ); }
eobj ejson_raddS(eobj r, constr rawk, constr key, constr str ) { return ejson_addS(_getObjByRawk(_eo_rn(r), rawk), key, str ); }
eobj ejson_raddP(eobj r, constr rawk, constr key, conptr ptr ) { return ejson_addP(_getObjByRawk(_eo_rn(r), rawk), key, ptr ); }
eobj ejson_raddR(eobj r, constr rawk, constr key, uint len ) { return ejson_addR(_getObjByRawk(_eo_rn(r), rawk), key, len ); }
eobj ejson_raddO(eobj r, constr rawk, constr key, eobj o ) { return ejson_addO(_getObjByRawk(_eo_rn(r), rawk), key, o ); }

eobj ejson_kaddJ(eobj r, constr keys, constr key, constr json) { return ejson_addJ(_getObjByKeys(_eo_rn(r), keys), key, json); }
eobj ejson_kaddT(eobj r, constr keys, constr key, etypeo type) { return ejson_addT(_getObjByKeys(_eo_rn(r), keys), key, type); }
eobj ejson_kaddI(eobj r, constr keys, constr key, i64 val ) { return ejson_addI(_getObjByKeys(_eo_rn(r), keys), key, val ); }
eobj ejson_kaddF(eobj r, constr keys, constr key, f64 val ) { return ejson_addF(_getObjByKeys(_eo_rn(r), keys), key, val ); }
eobj ejson_kaddS(eobj r, constr keys, constr key, constr str ) { return ejson_addS(_getObjByKeys(_eo_rn(r), keys), key, str ); }
eobj ejson_kaddP(eobj r, constr keys, constr key, conptr ptr ) { return ejson_addP(_getObjByKeys(_eo_rn(r), keys), key, ptr ); }
eobj ejson_kaddR(eobj r, constr keys, constr key, uint len ) { return ejson_addR(_getObjByKeys(_eo_rn(r), keys), key, len ); }
eobj ejson_kaddO(eobj r, constr keys, constr key, eobj o ) { return ejson_addO(_getObjByKeys(_eo_rn(r), keys), key, o ); }
eobj ejsonr_addJ(eobj r, constr rawk, constr key, constr json) { return ejson_addJ(_getObjByRawk(_eo_rn(r), rawk), key, json); }
eobj ejsonr_addT(eobj r, constr rawk, constr key, etypeo type) { return ejson_addT(_getObjByRawk(_eo_rn(r), rawk), key, type); }
eobj ejsonr_addI(eobj r, constr rawk, constr key, i64 val ) { return ejson_addI(_getObjByRawk(_eo_rn(r), rawk), key, val ); }
eobj ejsonr_addF(eobj r, constr rawk, constr key, f64 val ) { return ejson_addF(_getObjByRawk(_eo_rn(r), rawk), key, val ); }
eobj ejsonr_addS(eobj r, constr rawk, constr key, constr str ) { return ejson_addS(_getObjByRawk(_eo_rn(r), rawk), key, str ); }
eobj ejsonr_addP(eobj r, constr rawk, constr key, conptr ptr ) { return ejson_addP(_getObjByRawk(_eo_rn(r), rawk), key, ptr ); }
eobj ejsonr_addR(eobj r, constr rawk, constr key, uint len ) { return ejson_addR(_getObjByRawk(_eo_rn(r), rawk), key, len ); }
eobj ejsonr_addO(eobj r, constr rawk, constr key, eobj o ) { return ejson_addO(_getObjByRawk(_eo_rn(r), rawk), key, o ); }

eobj ejsonk_addJ(eobj r, constr keys, constr key, constr json) { return ejson_addJ(_getObjByKeys(_eo_rn(r), keys), key, json); }
eobj ejsonk_addT(eobj r, constr keys, constr key, etypeo type) { return ejson_addT(_getObjByKeys(_eo_rn(r), keys), key, type); }
eobj ejsonk_addI(eobj r, constr keys, constr key, i64 val ) { return ejson_addI(_getObjByKeys(_eo_rn(r), keys), key, val ); }
eobj ejsonk_addF(eobj r, constr keys, constr key, f64 val ) { return ejson_addF(_getObjByKeys(_eo_rn(r), keys), key, val ); }
eobj ejsonk_addS(eobj r, constr keys, constr key, constr str ) { return ejson_addS(_getObjByKeys(_eo_rn(r), keys), key, str ); }
eobj ejsonk_addP(eobj r, constr keys, constr key, conptr ptr ) { return ejson_addP(_getObjByKeys(_eo_rn(r), keys), key, ptr ); }
eobj ejsonk_addR(eobj r, constr keys, constr key, uint len ) { return ejson_addR(_getObjByKeys(_eo_rn(r), keys), key, len ); }
eobj ejsonk_addO(eobj r, constr keys, constr key, eobj o ) { return ejson_addO(_getObjByKeys(_eo_rn(r), keys), key, o ); }

static eobj __ejson_makeRoom(_ejsr r, eobj in, bool overwrite, bool find)
{
Expand Down
18 changes: 0 additions & 18 deletions src/libs/etools/ejson.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,6 @@ eobj ejson_addS(eobj r, constr key, constr str ); // add a STR
eobj ejson_addR(eobj r, constr key, uint len ); // add a RAW obj to root, alloc a new space(len) for data
eobj ejson_addO(eobj r, constr key, eobj o ); // add an exist obj to obj

eobj ejson_raddJ(eobj r, constr rawk, constr key, constr json); // add an json obj to specific obj in root via rawk
eobj ejson_raddT(eobj r, constr rawk, constr key, etypeo type); // add an type obj to specific obj in root via rawk, only support EFLASE, ETURE, ENULL, EARR, EOBJ
eobj ejson_raddI(eobj r, constr rawk, constr key, i64 val ); // add an NUM obj to specific obj in root via rawk
eobj ejson_raddF(eobj r, constr rawk, constr key, f64 val ); // add an NUM obj to specific obj in root via rawk
eobj ejson_raddP(eobj r, constr rawk, constr key, conptr ptr ); // add a PTR obj to specific obj in root via rawk
eobj ejson_raddS(eobj r, constr rawk, constr key, constr str ); // add a STR obj to specific obj in root via rawk
eobj ejson_raddR(eobj r, constr rawk, constr key, uint len ); // add a RAW obj to specific obj in root via rawk, alloc a new space(len) for data
eobj ejson_raddO(eobj r, constr rawk, constr key, eobj o ); // add an exist obj to specific obj in root via rawk

eobj ejson_kaddJ(eobj r, constr keys, constr key, constr json); // add an json obj to specific obj in root via path
eobj ejson_kaddT(eobj r, constr keys, constr key, etypeo type); // add an type obj to specific obj in root via path, only support EFLASE, ETURE, ENULL, EARR, EOBJ
eobj ejson_kaddI(eobj r, constr keys, constr key, i64 val ); // add an NUM obj to specific obj in root via path
eobj ejson_kaddF(eobj r, constr keys, constr key, f64 val ); // add an NUM obj to specific obj in root via path
eobj ejson_kaddP(eobj r, constr keys, constr key, conptr ptr ); // add a PTR obj to specific obj in root via path
eobj ejson_kaddS(eobj r, constr keys, constr key, constr str ); // add a STR obj to specific obj in root via path
eobj ejson_kaddR(eobj r, constr keys, constr key, uint len ); // add a RAW obj to specific obj in root via path, alloc a new space(len) for data
eobj ejson_kaddO(eobj r, constr keys, constr key, eobj o ); // add an exist obj to specific obj in root via path

eobj ejsonr_addJ(eobj r, constr rawk, constr key, constr json); // add an json obj to specific obj in root via rawk
eobj ejsonr_addT(eobj r, constr rawk, constr key, etypeo type); // add an type obj to specific obj in root via rawk, only support EFLASE, ETURE, ENULL, EARR, EOBJ
eobj ejsonr_addI(eobj r, constr rawk, constr key, i64 val ); // add an NUM obj to specific obj in root via rawk
Expand Down
Loading

0 comments on commit f2d2e07

Please sign in to comment.