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

added a few lines of constant folding code for awk. still incomplete

Browse Source
This commit is contained in:
hyung-hwan 2011-07-23 09:37:46 +00:00
parent 7740b30aea
commit b2e7566e6b
5 changed files with 216 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qse/lib/awk/misc.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: misc.c 510 2011-07-20 16:17:16Z hyunghwan.chung $ * $Id: misc.c 514 2011-07-22 15:37:46Z hyunghwan.chung $
* *
Copyright 2006-2011 Chung, Hyung-Hwan. Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE. This file is part of QSE.
@ -1108,3 +1108,36 @@ void qse_awk_rtx_freemem (qse_awk_rtx_t* rtx, void* ptr)
qse_awk_freemem (rtx->awk, ptr); qse_awk_freemem (rtx->awk, ptr);
} }
int qse_awk_sprintlong (
qse_awk_t* awk, qse_char_t* buf, qse_size_t len, qse_long_t num)
{
return awk->prm.sprintf (
awk, buf, len,
#if QSE_SIZEOF_LONG_LONG > 0
QSE_T("%lld"), (long long)num
#elif QSE_SIZEOF___INT64 > 0
QSE_T("%I64d"), (__int64)num
#elif QSE_SIZEOF_LONG > 0
QSE_T("%ld"), (long)num
#elif QSE_SIZEOF_INT > 0
QSE_T("%d"), (int)num
#else
#error unsupported size
#endif
);
}
int qse_awk_sprintreal (
qse_awk_t* awk, qse_char_t* buf, qse_size_t len, qse_real_t num)
{
return awk->prm.sprintf (
awk, buf, len,
#if QSE_SIZEOF_LONG_DOUBLE > 0
QSE_T("%Lf"), (long long)num
#elif QSE_SIZEOF_DOUBLE > 0
QSE_T("%f"), (double)num
#else
#error unsupported size
#endif
);
}

