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

enhanced the feed processor to auto-terminate auto-forged xlist without semicolon if it comes right before the right brace
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
hyung-hwan
2023-11-29 17:12:21 +09:00
parent bb4786b6ca
commit e6f6d33e51
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/main.c
View File

@ -636,7 +636,7 @@ int main (int argc, char* argv[])
} }
} }
if (opt.ind >= argc) goto print_usage; if ((opt.ind + 1) != argc) goto print_usage;
#endif #endif
hcl = hcl_openstd(HCL_SIZEOF(xtn_t), HCL_NULL); hcl = hcl_openstd(HCL_SIZEOF(xtn_t), HCL_NULL);
@ -653,7 +653,7 @@ int main (int argc, char* argv[])
hcl_setoption (hcl, HCL_SYMTAB_SIZE, &tab_size); hcl_setoption (hcl, HCL_SYMTAB_SIZE, &tab_size);
tab_size = 5000; tab_size = 5000;
hcl_setoption (hcl, HCL_SYSDIC_SIZE, &tab_size); hcl_setoption (hcl, HCL_SYSDIC_SIZE, &tab_size);
tab_size = 600; tab_size = 600; /* TODO: choose a better stack size or make this user specifiable */
hcl_setoption (hcl, HCL_PROCSTK_SIZE, &tab_size); hcl_setoption (hcl, HCL_PROCSTK_SIZE, &tab_size);
} }

16
lib/read.c
View File

@ -1064,6 +1064,7 @@ static int feed_process_token (hcl_t* hcl)
{ {
hcl_frd_t* frd = &hcl->c->feed.rd; hcl_frd_t* frd = &hcl->c->feed.rd;
hcl_loc_t* list_loc = HCL_NULL; hcl_loc_t* list_loc = HCL_NULL;
int rbrace_again = 0;
/* TODO: frd->obj and frd->list_loc can become local variables in this function.. */ /* TODO: frd->obj and frd->list_loc can become local variables in this function.. */
/* this function composes an s-expression non-recursively /* this function composes an s-expression non-recursively
@ -1242,6 +1243,7 @@ static int feed_process_token (hcl_t* hcl)
int concode; int concode;
hcl_rstl_t* rstl; hcl_rstl_t* rstl;
semicolon:
/* the parent list must be inspected instead of the current feed/read status pointed to by frd. */ /* the parent list 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 || !(rstl->flagv & AUTO_FORGED))
@ -1283,11 +1285,19 @@ static int feed_process_token (hcl_t* hcl)
rstl = hcl->c->r.st; /* check the parent, not the current */ rstl = hcl->c->r.st; /* check the parent, not the current */
if (rstl && (rstl->flagv & AUTO_FORGED)) if (rstl && (rstl->flagv & AUTO_FORGED))
{ {
#if 0
/* the auto-forged list has not been terminated. it must be terminated closed first */ /* the auto-forged list has not been terminated. it must be terminated closed first */
hcl_setsynerrbfmt (hcl, HCL_SYNERR_SEMICOLON, TOKEN_LOC(hcl), TOKEN_NAME(hcl), "semicolon expected"); hcl_setsynerrbfmt (hcl, HCL_SYNERR_SEMICOLON, TOKEN_LOC(hcl), TOKEN_NAME(hcl), "semicolon expected");
goto oops; goto oops;
#else
/* if the expression inside {} is an auto-forged xlist expression and there is no semiclon provided,
* treat it as if the semiclon is placed before }. e.g. { printf "hello\n" } */
rbrace_again = 1;
goto semicolon;
#endif
} }
} }
rbrace_ok:
concode = LIST_FLAG_GET_CONCODE(frd->flagv); concode = LIST_FLAG_GET_CONCODE(frd->flagv);
if (concode == HCL_CONCODE_XLIST && (frd->flagv & AUTO_FORGED)) if (concode == HCL_CONCODE_XLIST && (frd->flagv & AUTO_FORGED))
@ -1523,6 +1533,12 @@ static int feed_process_token (hcl_t* hcl)
} }
ok: ok:
if (rbrace_again)
{
rbrace_again = 0;
list_loc = HCL_NULL;
goto rbrace_ok;
}
return 0; return 0;
oops: oops: