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

fixed bchr handling in some functions in val.c

Browse Source
This commit is contained in:
hyung-hwan 2020-12-18 17:48:36 +00:00
parent 5115bb7b8c
commit 3412108b75
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hawk/lib/val.c
View File

@ -2225,7 +2225,7 @@ hawk_bch_t* hawk_rtx_valtobcstrdupwithcmgr (hawk_rtx_t* rtx, const hawk_val_t* v
case HAWK_VAL_BCHR: case HAWK_VAL_BCHR:
{ {
hawk_bch_t tmp = HAWK_RTX_GETBCHRFROMVAL(rtx, v); hawk_bch_t tmp = HAWK_RTX_GETBCHRFROMVAL(rtx, v);
mbs = hawk_rtx_dupbchars(rtx, &v, 1); mbs = hawk_rtx_dupbchars(rtx, &tmp, 1);
if (!mbs) return HAWK_NULL; if (!mbs) return HAWK_NULL;
if (len) *len = 1; if (len) *len = 1;
break; break;
@ -2308,6 +2308,18 @@ hawk_uch_t* hawk_rtx_valtoucstrdupwithcmgr (hawk_rtx_t* rtx, const hawk_val_t* v
switch (vtype) switch (vtype)
{ {
case HAWK_VAL_BCHR:
{
hawk_bch_t tmp;
hawk_oow_t mbslen, wcslen;
tmp = HAWK_RTX_GETBCHRFROMVAL(rtx, v);
mbslen = 1;
wcs = hawk_rtx_dupbtoucharswithcmgr(rtx, &tmp, mbslen, &wcslen, cmgr, 1);
if (!wcs) return HAWK_NULL;
if (len) *len = wcslen;
break;
}
case HAWK_VAL_MBS: case HAWK_VAL_MBS:
{ {
hawk_oow_t mbslen, wcslen; hawk_oow_t mbslen, wcslen;
@ -2318,6 +2330,25 @@ hawk_uch_t* hawk_rtx_valtoucstrdupwithcmgr (hawk_rtx_t* rtx, const hawk_val_t* v
break; break;
} }
case HAWK_VAL_CHAR:
{
hawk_ooch_t tmp = HAWK_RTX_GETCHARFROMVAL(rtx, v);
#if defined(HAWK_OOCH_IS_BCH)
hawk_oow_t wcslen, mbslen;
mbslen = 1;
wcs = hawk_rtx_dupbtoucharswithcmgr(rtx, &tmp, mbslen, &wcslen, cmgr, 1);
#else
wcs = hawk_rtx_dupuchars(rtx, &tmp, 1);
#endif
if (!wcs) return HAWK_NULL;
#if defined(HAWK_OOCH_IS_BCH)
if (len) *len = wcslen;
#else
if (len) *len = 1;
#endif
break;
}
case HAWK_VAL_STR: case HAWK_VAL_STR:
{ {
#if defined(HAWK_OOCH_IS_BCH) #if defined(HAWK_OOCH_IS_BCH)