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

touched up some code

Browse Source
This commit is contained in:
hyung-hwan
2014-07-11 14:17:00 +00:00
parent fdce5fc592
commit efc8d5ceb4
42 changed files with 234 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qse/lib/awk/Awk.cpp
View File

@ -1122,10 +1122,11 @@ int Awk::open ()
prm.modclose = modclose;
prm.modsym = modsym;
awk = qse_awk_open (this->getMmgr(), QSE_SIZEOF(xtn_t), &prm);
qse_awk_errnum_t errnum;
awk = qse_awk_open (this->getMmgr(), QSE_SIZEOF(xtn_t), &prm, &errnum);
if (awk == QSE_NULL)
{
setError (QSE_AWK_ENOMEM);
this->setError (errnum);
return -1;
}
@ -1145,7 +1146,7 @@ int Awk::open ()
qse_awk_close (awk);
awk = QSE_NULL;
setError (QSE_AWK_ENOMEM);
this->setError (QSE_AWK_ENOMEM);
return -1;
}

203
qse/lib/awk/awk.c
View File

@ -54,7 +54,7 @@ static int init_token (qse_mmgr_t* mmgr, qse_awk_tok_t* tok)
static void fini_token (qse_awk_tok_t* tok)
{
if (tok->name != QSE_NULL)
if (tok->name)
{
qse_str_close (tok->name);
tok->name = QSE_NULL;
@ -63,17 +63,44 @@ static void fini_token (qse_awk_tok_t* tok)
static void clear_token (qse_awk_tok_t* tok)
{
if (tok->name != QSE_NULL) qse_str_clear (tok->name);
if (tok->name) qse_str_clear (tok->name);
tok->type = 0;
tok->loc.file = QSE_NULL;
tok->loc.line = 0;
tok->loc.colm = 0;
}
qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_awk_prm_t* prm)
qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, const qse_awk_prm_t* prm, qse_awk_errnum_t* errnum)
{
qse_awk_t* awk;
awk = (qse_awk_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_awk_t) + xtnsize);
if (awk)
{
int xret;
xret = qse_awk_init (awk, mmgr, prm);
if (xret <= -1)
{
if (errnum) *errnum = qse_awk_geterrnum(awk);
QSE_MMGR_FREE (mmgr, awk);
awk = QSE_NULL;
}
else QSE_MEMSET (QSE_XTN(awk), 0, xtnsize);
}
else if (errnum) *errnum = QSE_AWK_ENOMEM;
return awk;
}
void qse_awk_close (qse_awk_t* awk)
{
qse_awk_fini (awk);
QSE_MMGR_FREE (awk->mmgr, awk);
}
int qse_awk_init (qse_awk_t* awk, qse_mmgr_t* mmgr, const qse_awk_prm_t* prm)
{
static qse_htb_style_t treefuncbs =
{
{
@ -106,16 +133,20 @@ qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_awk_prm_t* pr
QSE_HTB_HASHER_DEFAULT
};
/* allocate the object */
awk = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_awk_t) + xtnsize);
if (awk == QSE_NULL) return QSE_NULL;
/* zero out the object + extension area */
QSE_MEMSET (awk, 0, QSE_SIZEOF(qse_awk_t) + xtnsize);
/* zero out the object */
QSE_MEMSET (awk, 0, QSE_SIZEOF(qse_awk_t));
/* remember the memory manager */
awk->mmgr = mmgr;
/* initialize error handling fields */
awk->errinf.num = QSE_AWK_ENOERR;
awk->errinf.loc.line = 0;
awk->errinf.loc.colm = 0;
awk->errinf.loc.file = QSE_NULL;
awk->errstr = qse_awk_dflerrstr;
awk->stopall = 0;
/* progagate the primitive functions */
QSE_ASSERT (prm != QSE_NULL);
QSE_ASSERT (prm->math.pow != QSE_NULL);
@ -124,48 +155,68 @@ qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_awk_prm_t* pr
prm->math.pow == QSE_NULL ||
prm->math.mod == QSE_NULL)
{
QSE_AWK_FREE (awk, awk);
return QSE_NULL;
qse_awk_seterrnum (awk, QSE_AWK_EINVAL, QSE_NULL);
goto oops;
}
awk->prm = *prm;
if (init_token (mmgr, &awk->ptok) == -1) goto oops;
if (init_token (mmgr, &awk->tok) == -1) goto oops;
if (init_token (mmgr, &awk->ntok) == -1) goto oops;
if (init_token (mmgr, &awk->ptok) <= -1 ||
init_token (mmgr, &awk->tok) <= -1 ||
init_token (mmgr, &awk->ntok) <= -1)
{
qse_awk_seterrnum (awk, QSE_AWK_ENOMEM, QSE_NULL);
goto oops;
}
awk->opt.trait = QSE_AWK_MODERN;
#if defined(__OS2__) || defined(_WIN32) || defined(__DOS__)
awk->opt.trait |= QSE_AWK_CRLF;
#endif
awk->tree.ngbls = 0;
awk->tree.ngbls_base = 0;
awk->tree.begin = QSE_NULL;
awk->tree.begin_tail = QSE_NULL;
awk->tree.end = QSE_NULL;
awk->tree.end_tail = QSE_NULL;
awk->tree.chain = QSE_NULL;
awk->tree.chain_tail = QSE_NULL;
awk->tree.chain_size = 0;
/* TODO: initial map size?? */
awk->tree.funs = qse_htb_open (
mmgr, QSE_SIZEOF(awk), 512, 70, QSE_SIZEOF(qse_char_t), 1
);
if (awk->tree.funs == QSE_NULL) goto oops;
*(qse_awk_t**)QSE_XTN(awk->tree.funs) = awk;
qse_htb_setstyle (awk->tree.funs, &treefuncbs);
awk->parse.funs = qse_htb_open (
mmgr, QSE_SIZEOF(awk), 256, 70, QSE_SIZEOF(qse_char_t), 1
);
if (awk->parse.funs == QSE_NULL) goto oops;
*(qse_awk_t**)QSE_XTN(awk->parse.funs) = awk;
qse_htb_setstyle (awk->parse.funs,
qse_gethtbstyle(QSE_HTB_STYLE_INLINE_KEY_COPIER)
);
awk->parse.named = qse_htb_open (
mmgr, QSE_SIZEOF(awk), 256, 70, QSE_SIZEOF(qse_char_t), 1
);
if (awk->parse.named == QSE_NULL) goto oops;
*(qse_awk_t**)QSE_XTN(awk->parse.named) = awk;
qse_htb_setstyle (awk->parse.named,
qse_gethtbstyle(QSE_HTB_STYLE_INLINE_KEY_COPIER)
);
awk->tree.funs = qse_htb_open (mmgr, QSE_SIZEOF(awk), 512, 70, QSE_SIZEOF(qse_char_t), 1);
awk->parse.funs = qse_htb_open (mmgr, QSE_SIZEOF(awk), 256, 70, QSE_SIZEOF(qse_char_t), 1);
awk->parse.named = qse_htb_open (mmgr, QSE_SIZEOF(awk), 256, 70, QSE_SIZEOF(qse_char_t), 1);
awk->parse.gbls = qse_lda_open (mmgr, QSE_SIZEOF(awk), 128);
awk->parse.lcls = qse_lda_open (mmgr, QSE_SIZEOF(awk), 64);
awk->parse.params = qse_lda_open (mmgr, QSE_SIZEOF(awk), 32);
if (awk->parse.gbls == QSE_NULL ||
awk->fnc.sys = QSE_NULL;
awk->fnc.user = qse_htb_open (mmgr, QSE_SIZEOF(awk), 512, 70, QSE_SIZEOF(qse_char_t), 1);
awk->modtab = qse_rbt_open (mmgr, 0, QSE_SIZEOF(qse_char_t), 1);
if (awk->tree.funs == QSE_NULL ||
awk->parse.funs == QSE_NULL ||
awk->parse.named == QSE_NULL ||
awk->parse.gbls == QSE_NULL ||
awk->parse.lcls == QSE_NULL ||
awk->parse.params == QSE_NULL) goto oops;
awk->parse.params == QSE_NULL ||
awk->fnc.user == QSE_NULL ||
awk->modtab == QSE_NULL)
{
qse_awk_seterrnum (awk, QSE_AWK_ENOMEM, QSE_NULL);
goto oops;
}
*(qse_awk_t**)QSE_XTN(awk->tree.funs) = awk;
qse_htb_setstyle (awk->tree.funs, &treefuncbs);
*(qse_awk_t**)QSE_XTN(awk->parse.funs) = awk;
qse_htb_setstyle (awk->parse.funs, qse_gethtbstyle(QSE_HTB_STYLE_INLINE_KEY_COPIER));
*(qse_awk_t**)QSE_XTN(awk->parse.named) = awk;
qse_htb_setstyle (awk->parse.named, qse_gethtbstyle(QSE_HTB_STYLE_INLINE_KEY_COPIER));
*(qse_awk_t**)QSE_XTN(awk->parse.gbls) = awk;
qse_lda_setscale (awk->parse.gbls, QSE_SIZEOF(qse_char_t));
@ -179,46 +230,18 @@ qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_awk_prm_t* pr
qse_lda_setscale (awk->parse.params, QSE_SIZEOF(qse_char_t));
qse_lda_setcopier (awk->parse.params, QSE_LDA_COPIER_INLINE);
awk->opt.trait = QSE_AWK_MODERN;
#if defined(__OS2__) || defined(_WIN32) || defined(__DOS__)
awk->opt.trait |= QSE_AWK_CRLF;
#endif
awk->errinf.num = QSE_AWK_ENOERR;
awk->errinf.loc.line = 0;
awk->errinf.loc.colm = 0;
awk->errinf.loc.file = QSE_NULL;
awk->errstr = qse_awk_dflerrstr;
awk->stopall = 0;
awk->tree.ngbls = 0;
awk->tree.ngbls_base = 0;
awk->tree.begin = QSE_NULL;
awk->tree.begin_tail = QSE_NULL;
awk->tree.end = QSE_NULL;
awk->tree.end_tail = QSE_NULL;
awk->tree.chain = QSE_NULL;
awk->tree.chain_tail = QSE_NULL;
awk->tree.chain_size = 0;
awk->fnc.sys = QSE_NULL;
awk->fnc.user = qse_htb_open (
mmgr, QSE_SIZEOF(awk), 512, 70, QSE_SIZEOF(qse_char_t), 1
);
if (awk->fnc.user == QSE_NULL) goto oops;
*(qse_awk_t**)QSE_XTN(awk->fnc.user) = awk;
qse_htb_setstyle (awk->fnc.user, &fncusercbs);
awk->modtab = qse_rbt_open (mmgr, 0, QSE_SIZEOF(qse_char_t), 1);
if (awk->modtab == QSE_NULL) goto oops;
qse_rbt_setstyle (
awk->modtab,
qse_getrbtstyle(QSE_RBT_STYLE_INLINE_COPIERS)
);
qse_rbt_setstyle (awk->modtab, qse_getrbtstyle(QSE_RBT_STYLE_INLINE_COPIERS));
if (qse_awk_initgbls (awk) <= -1) goto oops;
if (qse_awk_initgbls (awk) <= -1)
{
qse_awk_seterrnum (awk, QSE_AWK_ENOMEM, QSE_NULL);
goto oops;
}
return awk;
return 0;
oops:
if (awk->modtab) qse_rbt_close (awk->modtab);
@ -232,17 +255,16 @@ oops:
fini_token (&awk->ntok);
fini_token (&awk->tok);
fini_token (&awk->ptok);
QSE_AWK_FREE (awk, awk);
return QSE_NULL;
return -1;
}
int qse_awk_close (qse_awk_t* awk)
void qse_awk_fini (qse_awk_t* awk)
{
qse_awk_ecb_t* ecb;
int i;
if (qse_awk_clear (awk) <= -1) return -1;
qse_awk_clear (awk);
/*qse_awk_clrfnc (awk);*/
for (ecb = awk->ecb; ecb; ecb = ecb->next)
@ -268,14 +290,8 @@ int qse_awk_close (qse_awk_t* awk)
/* destroy dynamically allocated options */
for (i = 0; i < QSE_COUNTOF(awk->opt.mod); i++)
{
if (awk->opt.mod[i].ptr)
QSE_MMGR_FREE (awk->mmgr, awk->opt.mod[i].ptr);
if (awk->opt.mod[i].ptr) QSE_AWK_FREE (awk, awk->opt.mod[i].ptr);
}
/* QSE_AWK_ALLOC, QSE_AWK_FREE, etc can not be used
* from the next line onwards */
QSE_AWK_FREE (awk, awk);
return 0;
}
static qse_rbt_walk_t unload_module (qse_rbt_t* rbt, qse_rbt_pair_t* pair, void* ctx)
@ -290,12 +306,12 @@ static qse_rbt_walk_t unload_module (qse_rbt_t* rbt, qse_rbt_pair_t* pair, void*
return QSE_RBT_WALK_FORWARD;
}
int qse_awk_clear (qse_awk_t* awk)
void qse_awk_clear (qse_awk_t* awk)
{
qse_awk_ecb_t* ecb;
for (ecb = awk->ecb; ecb; ecb = ecb->next)
if (ecb->clear) ecb->clear (awk);
for (ecb = awk->ecb; ecb; ecb = ecb->next)
if (ecb->clear) ecb->clear (awk);
awk->stopall = 0;
@ -360,7 +376,7 @@ int qse_awk_clear (qse_awk_t* awk)
awk->tree.chain = next;
}
awk->tree.chain_tail = QSE_NULL;
awk->tree.chain_tail = QSE_NULL;
awk->tree.chain_size = 0;
/* this table must not be cleared here as there can be a reference
@ -368,7 +384,6 @@ int qse_awk_clear (qse_awk_t* awk)
* failed. this table is cleared in qse_awk_parse().
* qse_awk_claersionames (awk);
*/
return 0;
}
qse_mmgr_t* qse_awk_getmmgr (qse_awk_t* awk)
@ -429,8 +444,7 @@ int qse_awk_setopt (qse_awk_t* awk, qse_awk_opt_t id, const void* value)
if (dup_str_opt (awk, value, &tmp) <= -1) return -1;
idx = id - QSE_AWK_MODPREFIX;
if (awk->opt.mod[idx].ptr)
QSE_MMGR_FREE (awk->mmgr, awk->opt.mod[idx].ptr);
if (awk->opt.mod[idx].ptr) QSE_AWK_FREE (awk, awk->opt.mod[idx].ptr);
awk->opt.mod[idx] = tmp;
return 0;
@ -440,8 +454,7 @@ int qse_awk_setopt (qse_awk_t* awk, qse_awk_opt_t id, const void* value)
{
qse_cstr_t tmp;
if (dup_str_opt (awk, value, &tmp) <= -1) return -1;
if (awk->opt.incldirs.ptr)
QSE_MMGR_FREE (awk->mmgr, awk->opt.incldirs.ptr);
if (awk->opt.incldirs.ptr) QSE_AWK_FREE (awk, awk->opt.incldirs.ptr);
awk->opt.incldirs = tmp;
return 0;
}

