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

add a bit of code into the cli mode reader

Browse Source
This commit is contained in:
hyung-hwan
2018-07-31 15:51:16 +00:00
parent da36b2deab
commit a2d4d37d2e
1 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
hcl/lib/read.c
View File

@ -2227,6 +2227,10 @@ static int read_object_in_cli_mode (hcl_t* hcl)
goto redo; goto redo;
case HCL_IOTOK_LPAREN: /* () */ case HCL_IOTOK_LPAREN: /* () */
{
int first = 1;
redo_lparen:
flagv = 0; flagv = 0;
LIST_FLAG_SET_CONCODE (flagv, HCL_CONCODE_XLIST); LIST_FLAG_SET_CONCODE (flagv, HCL_CONCODE_XLIST);
SET_TOKEN_TYPE (hcl, HCL_IOTOK_EOL); /* to have get_token() to ignore immediate <EOL> after ( */ SET_TOKEN_TYPE (hcl, HCL_IOTOK_EOL); /* to have get_token() to ignore immediate <EOL> after ( */
@ -2242,15 +2246,42 @@ static int read_object_in_cli_mode (hcl_t* hcl)
* a list literal or an array literal */ * a list literal or an array literal */
if (enter_list(hcl, flagv) == HCL_NULL) return -1; if (enter_list(hcl, flagv) == HCL_NULL) return -1;
level++; level++;
if (LIST_FLAG_GET_CONCODE(flagv) == HCL_CONCODE_ARRAY) array_level++; //if (LIST_FLAG_GET_CONCODE(flagv) == HCL_CONCODE_ARRAY) array_level++;
if (first)
{
first = 0;
goto redo_lparen;
}
/* read the next token */ /* read the next token */
GET_TOKEN (hcl); GET_TOKEN (hcl);
goto redo; goto redo;
}
case HCL_IOTOK_EOL: case HCL_IOTOK_EOL:
{
int oldflagv;
//int concode;
if (level <= 0)
{
hcl_setsynerr (hcl, HCL_SYNERR_UNBALPBB, TOKEN_LOC(hcl), HCL_NULL);
return -1;
}
//concode = LIST_FLAG_GET_CONCODE(flagv);
obj = leave_list (hcl, &flagv, &oldflagv);
level--;
//if (LIST_FLAG_GET_CONCODE(oldflagv) == HCL_CONCODE_ARRAY) array_level--;
break;
}
case HCL_IOTOK_RPAREN: case HCL_IOTOK_RPAREN:
{ {
int first = 1;
int oldflagv; int oldflagv;
//int concode; //int concode;
@ -2261,22 +2292,22 @@ static int read_object_in_cli_mode (hcl_t* hcl)
return -1; return -1;
} }
if (level == 1 && TOKEN_TYPE(hcl) != HCL_IOTOK_EOL) goto unbalpbb; redo_rparen:
//concode = LIST_FLAG_GET_CONCODE(flagv); //concode = LIST_FLAG_GET_CONCODE(flagv);
obj = leave_list (hcl, &flagv, &oldflagv); obj = leave_list (hcl, &flagv, &oldflagv);
level--; level--;
//if (LIST_FLAG_GET_CONCODE(oldflagv) == HCL_CONCODE_ARRAY) array_level--; //if (LIST_FLAG_GET_CONCODE(oldflagv) == HCL_CONCODE_ARRAY) array_level--;
goto done ;
if (first)
{
first = 0;
goto redo_rparen;
}
break;
} }
case HCL_IOTOK_LBRACE:
case HCL_IOTOK_RBRACE:
case HCL_IOTOK_NUMLIT: case HCL_IOTOK_NUMLIT:
case HCL_IOTOK_RADNUMLIT: case HCL_IOTOK_RADNUMLIT:
obj = string_to_num(hcl, TOKEN_NAME(hcl), TOKEN_TYPE(hcl) == HCL_IOTOK_RADNUMLIT); obj = string_to_num(hcl, TOKEN_NAME(hcl), TOKEN_TYPE(hcl) == HCL_IOTOK_RADNUMLIT);