enhanced qse_awk_rtx_valtostr()

This commit is contained in:
2011-05-25 09:14:58 +00:00
parent 8497ddae25
commit 26427dd4c3
13 changed files with 246 additions and 161 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: awk04.c 469 2011-05-21 16:16:18Z hyunghwan.chung $
* $Id: awk04.c 479 2011-05-24 15:14:58Z hyunghwan.chung $
*
Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE.
@ -38,6 +38,9 @@ int main ()
qse_awk_fun_t* fun;
int ret, i, opt;
qse_awk_rtx_valtostr_out_t out;
qse_char_t numbuf[128];
/* create a main processor */
awk = qse_awk_openstd (0);
if (awk == QSE_NULL)
@ -119,7 +122,12 @@ int main ()
qse_printf (QSE_T("[%.*s]\n"), (int)len, str);
qse_awk_rtx_free (rtx, str);
if (rtv)
{
qse_awk_rtx_refdownval (rtx, rtv);
rtv = QSE_NULL;
}
/* call the function again using different API functions */
fun = qse_awk_rtx_findfun (rtx, QSE_T("pow"));
if (fun == QSE_NULL)
@ -137,22 +145,26 @@ int main ()
ret = -1; goto oops;
}
str = qse_awk_rtx_valtocpldup (rtx, rtv, &len);
if (str == QSE_NULL)
/* Convert a value to a string in a different way */
out.type = QSE_AWK_RTX_VALTOSTR_CPL;
out.u.cpl.ptr = numbuf; /* used if the value is not a string */
out.u.cpl.len = QSE_COUNTOF(numbuf);
if (qse_awk_rtx_valtostr (rtx, rtv, &out) == QSE_NULL)
{
qse_fprintf (QSE_STDERR, QSE_T("error: %s\n"),
qse_awk_rtx_geterrmsg(rtx));
ret = -1; goto oops;
}
qse_printf (QSE_T("[%.*s]\n"), (int)len, str);
qse_awk_rtx_free (rtx, str);
qse_printf (QSE_T("[%.*s]\n"), (int)out.u.cpl.len, out.u.cpl.ptr);
oops:
/* clear the return value */
if (rtv) qse_awk_rtx_refdownval (rtx, rtv);
if (rtv)
{
qse_awk_rtx_refdownval (rtx, rtv);
rtv = QSE_NULL;
}
/* dereference all arguments */
for (i = 0; i < QSE_COUNTOF(arg); i++)

View File

@ -112,7 +112,9 @@ static int run_awk (QSE::StdAwk& awk)
if (r.getIndexed (idx, &v) <= -1) return -1;
qse_printf (QSE_T("\t[%.*s]=>[%lld]\n"),
(int)idx.len, idx.ptr, (long long)v.toInt());
(int)idx.length(), idx.pointer(),
(long long)v.toInt()
);
iter = r.getNextIndex (&idx, iter);
}

View File

@ -155,7 +155,7 @@ public:
{
Value::IntIndex iidx (i);
if (ret.setIndexedStr (
iidx, idx.ptr, idx.len) <= -1) return -1;
iidx, idx.pointer(), idx.length()) <= -1) return -1;
ii = args[0].getNextIndex (&idx, ii);
}

View File

@ -154,8 +154,8 @@ int main ()
}
qse_printf (QSE_T("ret [%.*s]=[%.*s]\n"),
(int)QSE_AWK_VAL_MAP_ITR_KEY_LEN(iptr),
QSE_AWK_VAL_MAP_ITR_KEY_PTR(iptr),
(int)QSE_AWK_VAL_MAP_ITR_KEY(iptr)->len,
QSE_AWK_VAL_MAP_ITR_KEY(iptr)->ptr,
(int)str.len, str.ptr
);
qse_awk_rtx_free (rtx, str.ptr);

View File

