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

making changes caused by changes in qse_awk_rtx_valtostr()

Browse Source
This commit is contained in:
hyung-hwan
2009-03-01 02:44:21 +00:00
parent 462677bb9f
commit 283bcfb2ea
3 changed files with 350 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
qse/include/qse/awk/awk.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.h 87 2009-02-28 02:18:00Z hyunghwan.chung $ * $Id: awk.h 88 2009-02-28 08:44:21Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -708,30 +708,36 @@ enum qse_awk_val_ref_id_t
QSE_AWK_VAL_REF_POS QSE_AWK_VAL_REF_POS
}; };
enum qse_awk_rtx_valtostr_opt_t enum qse_awk_valtostr_type_t
{ {
QSE_AWK_RTX_VALTOSTR_CLEAR = (1 << 0), QSE_AWK_RTX_VALTOSTR_CPL = 0x00,
QSE_AWK_RTX_VALTOSTR_FIXED = (1 << 1), /* this overrides CLEAR */ QSE_AWK_RTX_VALTOSTR_CPLDUP = 0x01,
QSE_AWK_RTX_VALTOSTR_PRINT = (1 << 2) QSE_AWK_RTX_VALTOSTR_STRP = 0x02,
QSE_AWK_RTX_VALTOSTR_STRPCAT = 0x03,
/* can be ORed with one of the values above */
QSE_AWK_RTX_VALTOSTR_PRINT = 0x10
}; };
struct qse_awk_valtostr_out_t /****s* AWK/qse_rtx_awk_valtostr_out_t
* NAME
* qse_awk_rtx_valtostr_out_t - define a value-to-string converion output type
* SYNOPSIS
*/
struct qse_awk_rtx_valtostr_out_t
{ {
enum int type;
{
QSE_AWK_RTX_VALTOSTR_CP
QSE_AWK_RTX_VALTOSTR_CPL
QSE_AWK_RTX_VALTOSTR_STRP
} type;
union union
{ {
qse_char_t* cp;
qse_xstr_t cpl; qse_xstr_t cpl;
qse_xstr_t cpldup; /* need to free cpldup.ptr */
qse_str_t* strp; qse_str_t* strp;
qse_str_t* strpcat;
} u; } u;
}; };
typedef struct qse_awk_valtostr_out_t qse_awk_valtostr_out_t; typedef struct qse_awk_rtx_valtostr_out_t qse_awk_rtx_valtostr_out_t;
/******/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -1584,6 +1590,7 @@ qse_bool_t qse_awk_rtx_valtobool (
qse_awk_val_t* val qse_awk_val_t* val
); );
#if 0
qse_char_t* qse_awk_rtx_valtostr ( qse_char_t* qse_awk_rtx_valtostr (
qse_awk_rtx_t* rtx, qse_awk_rtx_t* rtx,
qse_awk_val_t* val, qse_awk_val_t* val,
@ -1591,6 +1598,19 @@ qse_char_t* qse_awk_rtx_valtostr (
qse_str_t* buf, qse_str_t* buf,
qse_size_t* len qse_size_t* len
); );
#endif
/****f* AWK/qse_awk_rtx_valtostr
* NAME
* qse_awk_rtx_valtostr - convert a value to a string
* SYNOPSIS
*/
qse_char_t* qse_awk_rtx_valtostr (
qse_awk_rtx_t* rtx,
qse_awk_val_t* val,
qse_awk_rtx_valtostr_out_t* out
);
/******/
/****f* AWK/qse_awk_rtx_valtonum /****f* AWK/qse_awk_rtx_valtonum
* NAME * NAME

119
qse/lib/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c 77 2009-02-23 00:57:18Z hyunghwan.chung $ * $Id: run.c 88 2009-02-28 08:44:21Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -311,18 +311,18 @@ static int set_global (
if (idx == QSE_AWK_GBL_CONVFMT) if (idx == QSE_AWK_GBL_CONVFMT)
{ {
qse_char_t* convfmt_ptr; qse_size_t i;
qse_size_t convfmt_len, i; qse_awk_rtx_valtostr_out_t out;
convfmt_ptr = qse_awk_rtx_valtostr (run, out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &convfmt_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (convfmt_ptr == QSE_NULL) return -1;
for (i = 0; i < convfmt_len; i++) for (i = 0; i < out.u.cpldup.len; i++)
{ {
if (convfmt_ptr[i] == QSE_T('\0')) if (out.u.cpldup.ptr[i] == QSE_T('\0'))
{ {
QSE_AWK_FREE (run->awk, convfmt_ptr); /* '\0' is included in the value */
QSE_AWK_FREE (run->awk, out.u.cpldup.ptr);
qse_awk_rtx_seterrnum (run, QSE_AWK_ECONVFMTCHR); qse_awk_rtx_seterrnum (run, QSE_AWK_ECONVFMTCHR);
return -1; return -1;
} }
@ -330,8 +330,8 @@ static int set_global (
if (run->gbl.convfmt.ptr != QSE_NULL) if (run->gbl.convfmt.ptr != QSE_NULL)
QSE_AWK_FREE (run->awk, run->gbl.convfmt.ptr); QSE_AWK_FREE (run->awk, run->gbl.convfmt.ptr);
run->gbl.convfmt.ptr = convfmt_ptr; run->gbl.convfmt.ptr = out.u.cpldup.ptr;
run->gbl.convfmt.len = convfmt_len; run->gbl.convfmt.len = out.u.cpldup.len;
} }
else if (idx == QSE_AWK_GBL_FNR) else if (idx == QSE_AWK_GBL_FNR)
{ {
@ -357,13 +357,16 @@ static int set_global (
} }
else else
{ {
qse_awk_rtx_valtostr_out_t out;
/* due to the expression evaluation rule, the /* due to the expression evaluation rule, the
* regular expression can not be an assigned value */ * regular expression can not be an assigned value */
QSE_ASSERT (val->type != QSE_AWK_VAL_REX); QSE_ASSERT (val->type != QSE_AWK_VAL_REX);
fs_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &fs_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (fs_ptr == QSE_NULL) return -1; fs_ptr = out.u.cpldup.ptr;
fs_len = out.u.cpldup.len;
} }
if (fs_len > 1) if (fs_len > 1)
@ -439,18 +442,17 @@ static int set_global (
} }
else if (idx == QSE_AWK_GBL_OFMT) else if (idx == QSE_AWK_GBL_OFMT)
{ {
qse_char_t* ofmt_ptr; qse_size_t i;
qse_size_t ofmt_len, i; qse_awk_rtx_valtostr_out_t out;
ofmt_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &ofmt_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (ofmt_ptr == QSE_NULL) return -1;
for (i = 0; i < ofmt_len; i++) for (i = 0; i < out.u.cpldup.len; i++)
{ {
if (ofmt_ptr[i] == QSE_T('\0')) if (out.u.cpldup.ptr[i] == QSE_T('\0'))
{ {
QSE_AWK_FREE (run->awk, ofmt_ptr); QSE_AWK_FREE (run->awk, out.u.cpldup.ptr);
qse_awk_rtx_seterrnum (run, QSE_AWK_EOFMTCHR); qse_awk_rtx_seterrnum (run, QSE_AWK_EOFMTCHR);
return -1; return -1;
} }
@ -458,36 +460,32 @@ static int set_global (
if (run->gbl.ofmt.ptr != QSE_NULL) if (run->gbl.ofmt.ptr != QSE_NULL)
QSE_AWK_FREE (run->awk, run->gbl.ofmt.ptr); QSE_AWK_FREE (run->awk, run->gbl.ofmt.ptr);
run->gbl.ofmt.ptr = ofmt_ptr; run->gbl.ofmt.ptr = out.u.cpldup.ptr;
run->gbl.ofmt.len = ofmt_len; run->gbl.ofmt.len = out.u.cpldup.len;
} }
else if (idx == QSE_AWK_GBL_OFS) else if (idx == QSE_AWK_GBL_OFS)
{ {
qse_char_t* ofs_ptr; qse_awk_rtx_valtostr_out_t out;
qse_size_t ofs_len;
ofs_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &ofs_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (ofs_ptr == QSE_NULL) return -1;
if (run->gbl.ofs.ptr != QSE_NULL) if (run->gbl.ofs.ptr != QSE_NULL)
QSE_AWK_FREE (run->awk, run->gbl.ofs.ptr); QSE_AWK_FREE (run->awk, run->gbl.ofs.ptr);
run->gbl.ofs.ptr = ofs_ptr; run->gbl.ofs.ptr = out.u.cpldup.ptr;
run->gbl.ofs.len = ofs_len; run->gbl.ofs.len = out.u.cpldup.len;
} }
else if (idx == QSE_AWK_GBL_ORS) else if (idx == QSE_AWK_GBL_ORS)
{ {
qse_char_t* ors_ptr; qse_awk_rtx_valtostr_out_t out;
qse_size_t ors_len;
ors_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &ors_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (ors_ptr == QSE_NULL) return -1;
if (run->gbl.ors.ptr != QSE_NULL) if (run->gbl.ors.ptr != QSE_NULL)
QSE_AWK_FREE (run->awk, run->gbl.ors.ptr); QSE_AWK_FREE (run->awk, run->gbl.ors.ptr);
run->gbl.ors.ptr = ors_ptr; run->gbl.ors.ptr = out.u.cpldup.ptr;
run->gbl.ors.len = ors_len; run->gbl.ors.len = out.u.cpldup.len;
} }
else if (idx == QSE_AWK_GBL_RS) else if (idx == QSE_AWK_GBL_RS)
{ {
@ -501,13 +499,16 @@ static int set_global (
} }
else else
{ {
qse_awk_rtx_valtostr_out_t out;
/* due to the expression evaluation rule, the /* due to the expression evaluation rule, the
* regular expression can not be an assigned value */ * regular expression can not be an assigned value */
QSE_ASSERT (val->type != QSE_AWK_VAL_REX); QSE_ASSERT (val->type != QSE_AWK_VAL_REX);
rs_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &rs_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (rs_ptr == QSE_NULL) return -1; rs_ptr = out.u.cpldup.ptr;
rs_len = out.u.cpldup.len;
} }
if (rs_len > 1) if (rs_len > 1)
@ -536,17 +537,15 @@ static int set_global (
} }
else if (idx == QSE_AWK_GBL_SUBSEP) else if (idx == QSE_AWK_GBL_SUBSEP)
{ {
qse_char_t* subsep_ptr; qse_awk_rtx_valtostr_out_t out;
qse_size_t subsep_len;
subsep_ptr = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, val, QSE_AWK_RTX_VALTOSTR_CLEAR, QSE_NULL, &subsep_len); if (qse_awk_rtx_valtostr (run, val, &out) == QSE_NULL) return -1;
if (subsep_ptr == QSE_NULL) return -1;
if (run->gbl.subsep.ptr != QSE_NULL) if (run->gbl.subsep.ptr != QSE_NULL)
QSE_AWK_FREE (run->awk, run->gbl.subsep.ptr); QSE_AWK_FREE (run->awk, run->gbl.subsep.ptr);
run->gbl.subsep.ptr = subsep_ptr; run->gbl.subsep.ptr = out.u.cpldup.ptr;
run->gbl.subsep.len = subsep_len; run->gbl.subsep.len = out.u.cpldup.len;
} }
qse_awk_rtx_refdownval (run, old); qse_awk_rtx_refdownval (run, old);
@ -2562,6 +2561,7 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
qse_size_t keylen; qse_size_t keylen;
qse_awk_val_t* idx; qse_awk_val_t* idx;
qse_char_t buf[IDXBUFSIZE]; qse_char_t buf[IDXBUFSIZE];
qse_awk_rtx_valtostr_out_t out;
QSE_ASSERT (var->idx != QSE_NULL); QSE_ASSERT (var->idx != QSE_NULL);
@ -2571,16 +2571,16 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
qse_awk_rtx_refupval (run, idx); qse_awk_rtx_refupval (run, idx);
/* try with a fixed-size buffer */ /* try with a fixed-size buffer */
keylen = QSE_COUNTOF(buf); out.type = QSE_AWK_RTX_VALTOSTR_CPL;
key = qse_awk_rtx_valtostr ( out.u.cpl.ptr = buf;
run, idx, QSE_AWK_RTX_VALTOSTR_FIXED, out.u.cpl.len = QSE_COUNTOF(buf);
(qse_str_t*)buf, &keylen);
key = qse_awk_rtx_valtostr (run, idx, &out);
if (key == QSE_NULL) if (key == QSE_NULL)
{ {
/* if it doesn't work, switch to dynamic mode */ /* if it doesn't work, switch to dynamic mode */
key = qse_awk_rtx_valtostr ( out.type = QSE_AWK_RTX_VALTOSTR_CPLDUP;
run, idx, QSE_AWK_RTX_VALTOSTR_CLEAR, key = qse_awk_rtx_valtostr (run, idx, &out);
QSE_NULL, &keylen);
} }
qse_awk_rtx_refdownval (run, idx); qse_awk_rtx_refdownval (run, idx);
@ -2592,8 +2592,15 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
return -1; return -1;
} }
if (out.type == QSE_AWK_RTX_VALTOSTR_CPL)
keylen = out.u.cpl.len;
else
keylen = out.u.cpldup.len;
qse_map_delete (map, key, keylen); qse_map_delete (map, key, keylen);
if (key != buf) QSE_AWK_FREE (run->awk, key);
if (out.type == QSE_AWK_RTX_VALTOSTR_CPLDUP)
QSE_AWK_FREE (run->awk, out.u.cpldup.ptr);
} }
else else
{ {

445
qse/lib/awk/val.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: val.c 87 2009-02-28 02:18:00Z hyunghwan.chung $ * $Id: val.c 88 2009-02-28 08:44:21Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -741,319 +741,381 @@ how to handle CLEAR...
static qse_char_t* str_to_str ( static qse_char_t* str_to_str (
qse_awk_rtx_t* rtx, const qse_char_t* str, qse_size_t str_len, qse_awk_rtx_t* rtx, const qse_char_t* str, qse_size_t str_len,
qse_awk_valtostr_out_t* out); qse_awk_rtx_valtostr_out_t* out)
{ {
switch (out->type) int type = out->type & ~QSE_AWK_RTX_VALTOSTR_PRINT;
switch (type)
{ {
case QSE_AWK_VALTOSTR_CPL: case QSE_AWK_RTX_VALTOSTR_CPL:
{ {
QSE_ASSERT (buf != QSE_NULL && len != QSE_NULL); if (str_len >= out->u.cpl.len)
if (str_len >= out.u.cpl.len)
{ {
qse_awk_rtx_seterror (rtx, QSE_AWK_EINVAL, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
*len = str_len + 1; out->u.cpl.len = str_len + 1;
return QSE_NULL; return QSE_NULL;
} }
out->u.cpl.len = qse_strncpy (out->u.cpl.ptr, str, str_len); out->u.cpl.len =
return (qse_char_t*)buf; qse_strncpy (out->u.cpl.ptr, str, str_len);
return out->u.cpl.ptr;
} }
case QSE_AWK_VALTOSTR_STR: case QSE_AWK_RTX_VALTOSTR_CPLDUP:
{
qse_size_t n;
qse_str_clear (buf);
n = qse_str_ncat (out->u.cpl.str, str, str_len);
if (n == (qse_size_t)-1)
{
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, 0, QSE_NULL);
return QSE_NULL;
}
return QSE_STR_PTR(buf);
}
case QSE_AWK_VALTOSTR_CAT:
{
qse_size_t n;
n = qse_str_ncat (out->u.cpl.str, str, str_len);
if (n == (qse_size_t)-1)
{
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, 0, QSE_NULL);
return QSE_NULL;
}
return QSE_STR_PTR(buf);
}
case QSE_AWK_VALTOSTR_NEW:
{ {
qse_char_t* tmp; qse_char_t* tmp;
tmp = QSE_AWK_STRXDUP (rtx->awk, str, str_len); tmp = QSE_AWK_STRXDUP (rtx->awk, str, str_len);
if (tmp == QSE_NULL) if (tmp == QSE_NULL)
{ {
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL; return QSE_NULL;
} }
if (len != QSE_NULL) *len = str_len; out->u.cpldup.ptr = tmp;
out->u.cpldup.len = str_len;
return tmp; return tmp;
} }
case QSE_AWK_RTX_VALTOSTR_STRP:
{
qse_size_t n;
qse_str_clear (out->u.strp);
n = qse_str_ncat (out->u.strp, str, str_len);
if (n == (qse_size_t)-1)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
return QSE_STR_PTR(out->u.strp);
}
case QSE_AWK_RTX_VALTOSTR_STRPCAT:
{
qse_size_t n;
n = qse_str_ncat (out->u.strpcat, str, str_len);
if (n == (qse_size_t)-1)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
return QSE_STR_PTR(out->u.strpcat);
}
} }
qse_awk_rtx_seterror (rtx, QSE_AWK_EINVAL, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
return ASE_NULL; return QSE_NULL;
} }
static qse_char_t* val_int_to_str ( static qse_char_t* val_int_to_str (
qse_awk_rtx_t* run, qse_awk_val_int_t* v, qse_awk_rtx_t* rtx, qse_awk_val_int_t* v,
int opt, qse_str_t* buf, qse_size_t* len) qse_awk_rtx_valtostr_out_t* out)
{ {
qse_char_t* tmp; qse_char_t* tmp;
qse_long_t t; qse_long_t t;
qse_size_t rlen = 0; qse_size_t rlen = 0;
int type = out->type & ~QSE_AWK_RTX_VALTOSTR_PRINT;
t = v->val; t = v->val;
if (t == 0) if (t == 0)
{ {
/* handle zero */ /* handle zero */
if (buf == QSE_NULL) switch (type)
{ {
tmp = QSE_AWK_ALLOC ( case QSE_AWK_RTX_VALTOSTR_CPL:
run->awk, 2 * QSE_SIZEOF(qse_char_t)); if (out->u.cpl.len <= 1)
if (tmp == QSE_NULL) {
{ qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
qse_awk_rtx_seterror ( /* store the buffer size needed */
run, QSE_AWK_ENOMEM, 0, QSE_NULL); out->u.cpl.len = 2;
return QSE_NULL; return QSE_NULL;
} }
tmp[0] = QSE_T('0'); out->u.cpl.len = 1; /* actual length */
tmp[1] = QSE_T('\0'); out->u.cpl.ptr[0] = QSE_T('0');
if (len != QSE_NULL) *len = 1; out->u.cpl.ptr[1] = QSE_T('\0');
return tmp; return out->u.cpl.ptr;
}
else if (opt & QSE_AWK_RTX_VALTOSTR_FIXED)
{
QSE_ASSERT (buf != QSE_NULL && len != QSE_NULL);
if (1 >= *len)
{
qse_awk_rtx_seterror (
run, QSE_AWK_EINVAL, 0, QSE_NULL);
*len = 2; /* buffer size required */
return QSE_NULL;
}
tmp = (qse_char_t*)buf; case QSE_AWK_RTX_VALTOSTR_CPLDUP:
tmp[0] = QSE_T('0'); tmp = QSE_AWK_ALLOC (
tmp[1] = QSE_T('\0'); rtx->awk, 2 * QSE_SIZEOF(qse_char_t));
*len = 1; /* actual length */ if (tmp == QSE_NULL)
return tmp; {
} qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
else return QSE_NULL;
{ }
if (opt & QSE_AWK_RTX_VALTOSTR_CLEAR) qse_str_clear (buf);
if (qse_str_cat (buf, QSE_T("0")) == (qse_size_t)-1)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ENOMEM, 0, QSE_NULL);
return QSE_NULL;
}
if (len != QSE_NULL) *len = QSE_STR_LEN(buf); tmp[0] = QSE_T('0');
return QSE_STR_PTR(buf); tmp[1] = QSE_T('\0');
out->u.cpldup.ptr = tmp;
out->u.cpldup.len = 1; /* actual length */
return out->u.cpldup.ptr;
case QSE_AWK_RTX_VALTOSTR_STRP:
qse_str_clear (out->u.strp);
if (qse_str_ccat (out->u.strp, QSE_T('0')) == (qse_size_t)-1)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
return QSE_STR_PTR(out->u.strp);
case QSE_AWK_RTX_VALTOSTR_STRPCAT:
if (qse_str_ccat (out->u.strpcat, QSE_T('0')) == (qse_size_t)-1)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
return QSE_STR_PTR(out->u.strpcat);
} }
qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
return QSE_NULL;
} }
/* non-zero values */ /* non-zero values */
if (t < 0) { t = -t; rlen++; } if (t < 0) { t = -t; rlen++; }
while (t > 0) { rlen++; t /= 10; } while (t > 0) { rlen++; t /= 10; }
if (buf == QSE_NULL) switch (type)
{ {
tmp = QSE_AWK_ALLOC ( case QSE_AWK_RTX_VALTOSTR_CPL:
run->awk, (rlen + 1) * QSE_SIZEOF(qse_char_t)); if (rlen >= out->u.cpl.len)
if (tmp == QSE_NULL) {
qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
/* store the buffer size needed */
out->u.cpl.len = rlen + 1;
return QSE_NULL;
}
tmp = out->u.cpl.ptr;
tmp[rlen] = QSE_T('\0');
out->u.cpl.len = rlen;
break;
case QSE_AWK_RTX_VALTOSTR_CPLDUP:
tmp = QSE_AWK_ALLOC (
rtx->awk, (rlen + 1) * QSE_SIZEOF(qse_char_t));
if (tmp == QSE_NULL)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
tmp[rlen] = QSE_T('\0');
out->u.cpldup.ptr = tmp;
out->u.cpldup.len = rlen;
break;
case QSE_AWK_RTX_VALTOSTR_STRP:
{ {
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, 0, QSE_NULL); qse_size_t n;
return QSE_NULL;
qse_str_clear (out->u.strp);
QSE_ASSERT (QSE_STR_LEN(out->u.strp) == 0);
/* point to the beginning of the buffer */
tmp = QSE_STR_PTR(out->u.strp);
/* extend the buffer */
n = qse_str_nccat (out->u.strp, QSE_T(' '), rlen);
if (n == (qse_size_t)-1)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
break;
} }
tmp[rlen] = QSE_T('\0'); case QSE_AWK_RTX_VALTOSTR_STRPCAT:
if (len != QSE_NULL) *len = rlen;
}
else if (opt & QSE_AWK_RTX_VALTOSTR_FIXED)
{
QSE_ASSERT (buf != QSE_NULL && len != QSE_NULL);
if (rlen >= *len)
{ {
qse_awk_rtx_seterror (run, QSE_AWK_EINVAL, 0, QSE_NULL); qse_size_t n;
*len = rlen + 1; /* buffer size required */
return QSE_NULL;
}
tmp = (qse_char_t*)buf; /* point to the insertion point */
tmp[rlen] = QSE_T('\0'); tmp = QSE_STR_PTR(out->u.strpcat) + QSE_STR_LEN(out->u.strpcat);
*len = rlen; /* actual length */
}
else
{
/* clear the buffer */
if (opt & QSE_AWK_RTX_VALTOSTR_CLEAR) qse_str_clear (buf);
tmp = QSE_STR_PTR(buf) + QSE_STR_LEN(buf); /* extend the buffer */
n = qse_str_nccat (out->u.strpcat, QSE_T(' '), rlen);
/* extend the buffer */ if (n == (qse_size_t)-1)
if (qse_str_nccat ( {
buf, QSE_T(' '), rlen) == (qse_size_t)-1) qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
{ return QSE_NULL;
qse_awk_rtx_seterror ( }
run, QSE_AWK_ENOMEM, 0, QSE_NULL); break;
return QSE_NULL;
} }
} }
t = v->val; t = v->val;
if (t < 0) t = -t; if (t < 0) t = -t;
/* fill in the buffer with digits */
while (t > 0) while (t > 0)
{ {
tmp[--rlen] = (qse_char_t)(t % 10) + QSE_T('0'); tmp[--rlen] = (qse_char_t)(t % 10) + QSE_T('0');
t /= 10; t /= 10;
} }
/* insert the negative sign if necessary */
if (v->val < 0) tmp[--rlen] = QSE_T('-'); if (v->val < 0) tmp[--rlen] = QSE_T('-');
if (buf != QSE_NULL && !(opt & QSE_AWK_RTX_VALTOSTR_FIXED)) if (type == QSE_AWK_RTX_VALTOSTR_STRPCAT)
{ {
tmp = QSE_STR_PTR(buf); /* for concatenation type, change tmp to
if (len != QSE_NULL) *len = QSE_STR_LEN(buf); * point to the buffer */
tmp = QSE_STR_PTR(out->u.strpcat);
} }
return tmp; return tmp;
} }
static qse_char_t* val_real_to_str ( static qse_char_t* val_real_to_str (
qse_awk_rtx_t* run, qse_awk_val_real_t* v, qse_awk_rtx_t* rtx, qse_awk_val_real_t* v,
int opt, qse_str_t* buf, qse_size_t* len) qse_awk_rtx_valtostr_out_t* out)
{ {
qse_char_t* tmp; qse_char_t* tmp;
qse_size_t tmp_len; qse_size_t tmp_len;
qse_str_t out, fbu; qse_str_t buf, fbu;
int type = out->type & ~QSE_AWK_RTX_VALTOSTR_PRINT;
if (opt & QSE_AWK_RTX_VALTOSTR_PRINT) if (out->type & QSE_AWK_RTX_VALTOSTR_PRINT)
{ {
tmp = run->gbl.ofmt.ptr; tmp = rtx->gbl.ofmt.ptr;
tmp_len = run->gbl.ofmt.len; tmp_len = rtx->gbl.ofmt.len;
} }
else else
{ {
tmp = run->gbl.convfmt.ptr; tmp = rtx->gbl.convfmt.ptr;
tmp_len = run->gbl.convfmt.len; tmp_len = rtx->gbl.convfmt.len;
} }
if (qse_str_init (&out, run->awk->mmgr, 256) == QSE_NULL) if (qse_str_init (&buf, rtx->awk->mmgr, 256) == QSE_NULL)
{ {
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL; return QSE_NULL;
} }
if (qse_str_init (&fbu, run->awk->mmgr, 256) == QSE_NULL) if (qse_str_init (&fbu, rtx->awk->mmgr, 256) == QSE_NULL)
{ {
qse_str_fini (&out); qse_str_fini (&buf);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL; return QSE_NULL;
} }
tmp = qse_awk_rtx_format (run, &out, &fbu, tmp, tmp_len, tmp = qse_awk_rtx_format (rtx, &buf, &fbu, tmp, tmp_len,
(qse_size_t)-1, (qse_awk_nde_t*)v, &tmp_len); (qse_size_t)-1, (qse_awk_nde_t*)v, &tmp_len);
if (tmp == QSE_NULL) if (tmp == QSE_NULL)
{ {
qse_str_fini (&fbu); qse_str_fini (&fbu);
qse_str_fini (&out); qse_str_fini (&buf);
return QSE_NULL; return QSE_NULL;
} }
if (buf == QSE_NULL) switch (type)
{ {
qse_str_fini (&fbu); case QSE_AWK_RTX_VALTOSTR_CPL:
qse_str_yield (&out, QSE_NULL, 0); if (out->u.cpl.len <= tmp_len)
qse_str_fini (&out); {
qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
/* store the buffer size required */
out->u.cpl.len = tmp_len + 1;
qse_str_close (&fbu);
qse_str_close (&buf);
return QSE_NULL;
}
if (len != QSE_NULL) *len = tmp_len; qse_strncpy (out->u.cpl.ptr, tmp, tmp_len);
} out->u.cpl.len = tmp_len;
else if (opt & QSE_AWK_RTX_VALTOSTR_FIXED) tmp = out->u.cpl.ptr;
{
QSE_ASSERT (buf != QSE_NULL && len != QSE_NULL);
if (tmp_len >= *len)
{
qse_awk_rtx_seterror (
run, QSE_AWK_EINVAL, 0, QSE_NULL);
*len = tmp_len + 1; /* buffer size required */
qse_str_close (&fbu);
qse_str_close (&out);
return QSE_NULL;
}
qse_strncpy ((qse_char_t*)buf, tmp, tmp_len);
tmp = (qse_char_t*)buf;
*len = tmp_len;
qse_str_fini (&fbu);
qse_str_fini (&out);
}
else
{
if (opt & QSE_AWK_RTX_VALTOSTR_CLEAR) qse_str_clear (buf);
if (qse_str_ncat (buf, tmp, tmp_len) == (qse_size_t)-1)
{
qse_str_fini (&fbu); qse_str_fini (&fbu);
qse_str_fini (&out); qse_str_fini (&buf);
qse_awk_rtx_seterror ( return tmp;
run, QSE_AWK_ENOMEM, 0, QSE_NULL);
return QSE_NULL; case QSE_AWK_RTX_VALTOSTR_CPLDUP:
qse_str_fini (&fbu);
qse_str_yield (&buf, QSE_NULL, 0);
qse_str_fini (&buf);
out->u.cpldup.ptr = tmp;
out->u.cpldup.len = tmp_len;
return tmp;
case QSE_AWK_RTX_VALTOSTR_STRP:
{
qse_size_t n;
qse_str_clear (out->u.strp);
n = qse_str_ncat (out->u.strp, tmp, tmp_len);
if (n == (qse_size_t)-1)
{
qse_str_fini (&fbu);
qse_str_fini (&buf);
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
tmp = QSE_STR_PTR(out->u.strp);
qse_str_fini (&fbu);
qse_str_fini (&buf);
return tmp;
} }
tmp = QSE_STR_PTR(buf); case QSE_AWK_RTX_VALTOSTR_STRPCAT:
if (len != QSE_NULL) *len = QSE_STR_LEN(buf); {
qse_size_t n;
n = qse_str_ncat (out->u.strpcat, tmp, tmp_len);
if (n == (qse_size_t)-1)
{
qse_str_fini (&fbu);
qse_str_fini (&buf);
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM);
return QSE_NULL;
}
qse_str_fini (&fbu); tmp = QSE_STR_PTR(out->u.strpcat);
qse_str_fini (&out);
qse_str_fini (&fbu);
qse_str_fini (&buf);
return tmp;
}
} }
return tmp; qse_str_fini (&fbu);
qse_str_fini (&buf);
qse_awk_rtx_seterrnum (rtx, QSE_AWK_EINVAL);
return QSE_NULL;
} }
qse_char_t* qse_awk_rtx_valtostr ( qse_char_t* qse_awk_rtx_valtostr (
qse_awk_rtx_t* run, qse_awk_val_t* v, qse_awk_rtx_t* rtx, qse_awk_val_t* v, qse_awk_rtx_valtostr_out_t* out)
qse_awk_rtx_valtostr_opt_t opt, qse_awk_rtx_valtostr_out_t* out)
{ {
switch (v->type) switch (v->type)
{ {
case QSE_AWK_VAL_NIL: case QSE_AWK_VAL_NIL:
return str_to_str (run, QSE_T(""), 0, opt, buf, len); return str_to_str (rtx, QSE_T(""), 0, out);
case QSE_AWK_VAL_INT: case QSE_AWK_VAL_INT:
return val_int_to_str ( return val_int_to_str (
run, (qse_awk_val_int_t*)vi, opt, buf, len); rtx, (qse_awk_val_int_t*)v, out);
case QSE_AWK_VAL_REAL: case QSE_AWK_VAL_REAL:
return val_real_to_str ( return val_real_to_str (
run, (qse_awk_val_real_t*)v, opt, buf, len); rtx, (qse_awk_val_real_t*)v, out);
case QSE_AWK_VAL_STR: case QSE_AWK_VAL_STR:
{ {
qse_awk_val_str_t* vs = (qse_awk_val_str_t*)v; qse_awk_val_str_t* vs = (qse_awk_val_str_t*)v;
return str_to_str ( return str_to_str (rtx, vs->ptr, vs->len, out);
run, vs->ptr, vs->len, opt, buf, len);
} }
} }
@ -1063,11 +1125,10 @@ qse_char_t* qse_awk_rtx_valtostr (
v->type); v->type);
#endif #endif
qse_awk_rtx_seterror (run, QSE_AWK_EVALTYPE, 0, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_EVALTYPE);
return QSE_NULL; return QSE_NULL;
} }
int qse_awk_rtx_valtonum ( int qse_awk_rtx_valtonum (
qse_awk_rtx_t* run, qse_awk_val_t* v, qse_long_t* l, qse_real_t* r) qse_awk_rtx_t* run, qse_awk_val_t* v, qse_long_t* l, qse_real_t* r)
{ {