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

disallowed @include outside the outermost braces or brackets in the json format

Browse Source
This commit is contained in:
hyung-hwan 2018-01-11 09:36:15 +00:00
parent c756ae65e2
commit 7b1db985c5
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qse/lib/xli/read-json.c
View File

@ -825,23 +825,8 @@ static int read_root_list (qse_xli_t* xli)
while (1) while (1)
{ {
/*if (MATCH(xli, QSE_XLI_TOK_XINCLUDE)) /* NOTE: i don't support @include outside the outermost {} or [] */
{ if (MATCH(xli, QSE_XLI_TOK_LBRACK))
if (get_token(xli) <= -1) goto oops;
if (!MATCH(xli,QSE_XLI_TOK_SQSTR) && !MATCH(xli,QSE_XLI_TOK_DQSTR))
{
qse_xli_seterror (xli, QSE_XLI_EINCLSTR, QSE_NULL, &xli->tok.loc);
goto oops;
}
if (begin_include (xli) <= -1) goto oops;
}
else if (MATCH(xli, QSE_XLI_TOK_TEXT))
{
if (get_token(xli) <= -1) goto oops;
}
else*/if (MATCH(xli, QSE_XLI_TOK_LBRACK))
{ {
qse_xli_text_t* ta; qse_xli_text_t* ta;
xli->root->list.flags |= QSE_XLI_LIST_ARRAYED; xli->root->list.flags |= QSE_XLI_LIST_ARRAYED;
@ -873,23 +858,8 @@ static int read_root_list (qse_xli_t* xli)
while (1) while (1)
{ {
/*if (MATCH(xli, QSE_XLI_TOK_XINCLUDE)) /* NOTE: i don't support @include outside the outermost {} or [] */
{ if (MATCH(xli, QSE_XLI_TOK_RBRACK))
if (get_token(xli) <= -1) goto oops;
if (!MATCH(xli,QSE_XLI_TOK_SQSTR) && !MATCH(xli,QSE_XLI_TOK_DQSTR))
{
qse_xli_seterror (xli, QSE_XLI_EINCLSTR, QSE_NULL, &xli->tok.loc);
goto oops;
}
if (begin_include (xli) <= -1) goto oops;
}
else if (MATCH(xli, QSE_XLI_TOK_TEXT))
{
if (get_token(xli) <= -1) goto oops;
}
else*/if (MATCH(xli, QSE_XLI_TOK_RBRACK))
{ {
qse_xli_text_t* ta; qse_xli_text_t* ta;
if (!(xli->root->list.flags & QSE_XLI_LIST_ARRAYED)) goto oops_rbrac; if (!(xli->root->list.flags & QSE_XLI_LIST_ARRAYED)) goto oops_rbrac;