@ -342,13 +342,15 @@ static qse_htb_pair_t* test5_cbserter (
/* allocate a new pair, but without filling the actual value.
* note vptr is given QSE_NULL for that purpose */
new_pair = qse_htb_allocpair (
htb, kptr, klen, QSE_NULL, pair->vlen + 1 + v->len);
htb, kptr, klen, QSE_NULL,
QSE_HTB_VLEN(pair) + 1 + v->len);
if (new_pair == QSE_NULL) return QSE_NULL;
/* fill in the value space */
vptr = new_pair->vptr;
qse_memcpy (vptr, pair->vptr, pair->vlen*QSE_SIZEOF(qse_char_t));
vptr += pair->vlen*QSE_SIZEOF(qse_char_t);
vptr = QSE_HTB_VPTR(new_pair);
qse_memcpy (vptr, QSE_HTB_VPTR(pair),
QSE_HTB_VLEN(pair)*QSE_SIZEOF(qse_char_t));
vptr += QSE_HTB_VLEN(pair) * QSE_SIZEOF(qse_char_t);
qse_memcpy (vptr, &comma, QSE_SIZEOF(qse_char_t));
vptr += QSE_SIZEOF(qse_char_t);
qse_memcpy (vptr, v->ptr, v->len*QSE_SIZEOF(qse_char_t));

View File

@ -119,7 +119,7 @@ qse_lda_setcapa (s1, 3);
static int test2 ()
{
qse_lda_t* s1;
qse_lda_node_t* p;
qse_lda_slot_t* p;
const qse_char_t* x[] =
{
QSE_T("this is so good"),
@ -168,7 +168,7 @@ static int test2 ()
for (i = 0; i < QSE_LDA_SIZE(s1); i++)
{
if (QSE_LDA_NODE(s1,i))
if (QSE_LDA_SLOT(s1,i))
{
qse_printf (QSE_T("[%d] %d => [%.*s]\n"),
j, i, (int)QSE_LDA_DLEN(s1,i), QSE_LDA_DPTR(s1,i));
@ -258,7 +258,7 @@ static int test3 ()
{
if (i < QSE_LDA_SIZE(s1))
{
if (QSE_LDA_NODE(s1,i))
if (QSE_LDA_SLOT(s1,i))
{
qse_printf (QSE_T("deleted at %d => [%.*s]\n"),
i, (int)QSE_LDA_DLEN(s1,i), QSE_LDA_DPTR(s1,i));
@ -287,7 +287,7 @@ static int test3 ()
for (i = 0; i < QSE_LDA_SIZE(s1); i++)
{
if (QSE_LDA_NODE(s1,i))
if (QSE_LDA_SLOT(s1,i))
{
qse_printf (QSE_T("[%d] %d => [%.*s]\n"),
j, i, (int)QSE_LDA_DLEN(s1,i), QSE_LDA_DPTR(s1,i));
@ -303,7 +303,7 @@ static int test3 ()
for (i = 0; i < QSE_LDA_SIZE(s1); i++)
{
if (QSE_LDA_NODE(s1,i))
if (QSE_LDA_SLOT(s1,i))
{
qse_printf (QSE_T("[%d] %d => [%.*s]\n"),
j, i, (int)QSE_LDA_DLEN(s1,i), QSE_LDA_DPTR(s1,i));

View File

@ -150,13 +150,15 @@ static qse_rbt_pair_t* test5_cbserter (
/* allocate a new pair, but without filling the actual value.
* note vptr is given QSE_NULL for that purpose */
new_pair = qse_rbt_allocpair (
rbt, kptr, klen, QSE_NULL, pair->vlen + 1 + v->len);
rbt, kptr, klen, QSE_NULL,
QSE_RBT_VLEN(pair) + 1 + v->len);
if (new_pair == QSE_NULL) return QSE_NULL;
/* fill in the value space */
vptr = new_pair->vptr;
qse_memcpy (vptr, pair->vptr, pair->vlen*QSE_SIZEOF(qse_char_t));
vptr += pair->vlen*QSE_SIZEOF(qse_char_t);
vptr = QSE_RBT_VPTR(new_pair);
qse_memcpy (vptr, QSE_RBT_VPTR(pair),
QSE_RBT_VLEN(pair) * QSE_SIZEOF(qse_char_t));
vptr += QSE_RBT_VLEN(pair) * QSE_SIZEOF(qse_char_t);
qse_memcpy (vptr, &comma, QSE_SIZEOF(qse_char_t));
vptr += QSE_SIZEOF(qse_char_t);
qse_memcpy (vptr, v->ptr, v->len*QSE_SIZEOF(qse_char_t));