hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the need_comma function to take into account the xli->opt.cbs.pair_writable callback function

Browse Source
This commit is contained in:
hyung-hwan 2018-01-21 17:58:24 +00:00
parent b3a288affb
commit df76a61d3b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qse/lib/xli/write-json.c
View File

@ -83,12 +83,16 @@ static int write_indentation (qse_xli_t* xli, int depth)
return 0; return 0;
} }
static int need_comma (qse_xli_atom_t* start) static int need_comma (qse_xli_t* xli, qse_xli_atom_t* start)
{ {
qse_xli_atom_t* cur; qse_xli_atom_t* cur;
for (cur = start; cur; cur = cur->next) for (cur = start; cur; cur = cur->next)
{ {
if (cur->type == QSE_XLI_PAIR) return 1; if (cur->type == QSE_XLI_PAIR)
{
if (xli->opt.cbs.pair_writable && !xli->opt.cbs.pair_writable(xli, (qse_xli_pair_t*)cur)) continue;
return 1;
}
if (cur->type == QSE_XLI_EOF) return 0; /* if EOF encountered in the included file, i don't want a comma at the end of the file */ if (cur->type == QSE_XLI_EOF) return 0; /* if EOF encountered in the included file, i don't want a comma at the end of the file */
} }
return 0; return 0;
@ -189,7 +193,7 @@ static int write_list (qse_xli_t* xli, qse_xli_list_t* list, int depth)
} }
} }
if (need_comma(curatom->next) && write_to_current_stream(xli, QSE_T(","), 1, 0) <= -1) return -1; if (need_comma(xli, curatom->next) && write_to_current_stream(xli, QSE_T(","), 1, 0) <= -1) return -1;
if (write_to_current_stream(xli, QSE_T("\n"), 1, 0) <= -1) return -1; if (write_to_current_stream(xli, QSE_T("\n"), 1, 0) <= -1) return -1;
break; break;
} }
@ -228,7 +232,7 @@ static int write_list (qse_xli_t* xli, qse_xli_list_t* list, int depth)
case QSE_XLI_EOF: case QSE_XLI_EOF:
if (qse_xli_closeactivewstream(xli, &depth) <= -1) return -1; if (qse_xli_closeactivewstream(xli, &depth) <= -1) return -1;
if (need_comma(curatom->next) && write_to_current_stream(xli, QSE_T(","), 1, 0) <= -1) return -1; if (need_comma(xli, curatom->next) && write_to_current_stream(xli, QSE_T(","), 1, 0) <= -1) return -1;
if (write_to_current_stream(xli, QSE_T("\n"), 1, 0) <= -1) return -1; if (write_to_current_stream(xli, QSE_T("\n"), 1, 0) <= -1) return -1;
break; break;
} }