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

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2006-07-31 04:25:17 +00:00
parent 913b7dd072
commit abccc489ba
4 changed files with 207 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.144 2006-07-30 15:53:42 bacon Exp $
* $Id: run.c,v 1.145 2006-07-31 04:25:17 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -2925,15 +2925,9 @@ static xp_awk_val_t* __eval_incpre (xp_awk_run_t* run, xp_awk_nde_t* nde)
xp_assert (exp->type == XP_AWK_NDE_EXP_INCPRE);
xp_assert (exp->left != XP_NULL && exp->right == XP_NULL);
/* ugly. but let's keep going this way for the time being */
/*if (exp->left->type != XP_AWK_NDE_NAMED &&
exp->left->type != XP_AWK_NDE_GLOBAL &&
exp->left->type != XP_AWK_NDE_LOCAL &&
exp->left->type != XP_AWK_NDE_ARG &&
exp->left->type != XP_AWK_NDE_NAMEDIDX &&
exp->left->type != XP_AWK_NDE_GLOBALIDX &&
exp->left->type != XP_AWK_NDE_LOCALIDX &&
exp->left->type != XP_AWK_NDE_ARGIDX) */
/* this way of checking if the l-value is assignable is
* ugly as it is dependent of the values defined in tree.h.
* but let's keep going this way for the time being. */
if (exp->left->type < XP_AWK_NDE_NAMED ||
exp->left->type > XP_AWK_NDE_ARGIDX)
{
@ -2952,19 +2946,51 @@ static xp_awk_val_t* __eval_incpre (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_long_t r = ((xp_awk_val_int_t*)left)->val;
res = xp_awk_makeintval (run, r + 1);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
else if (left->type == XP_AWK_VAL_REAL)
{
xp_real_t r = ((xp_awk_val_real_t*)left)->val;
res = xp_awk_makerealval (run, r + 1.0);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
else
{
xp_long_t v1;
xp_real_t v2;
int n;
n = xp_awk_valtonum (left, &v1, &v2);
if (n == -1)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_EOPERAND);
}
if (n == 0)
{
res = xp_awk_makeintval (run, v1 + 1);
}
else /* if (n == 1) */
{
xp_assert (n == 1);
res = xp_awk_makerealval (run, v2 + 1.0);
}
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
}
else if (exp->opcode == XP_AWK_INCOP_MINUS)
{
@ -2972,19 +2998,51 @@ static xp_awk_val_t* __eval_incpre (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_long_t r = ((xp_awk_val_int_t*)left)->val;
res = xp_awk_makeintval (run, r - 1);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
else if (left->type == XP_AWK_VAL_REAL)
{
xp_real_t r = ((xp_awk_val_real_t*)left)->val;
res = xp_awk_makerealval (run, r - 1.0);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
else
{
xp_long_t v1;
xp_real_t v2;
int n;
n = xp_awk_valtonum (left, &v1, &v2);
if (n == -1)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_EOPERAND);
}
if (n == 0)
{
res = xp_awk_makeintval (run, v1 - 1);
}
else /* if (n == 1) */
{
xp_assert (n == 1);
res = xp_awk_makerealval (run, v2 - 1.0);
}
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
}
}
else
{
@ -3011,15 +3069,9 @@ static xp_awk_val_t* __eval_incpst (xp_awk_run_t* run, xp_awk_nde_t* nde)
xp_assert (exp->type == XP_AWK_NDE_EXP_INCPST);
xp_assert (exp->left != XP_NULL && exp->right == XP_NULL);
/* ugly. but let's keep going this way for the time being */
/*if (exp->left->type != XP_AWK_NDE_NAMED &&
exp->left->type != XP_AWK_NDE_GLOBAL &&
exp->left->type != XP_AWK_NDE_LOCAL &&
exp->left->type != XP_AWK_NDE_ARG &&
exp->left->type != XP_AWK_NDE_NAMEDIDX &&
exp->left->type != XP_AWK_NDE_GLOBALIDX &&
exp->left->type != XP_AWK_NDE_LOCALIDX &&
exp->left->type != XP_AWK_NDE_ARGIDX) */
/* this way of checking if the l-value is assignable is
* ugly as it is dependent of the values defined in tree.h.
* but let's keep going this way for the time being. */
if (exp->left->type < XP_AWK_NDE_NAMED ||
exp->left->type > XP_AWK_NDE_ARGIDX)
{
@ -3038,11 +3090,16 @@ static xp_awk_val_t* __eval_incpst (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_long_t r = ((xp_awk_val_int_t*)left)->val;
res = xp_awk_makeintval (run, r);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makeintval (run, r + 1);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
@ -3051,20 +3108,69 @@ static xp_awk_val_t* __eval_incpst (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_real_t r = ((xp_awk_val_real_t*)left)->val;
res = xp_awk_makerealval (run, r);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makerealval (run, r + 1.0);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
else
{
xp_long_t v1;
xp_real_t v2;
int n;
n = xp_awk_valtonum (left, &v1, &v2);
if (n == -1)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_EOPERAND);
}
if (n == 0)
{
res = xp_awk_makeintval (run, v1);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makeintval (run, v1 + 1);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
else /* if (n == 1) */
{
xp_assert (n == 1);
res = xp_awk_makerealval (run, v2);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makerealval (run, v2 + 1.0);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
}
}
else if (exp->opcode == XP_AWK_INCOP_MINUS)
{
@ -3072,11 +3178,16 @@ static xp_awk_val_t* __eval_incpst (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_long_t r = ((xp_awk_val_int_t*)left)->val;
res = xp_awk_makeintval (run, r);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makeintval (run, r - 1);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
@ -3085,20 +3196,69 @@ static xp_awk_val_t* __eval_incpst (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_real_t r = ((xp_awk_val_real_t*)left)->val;
res = xp_awk_makerealval (run, r);
if (res == XP_NULL) PANIC (run, XP_AWK_ENOMEM);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makerealval (run, r - 1.0);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
else
{
xp_long_t v1;
xp_real_t v2;
int n;
n = xp_awk_valtonum (left, &v1, &v2);
if (n == -1)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_EOPERAND);
}
if (n == 0)
{
res = xp_awk_makeintval (run, v1);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makeintval (run, v1 - 1);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
else /* if (n == 1) */
{
xp_assert (n == 1);
res = xp_awk_makerealval (run, v2);
if (res == XP_NULL)
{
xp_awk_refdownval (run, left);
PANIC (run, XP_AWK_ENOMEM);
}
res2 = xp_awk_makerealval (run, v2 - 1.0);
if (res2 == XP_NULL)
{
xp_awk_refdownval (run, left);
xp_awk_freeval (run, res, xp_true);
PANIC (run, XP_AWK_ENOMEM);
}
}
}
}
else
{

7
ase/awk/tree.h
View File

@ -1,5 +1,5 @@
/*
* $Id: tree.h,v 1.63 2006-07-26 15:00:00 bacon Exp $
* $Id: tree.h,v 1.64 2006-07-31 04:25:17 bacon Exp $
*/
#ifndef _XP_AWK_TREE_H_
@ -46,6 +46,9 @@ enum
XP_AWK_NDE_REAL,
XP_AWK_NDE_STR,
XP_AWK_NDE_REX,
/* keep this order for the following items otherwise, you may have
* to change __eval_incpre and __eval_incpst in run.c*/
XP_AWK_NDE_NAMED,
XP_AWK_NDE_GLOBAL,
XP_AWK_NDE_LOCAL,
@ -54,6 +57,8 @@ enum
XP_AWK_NDE_GLOBALIDX,
XP_AWK_NDE_LOCALIDX,
XP_AWK_NDE_ARGIDX,
/* ---------------------------------- */
XP_AWK_NDE_POS,
XP_AWK_NDE_GETLINE,
};

4
ase/test/awk/awk.c
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.c,v 1.56 2006-07-28 10:38:16 bacon Exp $
* $Id: awk.c,v 1.57 2006-07-31 04:25:17 bacon Exp $
*/
#include <xp/awk/awk.h>
@ -303,7 +303,7 @@ static int next_extio_console (xp_awk_extio_t* epa);
static const xp_char_t* infiles[] =
{
XP_T(""),
//XP_T(""),
XP_T("awk.in"),
XP_NULL
};

4
ase/test/awk/t19.awk Normal file
View File

@ -0,0 +1,4 @@
//BEGIN { nlines="0.345"; }
{ nlines++; }
END { print nlines; }