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-04-09 16:26:36 +00:00
parent 8d1ccbc72b
commit 2076f07738
1 changed files with 82 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.40 2006-04-09 15:34:38 bacon Exp $
* $Id: run.c,v 1.41 2006-04-09 16:26:36 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -146,6 +146,27 @@ int xp_awk_run (xp_awk_t* awk)
}
}
if (awk->opt.run & XP_AWK_RUNMAIN)
{
static xp_char_t m_a_i_n[] =
{
XP_CHAR('m'),
XP_CHAR('a'),
XP_CHAR('i'),
XP_CHAR('n'),
XP_CHAR('\0')
};
static xp_awk_nde_call_t nde =
{
XP_AWK_NDE_CALL, /* type */
XP_NULL, /* next */
m_a_i_n, /* name */
XP_NULL /* args */
};
if (__eval_call (awk, (xp_awk_nde_t*)&nde) == XP_NULL) n = -1;
}
else
{
saved_stack_top = awk->run.stack_top;
if (__raw_push(awk,(void*)awk->run.stack_base) == -1)
{
@ -185,28 +206,6 @@ int xp_awk_run (xp_awk_t* awk)
STACK_NARGS(awk) = (void*)nargs;
/* stack set up properly. ready to exeucte statement blocks */
if (awk->opt.run & XP_AWK_RUNMAIN)
{
static xp_char_t funcname[] =
{
XP_CHAR('m'),
XP_CHAR('a'),
XP_CHAR('i'),
XP_CHAR('n'),
XP_CHAR('\0')
};
static xp_awk_nde_call_t nde =
{
XP_AWK_NDE_CALL, /* type */
XP_NULL, /* next */
funcname, /* name */
XP_NULL /* args */
};
if (__eval_call (awk, (xp_awk_nde_t*)&nde) == XP_NULL) n = -1;
}
else
{
if (n == 0 && awk->tree.begin != XP_NULL)
{
xp_assert (awk->tree.begin->type == XP_AWK_NDE_BLK);
@ -214,6 +213,8 @@ int xp_awk_run (xp_awk_t* awk)
(xp_awk_nde_blk_t*)awk->tree.begin) == -1) n = -1;
}
// TODO: if EXIT_PROGRAM IS SET , do not continue to END BLOCK...
// TODO: execute pattern blocks.
if (n == 0 && awk->tree.end != XP_NULL)
@ -222,7 +223,6 @@ int xp_awk_run (xp_awk_t* awk)
if (__run_block (awk,
(xp_awk_nde_blk_t*)awk->tree.end) == -1) n = -1;
}
}
/* restore stack */
nargs = (xp_size_t)STACK_NARGS(awk);
@ -235,8 +235,15 @@ int xp_awk_run (xp_awk_t* awk)
v = STACK_RETVAL(awk);
xp_awk_refdownval_nofree (awk, v);
awk->run.stack_top = (xp_size_t)awk->run.stack[awk->run.stack_base+1];
awk->run.stack_base = (xp_size_t)awk->run.stack[awk->run.stack_base+0];
awk->run.stack_top =
(xp_size_t)awk->run.stack[awk->run.stack_base+1];
awk->run.stack_base =
(xp_size_t)awk->run.stack[awk->run.stack_base+0];
xp_printf (XP_TEXT("Return Value - "));
xp_awk_printval (v);
xp_printf (XP_TEXT("\n"));
}
/* pops off the global variables */
nglobals = awk->tree.nglobals;
@ -248,9 +255,6 @@ int xp_awk_run (xp_awk_t* awk)
}
xp_printf (XP_TEXT("-[VARIABLES]------------------------\n"));
xp_printf (XP_TEXT("Return Value - "));
xp_awk_printval (v);
xp_printf (XP_TEXT("\n"));
xp_awk_map_walk (&awk->run.named, __printval);
xp_printf (XP_TEXT("-[END VARIABLES]--------------------------\n"));
return n;
@ -856,7 +860,12 @@ static xp_awk_val_t* __eval_binop_eq (
xp_awk_val_t* res = XP_NULL;
xp_long_t r = 0;
if (left->type == XP_AWK_VAL_INT &&
if (left->type == XP_AWK_VAL_NIL ||
right->type == XP_AWK_VAL_NIL)
{
r = (left->type == right->type);
}
else if (left->type == XP_AWK_VAL_INT &&
right->type == XP_AWK_VAL_INT)
{
r = ((xp_awk_val_int_t*)left)->val ==
@ -905,7 +914,12 @@ static xp_awk_val_t* __eval_binop_ne (
xp_awk_val_t* res = XP_NULL;
xp_long_t r = 0;
if (left->type == XP_AWK_VAL_INT &&
if (left->type == XP_AWK_VAL_NIL ||
right->type == XP_AWK_VAL_NIL)
{
r = (left->type != right->type);
}
else if (left->type == XP_AWK_VAL_INT &&
right->type == XP_AWK_VAL_INT)
{
r = ((xp_awk_val_int_t*)left)->val !=
@ -1525,8 +1539,8 @@ static xp_awk_val_t* __eval_incpre (xp_awk_t* awk, xp_awk_nde_t* nde)
exp->left->type != XP_AWK_NDE_GLOBALIDX &&
exp->left->type != XP_AWK_NDE_LOCALIDX &&
exp->left->type != XP_AWK_NDE_ARGIDX)*/
if (exp->left->type >= XP_AWK_NDE_NAMED &&
exp->left->type <= XP_AWK_NDE_ARGIDX)
if (exp->left->type < XP_AWK_NDE_NAMED ||
exp->left->type > XP_AWK_NDE_ARGIDX)
{
PANIC (awk, XP_AWK_EOPERAND);
}
@ -1611,8 +1625,8 @@ static xp_awk_val_t* __eval_incpst (xp_awk_t* awk, xp_awk_nde_t* nde)
exp->left->type != XP_AWK_NDE_GLOBALIDX &&
exp->left->type != XP_AWK_NDE_LOCALIDX &&
exp->left->type != XP_AWK_NDE_ARGIDX) */
if (exp->left->type >= XP_AWK_NDE_NAMED &&
exp->left->type <= XP_AWK_NDE_ARGIDX)
if (exp->left->type < XP_AWK_NDE_NAMED ||
exp->left->type > XP_AWK_NDE_ARGIDX)
{
PANIC (awk, XP_AWK_EOPERAND);
}