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

added hcl_feedbchars()/hcl_feeduchars()
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hyung-hwan
2023-11-03 18:04:46 +09:00
parent 7ccc1ce136
commit 428f67f25c
6 changed files with 271 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hcl-prv.h
View File

@ -684,6 +684,15 @@ struct hcl_compiler_t
struct
{
#if defined(HCL_OOCH_IS_UCH)
struct
{
hcl_bch_t buf[HCL_BCSIZE_MAX];
hcl_oow_t len;
int no_check;
} rsd; /* residue - incomplete sequence at the end of the last data fed by hcl_feedbchars() */
#endif
struct
{
hcl_flx_state_t state;

12
lib/hcl.h
View File

@ -2310,6 +2310,18 @@ HCL_EXPORT int hcl_feed (
hcl_oow_t len
);
HCL_EXPORT int hcl_feeduchars (
hcl_t* hcl,
const hcl_uch_t* data,
hcl_oow_t len
);
HCL_EXPORT int hcl_feedbchars (
hcl_t* hcl,
const hcl_bch_t* data,
hcl_oow_t len
);
HCL_EXPORT int hcl_endfeed (
hcl_t* hcl
);

142
lib/read.c
View File

@ -2436,6 +2436,15 @@ int hcl_feed (hcl_t* hcl, const hcl_ooch_t* data, hcl_oow_t len)
int x;
HCL_ASSERT (hcl, hcl->c != HCL_NULL);
#if defined(HCL_OOCH_IS_UCH)
if (hcl->c->feed.rsd.len > 0 && !hcl->c->feed.rsd.no_check)
{
hcl_seterrbfmt (hcl, HCL_EPERM, "feed disallowed for incomplete sequence pending more feeding");
return -1;
}
#endif
if (data)
{
for (i = 0; i < len; )
@ -2504,6 +2513,138 @@ oops:
return -1;
}
int hcl_feedbchars (hcl_t* hcl, const hcl_bch_t* data, hcl_oow_t len)
{
#if defined(HCL_OOCH_IS_UCH)
hcl_uch_t outbuf[128];
hcl_oow_t inlen, outlen, inpos, brwlen;
int n;
HCL_ASSERT (hcl, hcl->c != HCL_NULL);
inpos = 0;
if (hcl->c->feed.rsd.len > 0)
{
hcl_oow_t rsdlen;
/* handle the residue bytes from the previous feeding */
rsdlen = hcl->c->feed.rsd.len; /* original residue length*/
brwlen = HCL_COUNTOF(hcl->c->feed.rsd.buf) - rsdlen;
if (len < brwlen) brwlen = len;
HCL_MEMCPY(&hcl->c->feed.rsd.buf[rsdlen], data, brwlen);
hcl->c->feed.rsd.len += brwlen;
inlen = hcl->c->feed.rsd.len;
outlen = 1; /* ensure that it can only convert 1 character */
n = hcl_conv_bchars_to_uchars_with_cmgr(hcl->c->feed.rsd.buf, &inlen, outbuf, &outlen, hcl_getcmgr(hcl), 0);
if (outlen > 0)
{
int x;
hcl->c->feed.rsd.no_check = 1;
x = hcl_feed(hcl, outbuf, outlen);
hcl->c->feed.rsd.no_check = 0;
if (x <= -1) return -1;
}
if (n <= -1)
{
if (n == -3 || (n == -2 && outlen > 0))
{
/* n == -3. invalid sequence. more feeding is required */
/* n == -2. there were extra bytes for the second character in the input */
HCL_ASSERT (hcl, (n == -3 && inlen == 0 && outlen == 0) || (n == -2 && inlen > 0));
/* nothing to do. carry on */
}
else
{
hcl_seterrnum (hcl, (n == -2)? HCL_EBUFFULL: HCL_EECERR);
return -1;
}
}
/*
* | rsdlen | brwlen |
* | inlen |
*/
if (inlen < rsdlen)
{
HCL_ASSERT (hcl, inlen == 0);
HCL_ASSERT (hcl, brwlen == len);
/* brwlen needs no change */
/* hcl->c->feed.rsd.len nees no change */
}
else
{
HCL_ASSERT (hcl, inlen > rsdlen);
brwlen = inlen - rsdlen; /* actual bytes borrowed and converted */
hcl->c->feed.rsd.len = 0;
}
inpos += brwlen;
len -= brwlen;
}
while (len > 0)
{
inlen = len;
outlen = HCL_COUNTOF(outbuf);
/* hcl_convbtouchars() does not differentiate between illegal charcter and incomplete sequence.
* use a lower-level function that hcl_convbtouchars() uses */
n = hcl_conv_bchars_to_uchars_with_cmgr(&data[inpos], &inlen, outbuf, &outlen, hcl_getcmgr(hcl), 0);
if (outlen > 0 && hcl_feed(hcl, outbuf, outlen) <= -1) return -1;
if (n <= -1)
{
if (n == -2 || n == -3)
{
hcl_oow_t rsdlen;
HCL_ASSERT (hcl, len > inlen);
rsdlen = len - inlen;
HCL_ASSERT (hcl, rsdlen <= HCL_COUNTOF(hcl->c->feed.rsd.buf));
HCL_MEMCPY (hcl->c->feed.rsd.buf, &data[inpos + inlen], rsdlen);
hcl->c->feed.rsd.len = len - inlen;
break;
}
hcl_seterrnum (hcl, HCL_EECERR);
return -1;
}
inpos += inlen;
len -= inlen;
}
return 0;
#else
return hcl_feed(hcl, data, len);
#endif
}
int hcl_feeduchars (hcl_t* hcl, const hcl_uch_t* data, hcl_oow_t len)
{
#if defined(HCL_OOCH_IS_UCH)
return hcl_feed(hcl, data, len);
#else
hcl_bch_t outbuf[HCL_BCSIZE_MAX * 128];
hcl_oow_t inlen, outlen, inpos;
inpos = 0;
while (len > 0)
{
inlen = len;
outlen = HCL_COUNTOF(outbuf);
n = hcl_convutobchars(hcl, &data[inpos], &inlen, outbuf, &outlen);
if (outlen > 0 && hcl_feed(hcl, outbuf, outlen) <= -1) return -1;
inpos += inlen;
len -= inlen;
if (n <= -1) return -1
}
return 0;
#endif
}
/*
hcl_setopt (ON_EXPRESSION CALLBACK??? );
@ -2598,7 +2739,6 @@ static void fini_compiler_cb (hcl_t* hcl)
}
}
static void fini_compiler (hcl_t* hcl)
{
/* unlike fini_compiler_cb(), this is to be used in some error handling

12
lib/utl.c
View File

@ -589,7 +589,7 @@ HCL_INLINE int hcl_conv_bchars_to_uchars_with_cmgr (const hcl_bch_t* bcs, hcl_oo
break;
}
n = cmgr->bctouc (p, mlen, q);
n = cmgr->bctouc(p, mlen, q);
if (n == 0)
{
/* invalid sequence */
@ -645,7 +645,7 @@ HCL_INLINE int hcl_conv_bchars_to_uchars_with_cmgr (const hcl_bch_t* bcs, hcl_oo
{
hcl_oow_t n;
n = cmgr->bctouc (p, mlen, &w);
n = cmgr->bctouc(p, mlen, &w);
if (n == 0)
{
/* invalid sequence */
@ -720,7 +720,7 @@ HCL_INLINE int hcl_conv_uchars_to_bchars_with_cmgr (const hcl_uch_t* ucs, hcl_oo
break;
}
n = cmgr->uctobc (*p, bcs, rem);
n = cmgr->uctobc(*p, bcs, rem);
if (n == 0)
{
ret = -1;
@ -745,7 +745,7 @@ HCL_INLINE int hcl_conv_uchars_to_bchars_with_cmgr (const hcl_uch_t* ucs, hcl_oo
{
hcl_oow_t n;
n = cmgr->uctobc (*p, bcsbuf, HCL_COUNTOF(bcsbuf));
n = cmgr->uctobc(*p, bcsbuf, HCL_COUNTOF(bcsbuf));
if (n == 0)
{
ret = -1;
@ -786,7 +786,7 @@ HCL_INLINE int hcl_conv_ucstr_to_bcstr_with_cmgr (const hcl_uch_t* ucs, hcl_oow_
break;
}
n = cmgr->uctobc (*p, bcs, rem);
n = cmgr->uctobc(*p, bcs, rem);
if (n == 0)
{
ret = -1;
@ -824,7 +824,7 @@ HCL_INLINE int hcl_conv_ucstr_to_bcstr_with_cmgr (const hcl_uch_t* ucs, hcl_oow_
{
hcl_oow_t n;
n = cmgr->uctobc (*p, bcsbuf, HCL_COUNTOF(bcsbuf));
n = cmgr->uctobc(*p, bcsbuf, HCL_COUNTOF(bcsbuf));
if (n == 0)
{
ret = -1;