18
qse/lib/awk/misc.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: misc.h 462 2011-05-18 14:36:40Z hyunghwan.chung $ * $Id: misc.h 514 2011-07-22 15:37:46Z hyunghwan.chung $
* *
Copyright 2006-2011 Chung, Hyung-Hwan. Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE. This file is part of QSE.
@ -76,6 +76,22 @@ int qse_awk_matchrex (
qse_cstr_t* match, qse_awk_errnum_t* errnum qse_cstr_t* match, qse_awk_errnum_t* errnum
); );
int qse_awk_sprintlong (
qse_awk_t* awk,
qse_char_t* buf,
qse_size_t len,
qse_long_t num
);
int qse_awk_sprintreal (
qse_awk_t* awk,
qse_char_t* buf,
qse_size_t len,
qse_real_t num
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

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

@ -1,5 +1,5 @@
/* /*
* $Id: parse.c 486 2011-05-29 15:22:08Z hyunghwan.chung $ * $Id: parse.c 514 2011-07-22 15:37:46Z hyunghwan.chung $
* *
Copyright 2006-2011 Chung, Hyung-Hwan. Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE. This file is part of QSE.
@ -3351,6 +3351,8 @@ static qse_awk_nde_t* parse_binary (
qse_awk_loc_t rloc; qse_awk_loc_t rloc;
const binmap_t* p = binmap; const binmap_t* p = binmap;
qse_bool_t matched = QSE_FALSE; qse_bool_t matched = QSE_FALSE;
int fold;
qse_long_t folded_l;
while (p->token != TOK_EOF) while (p->token != TOK_EOF)
{ {
@ -3382,24 +3384,70 @@ static qse_awk_nde_t* parse_binary (
return QSE_NULL; return QSE_NULL;
} }
nde = (qse_awk_nde_exp_t*) QSE_AWK_ALLOC ( fold = 0;
awk, QSE_SIZEOF(qse_awk_nde_exp_t)); if (left->type == QSE_AWK_NDE_INT &&
if (nde == QSE_NULL) right->type == QSE_AWK_NDE_INT)
{ {
qse_awk_clrpt (awk, right); fold = 1;
qse_awk_clrpt (awk, left); switch (opcode)
SETERR_LOC (awk, QSE_AWK_ENOMEM, xloc); {
return QSE_NULL; case QSE_AWK_BINOP_PLUS:
folded_l = ((qse_awk_nde_int_t*)left)->val + ((qse_awk_nde_int_t*)right)->val;
break;
case QSE_AWK_BINOP_MINUS:
folded_l = ((qse_awk_nde_int_t*)left)->val - ((qse_awk_nde_int_t*)right)->val;
break;
case QSE_AWK_BINOP_MUL:
folded_l = ((qse_awk_nde_int_t*)left)->val * ((qse_awk_nde_int_t*)right)->val;
break;
case QSE_AWK_BINOP_IDIV:
folded_l = ((qse_awk_nde_int_t*)left)->val / ((qse_awk_nde_int_t*)right)->val;
break;
case QSE_AWK_BINOP_MOD:
folded_l = ((qse_awk_nde_int_t*)left)->val % ((qse_awk_nde_int_t*)right)->val;
break;
default:
fold = 0;
}
} }
nde->type = QSE_AWK_NDE_EXP_BIN; if (fold)
nde->loc = *xloc; {
nde->next = QSE_NULL; qse_awk_clrpt (awk, right);
nde->opcode = opcode; ((qse_awk_nde_int_t*)left)->val = folded_l;
nde->left = left; if (((qse_awk_nde_int_t*)left)->str)
nde->right = right; {
QSE_AWK_FREE (awk, ((qse_awk_nde_int_t*)left)->str);
((qse_awk_nde_int_t*)left)->str = QSE_NULL;
((qse_awk_nde_int_t*)left)->len = 0;
}
}
else
{
nde = (qse_awk_nde_exp_t*) QSE_AWK_ALLOC (
awk, QSE_SIZEOF(qse_awk_nde_exp_t));
if (nde == QSE_NULL)
{
qse_awk_clrpt (awk, right);
qse_awk_clrpt (awk, left);
SETERR_LOC (awk, QSE_AWK_ENOMEM, xloc);
return QSE_NULL;
}
left = (qse_awk_nde_t*)nde; nde->type = QSE_AWK_NDE_EXP_BIN;
nde->loc = *xloc;
nde->next = QSE_NULL;
nde->opcode = opcode;
nde->left = left;
nde->right = right;
left = (qse_awk_nde_t*)nde;
}
} }
return left; return left;
@ -3612,13 +3660,13 @@ static qse_awk_nde_t* parse_concat (
} }
} }
else if (MATCH(awk,TOK_LPAREN) || else if (MATCH(awk,TOK_LPAREN) ||
MATCH(awk,TOK_DOLLAR) || MATCH(awk,TOK_DOLLAR) ||
MATCH(awk,TOK_PLUS) || MATCH(awk,TOK_PLUS) ||
MATCH(awk,TOK_MINUS) || MATCH(awk,TOK_MINUS) ||
MATCH(awk,TOK_PLUSPLUS) || MATCH(awk,TOK_PLUSPLUS) ||
MATCH(awk,TOK_MINUSMINUS) || MATCH(awk,TOK_MINUSMINUS) ||
MATCH(awk,TOK_LNOT) || MATCH(awk,TOK_LNOT) ||
awk->tok.type >= TOK_GETLINE) awk->tok.type >= TOK_GETLINE)
{ {
/* TODO: is the check above sufficient? */ /* TODO: is the check above sufficient? */
if (!(awk->option & QSE_AWK_IMPLICIT)) break; if (!(awk->option & QSE_AWK_IMPLICIT)) break;
@ -3692,6 +3740,8 @@ static qse_awk_nde_t* parse_unary (
qse_awk_nde_t* left; qse_awk_nde_t* left;
qse_awk_loc_t uloc; qse_awk_loc_t uloc;
int opcode; int opcode;
int fold;
qse_long_t folded_l;
opcode = (MATCH(awk,TOK_PLUS))? QSE_AWK_UNROP_PLUS: opcode = (MATCH(awk,TOK_PLUS))? QSE_AWK_UNROP_PLUS:
(MATCH(awk,TOK_MINUS))? QSE_AWK_UNROP_MINUS: (MATCH(awk,TOK_MINUS))? QSE_AWK_UNROP_MINUS:
@ -3717,23 +3767,68 @@ static qse_awk_nde_t* parse_unary (
awk->parse.depth.cur.expr--; awk->parse.depth.cur.expr--;
if (left == QSE_NULL) return QSE_NULL; if (left == QSE_NULL) return QSE_NULL;
nde = (qse_awk_nde_exp_t*) fold = 0;
QSE_AWK_ALLOC (awk, QSE_SIZEOF(qse_awk_nde_exp_t)); if (left->type == QSE_AWK_NDE_INT)
if (nde == QSE_NULL)
{ {
qse_awk_clrpt (awk, left); fold = 1;
SETERR_LOC (awk, QSE_AWK_ENOMEM, xloc);
return QSE_NULL; switch (opcode)
{
case QSE_AWK_UNROP_PLUS:
folded_l = ((qse_awk_nde_int_t*)left)->val;
break;
case QSE_AWK_UNROP_MINUS:
folded_l = -((qse_awk_nde_int_t*)left)->val;
break;
case QSE_AWK_UNROP_LNOT:
folded_l = !((qse_awk_nde_int_t*)left)->val;
break;
case QSE_AWK_UNROP_BNOT:
folded_l = ~((qse_awk_nde_int_t*)left)->val;
break;
default:
fold = 0;
break;
}
} }
nde->type = QSE_AWK_NDE_EXP_UNR; if (fold)
nde->loc = *xloc; {
nde->next = QSE_NULL; ((qse_awk_nde_int_t*)left)->val = folded_l;
nde->opcode = opcode; if (((qse_awk_nde_int_t*)left)->str)
nde->left = left; {
nde->right = QSE_NULL; QSE_AWK_FREE (awk, ((qse_awk_nde_int_t*)left)->str);
((qse_awk_nde_int_t*)left)->str = QSE_NULL;
((qse_awk_nde_int_t*)left)->len = 0;
}
return left;
}
else
{
nde = (qse_awk_nde_exp_t*)
QSE_AWK_ALLOC (awk, QSE_SIZEOF(qse_awk_nde_exp_t));
if (nde == QSE_NULL)
{
qse_awk_clrpt (awk, left);
SETERR_LOC (awk, QSE_AWK_ENOMEM, xloc);
return QSE_NULL;
}
nde->type = QSE_AWK_NDE_EXP_UNR;
nde->loc = *xloc;
nde->next = QSE_NULL;
nde->opcode = opcode;
nde->left = left;
nde->right = QSE_NULL;
return (qse_awk_nde_t*)nde;
}
return (qse_awk_nde_t*)nde;
} }
static qse_awk_nde_t* parse_exponent ( static qse_awk_nde_t* parse_exponent (

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

@ -1,5 +1,5 @@
/* /*
* $Id: run.c 485 2011-05-29 15:15:52Z hyunghwan.chung $ * $Id: run.c 514 2011-07-22 15:37:46Z hyunghwan.chung $
* *
Copyright 2006-2011 Chung, Hyung-Hwan. Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE. This file is part of QSE.
@ -6822,22 +6822,12 @@ qse_char_t* qse_awk_rtx_format (
do do
{ {
n = rtx->awk->prm.sprintf ( n = qse_awk_sprintlong (
rtx->awk, rtx->awk,
rtx->format.tmp.ptr, rtx->format.tmp.ptr,
rtx->format.tmp.len, rtx->format.tmp.len,
#if QSE_SIZEOF_LONG_LONG > 0 width
QSE_T("%lld"), (long long)width );
#elif QSE_SIZEOF___INT64 > 0
QSE_T("%I64d"), (__int64)width
#elif QSE_SIZEOF_LONG > 0
QSE_T("%ld"), (long)width
#elif QSE_SIZEOF_INT > 0
QSE_T("%d"), (int)width
#else
#error unsupported size
#endif
);
if (n == -1) if (n == -1)
{ {
GROW (&rtx->format.tmp); GROW (&rtx->format.tmp);

42
qse/lib/awk/tree.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: tree.c 485 2011-05-29 15:15:52Z hyunghwan.chung $ * $Id: tree.c 514 2011-07-22 15:37:46Z hyunghwan.chung $
* *
Copyright 2006-2011 Chung, Hyung-Hwan. Copyright 2006-2011 Chung, Hyung-Hwan.
This file is part of QSE. This file is part of QSE.
@ -260,19 +260,39 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
case QSE_AWK_NDE_INT: case QSE_AWK_NDE_INT:
{ {
QSE_ASSERT (((qse_awk_nde_int_t*)nde)->str != QSE_NULL); if (((qse_awk_nde_int_t*)nde)->str)
PUT_SRCSTRX (awk, {
((qse_awk_nde_int_t*)nde)->str, PUT_SRCSTRX (awk,
((qse_awk_nde_int_t*)nde)->len); ((qse_awk_nde_int_t*)nde)->str,
((qse_awk_nde_int_t*)nde)->len);
}
else
{
qse_char_t buf[64];
qse_awk_sprintlong (
awk, buf, QSE_COUNTOF(buf),
((qse_awk_nde_int_t*)nde)->val);
PUT_SRCSTR (awk, buf);
}
break; break;
} }
case QSE_AWK_NDE_REAL: case QSE_AWK_NDE_REAL:
{ {
QSE_ASSERT (((qse_awk_nde_real_t*)nde)->str != QSE_NULL); if (((qse_awk_nde_real_t*)nde)->str)
PUT_SRCSTRX (awk, {
((qse_awk_nde_real_t*)nde)->str, PUT_SRCSTRX (awk,
((qse_awk_nde_real_t*)nde)->len); ((qse_awk_nde_real_t*)nde)->str,
((qse_awk_nde_real_t*)nde)->len);
}
else
{
qse_char_t buf[64];
qse_awk_sprintreal (
awk, buf, QSE_COUNTOF(buf),
((qse_awk_nde_real_t*)nde)->val);
PUT_SRCSTR (awk, buf);
}
break; break;
} }
@ -1211,7 +1231,7 @@ void qse_awk_clrpt (qse_awk_t* awk, qse_awk_nde_t* tree)
case QSE_AWK_NDE_INT: case QSE_AWK_NDE_INT:
{ {
if (((qse_awk_nde_int_t*)p)->str != QSE_NULL) if (((qse_awk_nde_int_t*)p)->str)
QSE_AWK_FREE (awk, ((qse_awk_nde_int_t*)p)->str); QSE_AWK_FREE (awk, ((qse_awk_nde_int_t*)p)->str);
QSE_AWK_FREE (awk, p); QSE_AWK_FREE (awk, p);
break; break;
@ -1219,7 +1239,7 @@ void qse_awk_clrpt (qse_awk_t* awk, qse_awk_nde_t* tree)
case QSE_AWK_NDE_REAL: case QSE_AWK_NDE_REAL:
{ {
if (((qse_awk_nde_real_t*)p)->str != QSE_NULL) if (((qse_awk_nde_real_t*)p)->str)
QSE_AWK_FREE (awk, ((qse_awk_nde_real_t*)p)->str); QSE_AWK_FREE (awk, ((qse_awk_nde_real_t*)p)->str);
QSE_AWK_FREE (awk, p); QSE_AWK_FREE (awk, p);
break; break;