12
qse/lib/awk/awk.h
View File

@ -360,4 +360,16 @@ struct qse_awk_mod_data_t
qse_awk_mod_t mod;
};
#ifdef __cplusplus
extern "C" {
#endif
int qse_awk_init (qse_awk_t* awk, qse_mmgr_t* mmgr, const qse_awk_prm_t* prm);
void qse_awk_fini (qse_awk_t* awk);
#ifdef __cplusplus
}
#endif
#endif

10
qse/lib/awk/parse.c
View File

@ -619,7 +619,7 @@ oops:
prev = awk->sio.inp->prev;
QSE_ASSERT (awk->sio.inp->name != QSE_NULL);
QSE_MMGR_FREE (awk->mmgr, awk->sio.inp);
QSE_AWK_FREE (awk, awk->sio.inp);
awk->sio.inp = prev;
}
@ -660,7 +660,7 @@ void qse_awk_clearsionames (qse_awk_t* awk)
{
cur = awk->sio_names;
awk->sio_names = cur->link;
QSE_MMGR_FREE (awk->mmgr, cur);
QSE_AWK_FREE (awk, cur);
}
}
@ -726,7 +726,7 @@ static int end_include (qse_awk_t* awk)
awk->sio.inp = awk->sio.inp->prev;
QSE_ASSERT (cur->name != QSE_NULL);
QSE_MMGR_FREE (awk->mmgr, cur);
QSE_AWK_FREE (awk, cur);
awk->parse.depth.incl--;
if (x != 0)
@ -822,7 +822,7 @@ static int begin_include (qse_awk_t* awk)
oops:
/* i don't need to free 'link' here since it's linked to awk->sio_names
* that's freed at the beginning of qse_awk_parse() or by qse_awk_close(). */
if (arg) QSE_MMGR_FREE (awk->mmgr, arg);
if (arg) QSE_AWK_FREE (awk, arg);
return -1;
}
@ -5135,7 +5135,7 @@ static qse_awk_nde_t* parse_primary_ident (
{
/* the FNC node takes the full name but other
* nodes don't. so i need to free it. i know it's ugly. */
QSE_MMGR_FREE (awk->mmgr, full.ptr);
QSE_AWK_FREE (awk, full.ptr);
}
}
else

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

