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

added more code to read_object_in_cli_mode()

Browse Source
This commit is contained in:
hyung-hwan 2018-07-29 08:01:43 +00:00
parent 8c4b56002d
commit 9e3ddd1e2c
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/read.c
View File

@ -2226,17 +2226,42 @@ static int read_object_in_cli_mode (hcl_t* hcl)
if (begin_include(hcl) <= -1) return -1; if (begin_include(hcl) <= -1) return -1;
goto redo; goto redo;
case HCL_IOTOK_LPAREN: /* () */
flagv = 0;
LIST_FLAG_SET_CONCODE (flagv, HCL_CONCODE_XLIST);
start_list:
if (level >= HCL_TYPE_MAX(int))
{
/* the nesting level has become too deep */
hcl_setsynerr (hcl, HCL_SYNERR_NESTING, TOKEN_LOC(hcl), TOKEN_NAME(hcl));
return -1;
}
/* push some data to simulate recursion into
* a list literal or an array literal */
if (enter_list(hcl, flagv) == HCL_NULL) return -1;
level++;
if (LIST_FLAG_GET_CONCODE(flagv) == HCL_CONCODE_ARRAY) array_level++;
/* read the next token */
GET_TOKEN (hcl);
goto redo;
case HCL_IOTOK_EOL: case HCL_IOTOK_EOL:
case HCL_IOTOK_RPAREN:
{ {
int oldflagv; int oldflagv;
//int concode; //int concode;
if (level <= 0) if (level <= 0)
{ {
unbalpbb:
hcl_setsynerr (hcl, HCL_SYNERR_UNBALPBB, TOKEN_LOC(hcl), HCL_NULL); hcl_setsynerr (hcl, HCL_SYNERR_UNBALPBB, TOKEN_LOC(hcl), HCL_NULL);
return -1; return -1;
} }
if (level == 1 && TOKEN_TYPE(hcl) != HCL_IOTOK_EOL) goto unbalpbb;
//concode = LIST_FLAG_GET_CONCODE(flagv); //concode = LIST_FLAG_GET_CONCODE(flagv);
obj = leave_list (hcl, &flagv, &oldflagv); obj = leave_list (hcl, &flagv, &oldflagv);
@ -2245,6 +2270,11 @@ static int read_object_in_cli_mode (hcl_t* hcl)
goto done ; goto done ;
} }
case HCL_IOTOK_NUMLIT:
case HCL_IOTOK_RADNUMLIT:
obj = string_to_num(hcl, TOKEN_NAME(hcl), TOKEN_TYPE(hcl) == HCL_IOTOK_RADNUMLIT);
break;
case HCL_IOTOK_STRLIT: case HCL_IOTOK_STRLIT:
case HCL_IOTOK_IDENT: case HCL_IOTOK_IDENT:
obj = hcl_makestring(hcl, TOKEN_NAME_PTR(hcl), TOKEN_NAME_LEN(hcl), 0); obj = hcl_makestring(hcl, TOKEN_NAME_PTR(hcl), TOKEN_NAME_LEN(hcl), 0);
@ -2254,11 +2284,11 @@ static int read_object_in_cli_mode (hcl_t* hcl)
if (!obj) return -1; if (!obj) return -1;
/* check if we are at the top level */ /* check if we are at the top level */
//if (level <= 0) break; /* yes */ if (level <= 0) break; /* yes */
/* if not, append the element read into the current list. /* if not, append the element read into the current list.
* if we are not at the top level, we must be in a list */ * if we are not at the top level, we must be in a list */
//if (chain_to_list(hcl, obj) == HCL_NULL) return -1; if (chain_to_list(hcl, obj) == HCL_NULL) return -1;
clear_comma_colon_flag (hcl); clear_comma_colon_flag (hcl);
/* read the next token */ /* read the next token */