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

in progress removing the error target stuffs

Browse Source
This commit is contained in:
hyung-hwan
2025-10-15 00:03:56 +09:00
parent 702696da89
commit e99a4e700b
12 changed files with 159 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/err.c
View File

@ -654,14 +654,13 @@ void hak_getsynerr (hak_t* hak, hak_synerr_t* synerr)
if (synerr) *synerr = hak->c->synerr;
}
void hak_getbsynerr (hak_t* hak, hak_bsynerr_t* synerr)
void hak_getsynerrb (hak_t* hak, hak_synerrb_t* synerr)
{
HAK_ASSERT(hak, hak->c != HAK_NULL);
if (synerr)
{
#if defined(HAK_OOCH_IS_UCH)
hak_synerr_t* s;
const hak_ooch_t* msg;
hak_oow_t wcslen, mbslen;
s = &hak->c->synerr;
@ -675,32 +674,13 @@ void hak_getbsynerr (hak_t* hak, hak_bsynerr_t* synerr)
hak_conv_ucstr_to_bcstr_with_cmgr(s->loc.file, &wcslen, hak->errmsg.xerrlocfile, &mbslen, hak->_cmgr);
synerr->loc.file = hak->errmsg.xerrlocfile; /* this can be truncated and is transient */
}
/*
msg = (hak->errmsg.buf[0] == '\0')? hak_errnum_to_errstr(hak->errnum): hak->errmsg.buf;
mbslen = HAK_COUNTOF(synerr->tgt.val);
hak_conv_ucstr_to_bcstr_with_cmgr(msg, &wcslen, errinf->msg, &mbslen, hak->_cmgr);
*/
/*
synerr->
hak_synerrnum_t num;
hak_bloc_t loc;
struct
{
hak_bch_t val[256];
hak_oow_t len;
} tgt;
*/
#else
*synerr = hak->c->synerr;
#endif
}
}
void hak_getusynerr (hak_t* hak, hak_usynerr_t* synerr)
void hak_getsynerru (hak_t* hak, hak_synerru_t* synerr)
{
HAK_ASSERT(hak, hak->c != HAK_NULL);
if (synerr)
@ -708,6 +688,20 @@ void hak_getusynerr (hak_t* hak, hak_usynerr_t* synerr)
#if defined(HAK_OOCH_IS_UCH)
*synerr = hak->c->synerr;
#else
hak_synerr_t* s;
hak_oow_t wcslen, mbslen;
s = &hak->c->synerr;
HAK_MEMSET(synerr, 0, HAK_SIZEOF(*synerr));
synerr->num = s->num;
synerr->loc.line = s->loc.line;
synerr->loc.colm = s->loc.colm;
if (s->loc.file)
{
wcslen = HAK_COUNTOF(hak->errmsg.xerrlocfile);
hak_conv_bcstr_to_ucstr_with_cmgr(s->loc.file, &mbslen, hak->errmsg.xerrlocfile, &wcslen, hak->_cmgr);
synerr->loc.file = hak->errmsg.xerrlocfile; /* this can be truncated and is transient */
}
#endif
}
}
@ -757,24 +751,6 @@ void hak_setsynerrbfmt (hak_t* hak, hak_synerrnum_t num, const hak_loc_t* loc, c
{
hak->c->synerr.loc = hak->c->tok.loc;
}
if (tgt)
{
hak_oow_t n;
n = hak_copy_oochars_to_oocstr(hak->c->synerr.tgt.val, HAK_COUNTOF(hak->c->synerr.tgt.val), tgt->ptr, tgt->len);
if (n < tgt->len)
{
hak->c->synerr.tgt.val[n - 1] = '.';
hak->c->synerr.tgt.val[n - 2] = '.';
hak->c->synerr.tgt.val[n - 3] = '.';
}
hak->c->synerr.tgt.len = n;
}
else
{
hak->c->synerr.tgt.val[0] = '\0';
hak->c->synerr.tgt.len = 0;
}
}
void hak_setsynerrufmt (hak_t* hak, hak_synerrnum_t num, const hak_loc_t* loc, const hak_oocs_t* tgt, const hak_uch_t* msgfmt, ...)
@ -816,23 +792,5 @@ void hak_setsynerrufmt (hak_t* hak, hak_synerrnum_t num, const hak_loc_t* loc, c
{
hak->c->synerr.loc = hak->c->tok.loc;
}
if (tgt)
{
hak_oow_t n;
n = hak_copy_oochars_to_oocstr(hak->c->synerr.tgt.val, HAK_COUNTOF(hak->c->synerr.tgt.val), tgt->ptr, tgt->len);
if (n < tgt->len)
{
hak->c->synerr.tgt.val[n - 1] = '.';
hak->c->synerr.tgt.val[n - 2] = '.';
hak->c->synerr.tgt.val[n - 3] = '.';
}
hak->c->synerr.tgt.len = n;
}
else
{
hak->c->synerr.tgt.val[0] = '\0';
hak->c->synerr.tgt.len = 0;
}
}