@ -1653,7 +1653,7 @@ oops:
{
qse_awk_rtx_refdownval (rtx, v[--i]);
}
QSE_MMGR_FREE (rtx->awk->mmgr, v);
QSE_AWK_FREE (rtx->awk, v);
return ret;
}

8
qse/lib/awk/std.c
View File

@ -379,9 +379,9 @@ static void* custom_awk_modsym (qse_awk_t* awk, void* handle, const qse_char_t*
static int add_globals (qse_awk_t* awk);
static int add_functions (qse_awk_t* awk);
qse_awk_t* qse_awk_openstd (qse_size_t xtnsize)
qse_awk_t* qse_awk_openstd (qse_size_t xtnsize, qse_awk_errnum_t* errnum)
{
return qse_awk_openstdwithmmgr (QSE_MMGR_GETDFL(), xtnsize);
return qse_awk_openstdwithmmgr (QSE_MMGR_GETDFL(), xtnsize, errnum);
}
static void fini_xtn (qse_awk_t* awk)
@ -397,7 +397,7 @@ static void clear_xtn (qse_awk_t* awk)
/* nothing to do */
}
qse_awk_t* qse_awk_openstdwithmmgr (qse_mmgr_t* mmgr, qse_size_t xtnsize)
qse_awk_t* qse_awk_openstdwithmmgr (qse_mmgr_t* mmgr, qse_size_t xtnsize, qse_awk_errnum_t* errnum)
{
qse_awk_t* awk;
qse_awk_prm_t prm;
@ -411,7 +411,7 @@ qse_awk_t* qse_awk_openstdwithmmgr (qse_mmgr_t* mmgr, qse_size_t xtnsize)
prm.modsym = custom_awk_modsym;
/* create an object */
awk = qse_awk_open (mmgr, QSE_SIZEOF(xtn_t) + xtnsize, &prm);
awk = qse_awk_open (mmgr, QSE_SIZEOF(xtn_t) + xtnsize, &prm, errnum);
if (awk == QSE_NULL) return QSE_NULL;
/* initialize extension */