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

added hawk_rtx_valtofun() and changed the asort implementation to use it

Browse Source
This commit is contained in:
hyung-hwan 2020-04-08 17:07:19 +00:00
parent d9ffad1227
commit 9328a49cb1
3 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hawk/lib/fnc.c
View File

@ -1863,16 +1863,14 @@ static HAWK_INLINE int __fnc_asort (hawk_rtx_t* rtx, const hawk_fnc_info_t* fi,
if (nargs >= 3) if (nargs >= 3)
{ {
hawk_val_t* a2; fun = hawk_rtx_valtofun(rtx, hawk_rtx_getarg(rtx, 2));
if (HAWK_UNLIKELY(!fun))
a2 = hawk_rtx_getarg(rtx, 2);
if (HAWK_RTX_GETVALTYPE(rtx, a2) != HAWK_VAL_FUN)
{ {
if (hawk_rtx_geterrnum(rtx) == HAWK_EINVAL)
hawk_rtx_seterrfmt (rtx, HAWK_NULL, HAWK_EINVAL, HAWK_T("comparator not a function")); hawk_rtx_seterrfmt (rtx, HAWK_NULL, HAWK_EINVAL, HAWK_T("comparator not a function"));
return -1; return -1;
} }
fun = ((hawk_val_fun_t*)a2)->fun;
if (fun->nargs < 2) if (fun->nargs < 2)
{ {
/* the comparison accepts less than 2 arguments */ /* the comparison accepts less than 2 arguments */

9
hawk/lib/hawk.h
View File

@ -2143,9 +2143,9 @@ HAWK_EXPORT hawk_fun_t* hawk_rtx_findfunwithucstr (
); );
#if defined(HAWK_OOCH_IS_BCH) #if defined(HAWK_OOCH_IS_BCH)
# define hawk_rtx_findfun hawk_rtx_findfunwithbcstr # define hawk_rtx_findfunwithoocstr hawk_rtx_findfunwithbcstr
#else #else
# define hawk_rtx_findfun hawk_rtx_findfunwithucstr # define hawk_rtx_findfunwithoocstr hawk_rtx_findfunwithucstr
#endif #endif
/** /**
@ -3245,6 +3245,11 @@ HAWK_EXPORT int hawk_rtx_valtoflt (
hawk_flt_t* r hawk_flt_t* r
); );
HAWK_EXPORT hawk_fun_t* hawk_rtx_valtofun (
hawk_rtx_t* rtx,
hawk_val_t* val
);
/** /**
* The hawk_rtx_hashval() function hashes a simple value * The hawk_rtx_hashval() function hashes a simple value
* to a positive integer. It returns -1 for a inhashable value. * to a positive integer. It returns -1 for a inhashable value.

36
hawk/lib/val.c
View File

@ -2275,6 +2275,42 @@ int hawk_rtx_valtoflt (hawk_rtx_t* rtx, const hawk_val_t* v, hawk_flt_t* r)
return n; return n;
} }
hawk_fun_t* hawk_rtx_valtofun (hawk_rtx_t* rtx, hawk_val_t* v)
{
hawk_fun_t* fun;
hawk_val_type_t vtype;
vtype = HAWK_RTX_GETVALTYPE(rtx, v);
switch (vtype)
{
case HAWK_VAL_FUN:
fun = ((hawk_val_fun_t*)v)->fun;
break;
case HAWK_VAL_STR:
if (hawk_count_oocstr(((hawk_val_str_t*)v)->val.ptr) != ((hawk_val_str_t*)v)->val.len) goto error_inval;
fun = hawk_rtx_findfunwithoocstr(rtx, ((hawk_val_str_t*)v)->val.ptr);
if (!fun) return HAWK_NULL;
break;
case HAWK_VAL_MBS:
if (hawk_count_bcstr(((hawk_val_mbs_t*)v)->val.ptr) != ((hawk_val_mbs_t*)v)->val.len) goto error_inval;
fun = hawk_rtx_findfunwithbcstr(rtx, ((hawk_val_mbs_t*)v)->val.ptr);
if (!fun) return HAWK_NULL;
break;
default:
error_inval:
hawk_rtx_seterrnum (rtx, HAWK_NULL, HAWK_EINVAL);
return HAWK_NULL;
}
return fun;
}
/* ========================================================================== */ /* ========================================================================== */
static HAWK_INLINE hawk_uint_t hash (hawk_uint8_t* ptr, hawk_oow_t len) static HAWK_INLINE hawk_uint_t hash (hawk_uint8_t* ptr, hawk_oow_t len)