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

fixed wrong semicolon handling and enhanced eol/semiclon handling
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hyung-hwan 2024-01-21 02:23:19 +09:00
parent f88c3a9c1f
commit e3120e20a2
6 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/read.c
View File

@ -1283,25 +1283,32 @@ static int feed_process_token (hcl_t* hcl)
hcl_rstl_t* rstl; hcl_rstl_t* rstl;
semicolon: semicolon:
/* the parent list must be inspected instead of the current feed/read status pointed to by frd. */ /* the parent list(rstl) must be inspected instead of the current
* feed/read status pointed to by frd. */
rstl = hcl->c->r.st; rstl = hcl->c->r.st;
if (!rstl || !(rstl->flagv & AUTO_FORGED)) if (!rstl) goto ok; /* redundant eol/semicolon */
{
#if 0
hcl_setsynerrbfmt (hcl, HCL_SYNERR_SEMICOLON, TOKEN_LOC(hcl), TOKEN_NAME(hcl), "unexpected semicolon");
goto oops;
#else
/* allow redundant semicolons without not balanced with preceding expression */
goto ok;
#endif
}
concode = LIST_FLAG_GET_CONCODE(rstl->flagv); concode = LIST_FLAG_GET_CONCODE(rstl->flagv);
if (!(rstl->flagv & AUTO_FORGED))
{
if (TOKEN_TYPE(hcl) == HCL_TOK_EOL) goto ok;
if (concode == HCL_CONCODE_BLOCK) goto ok;
hcl_setsynerr (hcl, HCL_SYNERR_SEMICOLON, TOKEN_LOC(hcl), HCL_NULL);
goto oops;
}
/* if auto-forged */
#if 0
/* TODO: remove this part if the assertion is confirmed true in the #else part... */
if (concode != HCL_CONCODE_XLIST && concode != HCL_CONCODE_MLIST && concode != HCL_CONCODE_ALIST) if (concode != HCL_CONCODE_XLIST && concode != HCL_CONCODE_MLIST && concode != HCL_CONCODE_ALIST)
{ {
hcl_setsynerr (hcl, HCL_SYNERR_UNBALPBB, TOKEN_LOC(hcl), HCL_NULL); hcl_setsynerr (hcl, HCL_SYNERR_UNBALPBB, TOKEN_LOC(hcl), HCL_NULL);
goto oops; goto oops;
} }
#else
HCL_ASSERT (hcl, concode == HCL_CONCODE_XLIST || concode == HCL_CONCODE_MLIST || concode == HCL_CONCODE_ALIST);
#endif
frd->obj = leave_list(hcl, &frd->list_loc, &frd->flagv, &oldflagv); frd->obj = leave_list(hcl, &frd->list_loc, &frd->flagv, &oldflagv);
frd->level--; frd->level--;

2
t/Makefile.am
View File

@ -16,6 +16,8 @@ check_ERRORS = \
do-02.err \ do-02.err \
feed-01.err \ feed-01.err \
feed-02.err \ feed-02.err \
feed-03.err \
feed-04.err \
mlist-01.err \ mlist-01.err \
var-01.err \ var-01.err \
var-02.err \ var-02.err \

2
t/Makefile.in
View File

@ -487,6 +487,8 @@ check_ERRORS = \
do-02.err \ do-02.err \
feed-01.err \ feed-01.err \
feed-02.err \ feed-02.err \
feed-03.err \
feed-04.err \
mlist-01.err \ mlist-01.err \
var-01.err \ var-01.err \
var-02.err \ var-02.err \

2
t/feed-02.err
View File

@ -3,6 +3,6 @@
"hello, world\n" "hello, world\n"
) )
(printf; ##ERROR: synax error - unexpected semicolon (printf; ##ERROR: syntax error - unexpected semicolon
"hello, world\n" "hello, world\n"
) )

9
t/feed-03.err Normal file
View File

@ -0,0 +1,9 @@
## semicolon inside #{} must raise a syntax error
a := #{
"k1":
"hello k1\n",
"k2":
"hello k2\n"; ##ERROR: syntax error - unexpected semicolon
};

11
t/feed-04.err Normal file
View File

@ -0,0 +1,11 @@
{
;;;
(do
(printf "hello\n")
(printf "hello\n")
);;
k := [10 ; 20 ]; ##ERROR: syntax error - unexpected semicolon
}