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

improved file inclusion for the feed-based reader

Browse Source
This commit is contained in:
hyung-hwan 2022-07-28 14:20:28 +00:00
parent 2543b0d634
commit 51c3145b88
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/hcl-prv.h
View File

@ -633,6 +633,7 @@ struct hcl_frd_t
int array_level; int array_level;
int flagv; int flagv;
int expect_include_file; int expect_include_file;
int do_include_file;
hcl_cnode_t* obj; hcl_cnode_t* obj;
}; };

26
lib/read.c
View File

@ -2367,7 +2367,12 @@ static int feed_process_token (hcl_t* hcl)
} }
frd->expect_include_file = 0; frd->expect_include_file = 0;
if (feed_begin_include(hcl) <= -1) goto oops;
/* indicate that the file inclusion should be performed soon.
* don't perform actual inclusion here so that the return value of
* feed_char() advances the input pointers properly. */
frd->do_include_file = 1;
goto ok; goto ok;
} }
@ -3722,11 +3727,6 @@ static int feed_from_included (hcl_t* hcl)
if (x <= -1) return -1; if (x <= -1) return -1;
#else #else
feed_end_include (hcl); feed_end_include (hcl);
if (hcl->c->curinp != &hcl->c->inarg)
{
/* advance the pointer that should have been done when the include file name has been read */
hcl->c->curinp->b.pos++;
}
continue; continue;
#endif #endif
} }
@ -3739,6 +3739,14 @@ static int feed_from_included (hcl_t* hcl)
x = feed_char(hcl, lc); x = feed_char(hcl, lc);
if (x <= -1) return -1; if (x <= -1) return -1;
hcl->c->curinp->b.pos += x; hcl->c->curinp->b.pos += x;
if (hcl->c->feed.rd.do_include_file)
{
/* perform delayed file inclusion. the token buffer must remain unchanged
* since do_include_file has been set to true in feed_process_token(). */
if (feed_begin_include(hcl) <= -1) return -1;
hcl->c->feed.rd.do_include_file = 0;
}
} }
while (hcl->c->curinp != &hcl->c->inarg); while (hcl->c->curinp != &hcl->c->inarg);
@ -3775,6 +3783,12 @@ int hcl_feed (hcl_t* hcl, const hcl_ooch_t* data, hcl_oow_t len)
i += x; /* x is supposed to be 1. otherwise, some characters may get skipped. */ i += x; /* x is supposed to be 1. otherwise, some characters may get skipped. */
} }
if (hcl->c->feed.rd.do_include_file)
{
if (feed_begin_include(hcl) <= -1) return -1;
hcl->c->feed.rd.do_include_file = 0;
}
if (hcl->c->curinp != &hcl->c->inarg && feed_from_included(hcl) <= -1) if (hcl->c->curinp != &hcl->c->inarg && feed_from_included(hcl) <= -1)
{ {
/* TODO: return the number of processed characters via an argument? */ /* TODO: return the number of processed characters via an argument? */