Compare commits

...

2 Commits

Author SHA1 Message Date
  Paul J. Davis f01770755d Allow encoding of improper lists 6 years ago
  Paul J. Davis c942525130 0.15.2 7 years ago
2 changed files with 12 additions and 7 deletions
Split View
  1. +11
    -6
      c_src/encoder.c
  2. +1
    -1
      src/jiffy.app.src

+ 11
- 6
c_src/encoder.c View File

@ -632,6 +632,7 @@ encode_iter(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
ERL_NIF_TERM stack;
ERL_NIF_TERM curr;
ERL_NIF_TERM item;
ERL_NIF_TERM tmp;
const ERL_NIF_TERM* tuple;
int arity;
ErlNifSInt64 lval;
@ -689,9 +690,11 @@ encode_iter(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
}
continue;
}
if(!enif_get_list_cell(env, curr, &item, &curr)) {
ret = enc_error(e, "internal_error");
goto done;
if(!enif_get_list_cell(env, curr, &item, &tmp)) {
item = curr;
curr = enif_make_list(env, 0);
} else {
curr = tmp;
}
if(!enif_get_tuple(env, item, &arity, &tuple)) {
ret = enc_obj_error(e, "invalid_object_member", item);
@ -732,9 +735,11 @@ encode_iter(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
ret = enc_error(e, "internal_error");
goto done;
}
if(!enif_get_list_cell(env, curr, &item, &curr)) {
ret = enc_error(e, "internal_error");
goto done;
if(!enif_get_list_cell(env, curr, &item, &tmp)) {
item = curr;
curr = enif_make_list(env, 0);
} else {
curr = tmp;
}
stack = enif_make_list_cell(env, curr, stack);
stack = enif_make_list_cell(env, e->atoms->ref_array, stack);

+ 1
- 1
src/jiffy.app.src View File

@ -1,6 +1,6 @@
{application, jiffy, [
{description, "JSON Decoder/Encoder."},
{vsn, "0.15.1"},
{vsn, "0.15.2"},
{registered, []},
{applications, [kernel, stdlib, xmerl]},
{maintainers, ["Paul J. Davis"]},

Loading…
Cancel
Save