*** empty log message ***

This commit is contained in:
hyung-hwan 2006-06-12 15:11:02 +00:00
parent 55bd4120c0
commit 8dd2ceb931
4 changed files with 502 additions and 324 deletions

View File

@ -1,5 +1,5 @@
/* /*
* $Id: parse.c,v 1.110 2006-06-11 15:26:12 bacon Exp $ * $Id: parse.c,v 1.111 2006-06-12 15:11:02 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -1432,7 +1432,6 @@ static xp_awk_nde_t* __parse_bitwise_or (xp_awk_t* awk)
return __parse_binary_expr (awk, map, __parse_bitwise_xor); return __parse_binary_expr (awk, map, __parse_bitwise_xor);
*/ */
xp_awk_nde_exp_t* nde;
xp_awk_nde_t* left, * right; xp_awk_nde_t* left, * right;
left = __parse_bitwise_xor (awk); left = __parse_bitwise_xor (awk);
@ -1450,6 +1449,9 @@ static xp_awk_nde_t* __parse_bitwise_or (xp_awk_t* awk)
if (MATCH(awk,TOKEN_GETLINE)) if (MATCH(awk,TOKEN_GETLINE))
{ {
xp_awk_nde_getline_t* nde;
xp_awk_nde_t* var = XP_NULL;
/* piped getline */ /* piped getline */
if (__get_token(awk) == -1) if (__get_token(awk) == -1)
{ {
@ -1457,23 +1459,20 @@ static xp_awk_nde_t* __parse_bitwise_or (xp_awk_t* awk)
return XP_NULL; return XP_NULL;
} }
/* TODO: is this correct? */
if (MATCH(awk,TOKEN_IDENT)) if (MATCH(awk,TOKEN_IDENT))
{ {
/* command | getline var */ /* command | getline var */
/* TODO */ var = __parse_primary (awk);
if (var == XP_NULL)
if (__get_token(awk) == -1)
{ {
xp_awk_clrpt (left); xp_awk_clrpt (left);
return XP_NULL; return XP_NULL;
} }
} }
else
{
/* TODO */
/* command | getline */
nde = (xp_awk_nde_getline_t*) nde = (xp_awk_nde_getline_t*)
xp_malloc (xp_sizeof(xp_awk_nde_getline_t)); xp_malloc (xp_sizeof(xp_awk_nde_getline_t));
if (nde == XP_NULL) if (nde == XP_NULL)
@ -1482,15 +1481,18 @@ static xp_awk_nde_t* __parse_bitwise_or (xp_awk_t* awk)
PANIC (awk, XP_AWK_ENOMEM); PANIC (awk, XP_AWK_ENOMEM);
} }
nde->type = XP_AWK_NDE_GETLINE_BIN; nde->type = XP_AWK_NDE_GETLINE;
nde->next = XP_NULL; nde->next = XP_NULL;
nde->var = var;
nde->cmd = left; nde->cmd = left;
nde->var = XP_NULL; nde->out = XP_NULL;
nde->file = XP_NULL;
} left = (xp_awk_nde_t*)nde;
} }
else else
{ {
xp_awk_nde_exp_t* nde;
right = __parse_bitwise_xor (awk); right = __parse_bitwise_xor (awk);
if (right == XP_NULL) if (right == XP_NULL)
{ {

View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.92 2006-05-12 07:52:14 bacon Exp $ * $Id: run.c,v 1.93 2006-06-12 15:11:02 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -132,6 +132,7 @@ static xp_awk_val_t* __eval_globalidx (xp_awk_run_t* run, xp_awk_nde_t* nde);
static xp_awk_val_t* __eval_localidx (xp_awk_run_t* run, xp_awk_nde_t* nde); static xp_awk_val_t* __eval_localidx (xp_awk_run_t* run, xp_awk_nde_t* nde);
static xp_awk_val_t* __eval_argidx (xp_awk_run_t* run, xp_awk_nde_t* nde); static xp_awk_val_t* __eval_argidx (xp_awk_run_t* run, xp_awk_nde_t* nde);
static xp_awk_val_t* __eval_pos (xp_awk_run_t* run, xp_awk_nde_t* nde); static xp_awk_val_t* __eval_pos (xp_awk_run_t* run, xp_awk_nde_t* nde);
static xp_awk_val_t* __eval_getline (xp_awk_run_t* run, xp_awk_nde_t* nde);
static int __raw_push (xp_awk_run_t* run, void* val); static int __raw_push (xp_awk_run_t* run, void* val);
static void __raw_pop (xp_awk_run_t* run); static void __raw_pop (xp_awk_run_t* run);
@ -1024,7 +1025,8 @@ static xp_awk_val_t* __eval_expression (xp_awk_run_t* run, xp_awk_nde_t* nde)
__eval_globalidx, __eval_globalidx,
__eval_localidx, __eval_localidx,
__eval_argidx, __eval_argidx,
__eval_pos __eval_pos,
__eval_getline
}; };
xp_assert (nde->type >= XP_AWK_NDE_GRP && xp_assert (nde->type >= XP_AWK_NDE_GRP &&
@ -2805,6 +2807,12 @@ static xp_awk_val_t* __eval_pos (xp_awk_run_t* run, xp_awk_nde_t* nde)
return XP_NULL; return XP_NULL;
} }
static xp_awk_val_t* __eval_getline (xp_awk_run_t* run, xp_awk_nde_t* nde)
{
xp_printf (XP_T("eval_getline not competed....\n"));
return XP_NULL;
}
static int __raw_push (xp_awk_run_t* run, void* val) static int __raw_push (xp_awk_run_t* run, void* val)
{ {
if (run->stack_top >= run->stack_limit) if (run->stack_top >= run->stack_limit)

View File

@ -1,5 +1,5 @@
/* /*
* $Id: tree.c,v 1.49 2006-05-09 15:58:16 bacon Exp $ * $Id: tree.c,v 1.50 2006-06-12 15:11:02 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -94,187 +94,276 @@ static int __print_expression (xp_awk_nde_t* nde)
p = p->next; p = p->next;
} }
xp_printf (XP_T(")")); xp_printf (XP_T(")"));
}
break; break;
}
case XP_AWK_NDE_ASS: case XP_AWK_NDE_ASS:
if (__print_expression (((xp_awk_nde_ass_t*)nde)->left) == -1) return -1; {
xp_printf (XP_T(" %s "), __assop_str[((xp_awk_nde_exp_t*)nde)->opcode]); xp_awk_nde_ass_t* px = (xp_awk_nde_ass_t*)nde;
if (__print_expression (((xp_awk_nde_ass_t*)nde)->right) == -1) return -1;
xp_assert ((((xp_awk_nde_ass_t*)nde)->right)->next == XP_NULL); if (__print_expression (px->left) == -1) return -1;
xp_printf (XP_T(" %s "), __assop_str[px->opcode]);
if (__print_expression (px->right) == -1) return -1;
xp_assert (px->right->next == XP_NULL);
break; break;
}
case XP_AWK_NDE_EXP_BIN: case XP_AWK_NDE_EXP_BIN:
{
xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)nde;
xp_printf (XP_T("(")); xp_printf (XP_T("("));
if (__print_expression(((xp_awk_nde_exp_t*)nde)->left) == -1) return -1; if (__print_expression(px->left) == -1) return -1;
xp_assert ((((xp_awk_nde_exp_t*)nde)->left)->next == XP_NULL); xp_assert (px->left->next == XP_NULL);
xp_printf (XP_T(" %s "), __binop_str[((xp_awk_nde_exp_t*)nde)->opcode]); xp_printf (XP_T(" %s "), __binop_str[px->opcode]);
if (((xp_awk_nde_exp_t*)nde)->right->type == XP_AWK_NDE_ASS) xp_printf (XP_T("(")); if (px->right->type == XP_AWK_NDE_ASS) xp_printf (XP_T("("));
if (__print_expression (((xp_awk_nde_exp_t*)nde)->right) == -1) return -1; if (__print_expression (px->right) == -1) return -1;
if (((xp_awk_nde_exp_t*)nde)->right->type == XP_AWK_NDE_ASS) xp_printf (XP_T(")")); if (px->right->type == XP_AWK_NDE_ASS) xp_printf (XP_T(")"));
xp_assert ((((xp_awk_nde_exp_t*)nde)->right)->next == XP_NULL); xp_printf (XP_T(")")); xp_assert (px->right->next == XP_NULL);
xp_printf (XP_T(")"));
break; break;
}
case XP_AWK_NDE_EXP_UNR: case XP_AWK_NDE_EXP_UNR:
xp_assert (((xp_awk_nde_exp_t*)nde)->right == XP_NULL); {
xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)nde;
xp_assert (px->right == XP_NULL);
xp_printf (XP_T("%s("), __unrop_str[((xp_awk_nde_exp_t*)nde)->opcode]); xp_printf (XP_T("%s("), __unrop_str[px->opcode]);
if (__print_expression (((xp_awk_nde_exp_t*)nde)->left) == -1) return -1; if (__print_expression (px->left) == -1) return -1;
xp_printf (XP_T(")")); xp_printf (XP_T(")"));
break; break;
}
case XP_AWK_NDE_EXP_INCPRE: case XP_AWK_NDE_EXP_INCPRE:
xp_assert (((xp_awk_nde_exp_t*)nde)->right == XP_NULL); {
xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)nde;
xp_assert (px->right == XP_NULL);
xp_printf (XP_T("%s("), __incop_str[((xp_awk_nde_exp_t*)nde)->opcode]); xp_printf (XP_T("%s("), __incop_str[px->opcode]);
if (__print_expression (((xp_awk_nde_exp_t*)nde)->left) == -1) return -1; if (__print_expression (px->left) == -1) return -1;
xp_printf (XP_T(")")); xp_printf (XP_T(")"));
break; break;
}
case XP_AWK_NDE_EXP_INCPST: case XP_AWK_NDE_EXP_INCPST:
xp_assert (((xp_awk_nde_exp_t*)nde)->right == XP_NULL); {
xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)nde;
xp_assert (px->right == XP_NULL);
xp_printf (XP_T("(")); xp_printf (XP_T("("));
if (__print_expression (((xp_awk_nde_exp_t*)nde)->left) == -1) return -1; if (__print_expression (px->left) == -1) return -1;
xp_printf (XP_T(")%s"), __incop_str[((xp_awk_nde_exp_t*)nde)->opcode]); xp_printf (XP_T(")%s"), __incop_str[px->opcode]);
break; break;
}
case XP_AWK_NDE_CND: case XP_AWK_NDE_CND:
{
xp_awk_nde_cnd_t* px = (xp_awk_nde_cnd_t*)nde;
xp_printf (XP_T("(")); xp_printf (XP_T("("));
if (__print_expression(((xp_awk_nde_cnd_t*)nde)->test) == -1) return -1; if (__print_expression(px->test) == -1) return -1;
xp_printf (XP_T(")?")); xp_printf (XP_T(")?"));
if (__print_expression(((xp_awk_nde_cnd_t*)nde)->left) == -1) return -1; if (__print_expression(px->left) == -1) return -1;
xp_printf (XP_T(":")); xp_printf (XP_T(":"));
if (__print_expression(((xp_awk_nde_cnd_t*)nde)->right) == -1) return -1; if (__print_expression(px->right) == -1) return -1;
break; break;
}
case XP_AWK_NDE_INT: case XP_AWK_NDE_INT:
{
#if defined(__LCC__) #if defined(__LCC__)
xp_printf (XP_T("%lld"), (long long)((xp_awk_nde_int_t*)nde)->val); xp_printf (XP_T("%lld"),
(long long)((xp_awk_nde_int_t*)nde)->val);
#elif defined(__BORLANDC__) || defined(_MSC_VER) #elif defined(__BORLANDC__) || defined(_MSC_VER)
xp_printf (XP_T("%I64d"), (__int64)((xp_awk_nde_int_t*)nde)->val); xp_printf (XP_T("%I64d"),
(__int64)((xp_awk_nde_int_t*)nde)->val);
#elif defined(vax) || defined(__vax) || defined(_SCO_DS) #elif defined(vax) || defined(__vax) || defined(_SCO_DS)
xp_printf (XP_T("%ld"), (long)((xp_awk_nde_int_t*)nde)->val); xp_printf (XP_T("%ld"),
(long)((xp_awk_nde_int_t*)nde)->val);
#else #else
xp_printf (XP_T("%lld"), (long long)((xp_awk_nde_int_t*)nde)->val); xp_printf (XP_T("%lld"),
(long long)((xp_awk_nde_int_t*)nde)->val);
#endif #endif
break; break;
}
case XP_AWK_NDE_REAL: case XP_AWK_NDE_REAL:
xp_printf (XP_T("%Lf"), (long double)((xp_awk_nde_real_t*)nde)->val); {
xp_printf (XP_T("%Lf"),
(long double)((xp_awk_nde_real_t*)nde)->val);
break; break;
}
case XP_AWK_NDE_STR: case XP_AWK_NDE_STR:
{
/* TODO: buf, len */ /* TODO: buf, len */
xp_printf (XP_T("\"%s\""), ((xp_awk_nde_str_t*)nde)->buf); xp_printf (XP_T("\"%s\""), ((xp_awk_nde_str_t*)nde)->buf);
break; break;
}
case XP_AWK_NDE_REX: case XP_AWK_NDE_REX:
{
/* TODO: buf, len */ /* TODO: buf, len */
xp_printf (XP_T("/%s/"), ((xp_awk_nde_rex_t*)nde)->buf); xp_printf (XP_T("/%s/"), ((xp_awk_nde_rex_t*)nde)->buf);
break; break;
}
case XP_AWK_NDE_ARG: case XP_AWK_NDE_ARG:
xp_assert (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1); {
xp_printf (XP_T("__arg%lu"), xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); xp_assert (px->id.idxa != (xp_size_t)-1);
xp_assert (((xp_awk_nde_var_t*)nde)->idx == XP_NULL); xp_printf (XP_T("__arg%lu"), (unsigned long)px->id.idxa);
xp_assert (px->idx == XP_NULL);
break; break;
}
case XP_AWK_NDE_ARGIDX: case XP_AWK_NDE_ARGIDX:
xp_assert (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1); {
xp_printf (XP_T("__arg%lu["), xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); xp_assert (px->id.idxa != (xp_size_t)-1);
xp_assert (((xp_awk_nde_var_t*)nde)->idx != XP_NULL); xp_printf (XP_T("__arg%lu["), (unsigned long)px->id.idxa);
__print_expression_list (((xp_awk_nde_var_t*)nde)->idx); xp_assert (px->idx != XP_NULL);
__print_expression_list (px->idx);
xp_printf (XP_T("]")); xp_printf (XP_T("]"));
break; break;
}
case XP_AWK_NDE_NAMED: case XP_AWK_NDE_NAMED:
xp_assert (((xp_awk_nde_var_t*)nde)->id.idxa == (xp_size_t)-1); {
xp_printf (XP_T("%s"), ((xp_awk_nde_var_t*)nde)->id.name); xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
xp_assert (((xp_awk_nde_var_t*)nde)->idx == XP_NULL); xp_assert (px->id.idxa == (xp_size_t)-1);
xp_printf (XP_T("%s"), px->id.name);
xp_assert (px->idx == XP_NULL);
break; break;
}
case XP_AWK_NDE_NAMEDIDX: case XP_AWK_NDE_NAMEDIDX:
xp_assert (((xp_awk_nde_var_t*)nde)->id.idxa == (xp_size_t)-1); {
xp_printf (XP_T("%s["), ((xp_awk_nde_var_t*)nde)->id.name); xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
xp_assert (((xp_awk_nde_var_t*)nde)->idx != XP_NULL); xp_assert (px->id.idxa == (xp_size_t)-1);
__print_expression_list (((xp_awk_nde_var_t*)nde)->idx); xp_printf (XP_T("%s["), px->id.name);
xp_assert (px->idx != XP_NULL);
__print_expression_list (px->idx);
xp_printf (XP_T("]")); xp_printf (XP_T("]"));
break; break;
}
case XP_AWK_NDE_GLOBAL: case XP_AWK_NDE_GLOBAL:
if (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1) {
xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
if (px->id.idxa != (xp_size_t)-1)
{ {
xp_printf (XP_T("__global%lu"), xp_printf (XP_T("__global%lu"),
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); (unsigned long)px->id.idxa);
} }
else else
{ {
xp_printf (XP_T("%s"), ((xp_awk_nde_var_t*)nde)->id.name); xp_printf (XP_T("%s"), px->id.name);
} }
xp_assert (((xp_awk_nde_var_t*)nde)->idx == XP_NULL); xp_assert (px->idx == XP_NULL);
break; break;
}
case XP_AWK_NDE_GLOBALIDX: case XP_AWK_NDE_GLOBALIDX:
if (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1) {
xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
if (px->id.idxa != (xp_size_t)-1)
{ {
xp_printf (XP_T("__global%lu["), xp_printf (XP_T("__global%lu["),
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); (unsigned long)px->id.idxa);
} }
else else
{ {
xp_printf (XP_T("%s["), ((xp_awk_nde_var_t*)nde)->id.name); xp_printf (XP_T("%s["), px->id.name);
} }
xp_assert (((xp_awk_nde_var_t*)nde)->idx != XP_NULL); xp_assert (px->idx != XP_NULL);
__print_expression_list (((xp_awk_nde_var_t*)nde)->idx); __print_expression_list (px->idx);
xp_printf (XP_T("]")); xp_printf (XP_T("]"));
break; break;
}
case XP_AWK_NDE_LOCAL: case XP_AWK_NDE_LOCAL:
if (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1) {
xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
if (px->id.idxa != (xp_size_t)-1)
{ {
xp_printf (XP_T("__local%lu"), xp_printf (XP_T("__local%lu"),
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); (unsigned long)px->id.idxa);
} }
else else
{ {
xp_printf (XP_T("%s"), ((xp_awk_nde_var_t*)nde)->id.name); xp_printf (XP_T("%s"), px->id.name);
} }
xp_assert (((xp_awk_nde_var_t*)nde)->idx == XP_NULL); xp_assert (px->idx == XP_NULL);
break; break;
}
case XP_AWK_NDE_LOCALIDX: case XP_AWK_NDE_LOCALIDX:
if (((xp_awk_nde_var_t*)nde)->id.idxa != (xp_size_t)-1) {
xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)nde;
if (px->id.idxa != (xp_size_t)-1)
{ {
xp_printf (XP_T("__local%lu["), xp_printf (XP_T("__local%lu["),
(unsigned long)((xp_awk_nde_var_t*)nde)->id.idxa); (unsigned long)px->id.idxa);
} }
else else
{ {
xp_printf (XP_T("%s["), ((xp_awk_nde_var_t*)nde)->id.name); xp_printf (XP_T("%s["), px->id.name);
} }
xp_assert (((xp_awk_nde_var_t*)nde)->idx != XP_NULL); xp_assert (px->idx != XP_NULL);
__print_expression_list (((xp_awk_nde_var_t*)nde)->idx); __print_expression_list (px->idx);
xp_printf (XP_T("]")); xp_printf (XP_T("]"));
break; break;
}
case XP_AWK_NDE_POS: case XP_AWK_NDE_POS:
{
xp_printf (XP_T("$")); xp_printf (XP_T("$"));
__print_expression (((xp_awk_nde_pos_t*)nde)->val); __print_expression (((xp_awk_nde_pos_t*)nde)->val);
break; break;
}
case XP_AWK_NDE_CALL: case XP_AWK_NDE_CALL:
xp_printf (XP_T("%s ("), ((xp_awk_nde_call_t*)nde)->name); {
if (__print_expression_list (((xp_awk_nde_call_t*)nde)->args) == -1) return -1; xp_awk_nde_call_t* px = (xp_awk_nde_call_t*)nde;
xp_printf (XP_T("%s ("), px->name);
if (__print_expression_list (px->args) == -1) return -1;
xp_printf (XP_T(")")); xp_printf (XP_T(")"));
break; break;
}
case XP_AWK_NDE_GETLINE:
{
/* TODO */
xp_awk_nde_getline_t* px = (xp_awk_nde_getline_t*)nde;
if (px->cmd != XP_NULL)
{
__print_expression (px->cmd);
xp_printf (XP_TEXT("|"));
}
xp_printf (XP_TEXT("getline"));
if (px->var != XP_NULL)
{
xp_printf (XP_TEXT(" "));
__print_expression (px->var);
}
if (px->out != XP_NULL)
{
xp_printf (XP_TEXT("<"));
__print_expression (px->out);
}
break;
}
default: default:
{
return -1; return -1;
} }
}
return 0; return 0;
} }
@ -540,164 +629,232 @@ void xp_awk_clrpt (xp_awk_nde_t* tree)
switch (p->type) switch (p->type)
{ {
case XP_AWK_NDE_NULL: case XP_AWK_NDE_NULL:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_BLK: case XP_AWK_NDE_BLK:
{
xp_awk_clrpt (((xp_awk_nde_blk_t*)p)->body); xp_awk_clrpt (((xp_awk_nde_blk_t*)p)->body);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_IF: case XP_AWK_NDE_IF:
xp_awk_clrpt (((xp_awk_nde_if_t*)p)->test); {
xp_awk_clrpt (((xp_awk_nde_if_t*)p)->then_part); xp_awk_nde_if_t* px = (xp_awk_nde_if_t*)p;
xp_awk_clrpt (px->test);
xp_awk_clrpt (px->then_part);
if (((xp_awk_nde_if_t*)p)->else_part != XP_NULL) if (px->else_part != XP_NULL)
xp_awk_clrpt (((xp_awk_nde_if_t*)p)->else_part); xp_awk_clrpt (px->else_part);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_WHILE: case XP_AWK_NDE_WHILE:
case XP_AWK_NDE_DOWHILE: case XP_AWK_NDE_DOWHILE:
{
xp_awk_clrpt (((xp_awk_nde_while_t*)p)->test); xp_awk_clrpt (((xp_awk_nde_while_t*)p)->test);
xp_awk_clrpt (((xp_awk_nde_while_t*)p)->body); xp_awk_clrpt (((xp_awk_nde_while_t*)p)->body);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_FOR: case XP_AWK_NDE_FOR:
if (((xp_awk_nde_for_t*)p)->init != XP_NULL) {
xp_awk_clrpt (((xp_awk_nde_for_t*)p)->init); xp_awk_nde_for_t* px = (xp_awk_nde_for_t*)p;
if (((xp_awk_nde_for_t*)p)->test != XP_NULL)
xp_awk_clrpt (((xp_awk_nde_for_t*)p)->test); if (px->init != XP_NULL)
if (((xp_awk_nde_for_t*)p)->incr != XP_NULL) xp_awk_clrpt (px->init);
xp_awk_clrpt (((xp_awk_nde_for_t*)p)->incr); if (px->test != XP_NULL)
xp_awk_clrpt (((xp_awk_nde_for_t*)p)->body); xp_awk_clrpt (px->test);
if (px->incr != XP_NULL)
xp_awk_clrpt (px->incr);
xp_awk_clrpt (px->body);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_FOREACH: case XP_AWK_NDE_FOREACH:
{
xp_awk_clrpt (((xp_awk_nde_foreach_t*)p)->test); xp_awk_clrpt (((xp_awk_nde_foreach_t*)p)->test);
xp_awk_clrpt (((xp_awk_nde_foreach_t*)p)->body); xp_awk_clrpt (((xp_awk_nde_foreach_t*)p)->body);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_BREAK: case XP_AWK_NDE_BREAK:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_CONTINUE: case XP_AWK_NDE_CONTINUE:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_NEXT: case XP_AWK_NDE_NEXT:
case XP_AWK_NDE_NEXTFILE: case XP_AWK_NDE_NEXTFILE:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_RETURN: case XP_AWK_NDE_RETURN:
if (((xp_awk_nde_return_t*)p)->val != XP_NULL) {
xp_awk_clrpt (((xp_awk_nde_return_t*)p)->val); xp_awk_nde_return_t* px =
(xp_awk_nde_return_t*)p;
if (px->val != XP_NULL) xp_awk_clrpt (px->val);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_EXIT: case XP_AWK_NDE_EXIT:
{
if (((xp_awk_nde_exit_t*)p)->val != XP_NULL) if (((xp_awk_nde_exit_t*)p)->val != XP_NULL)
xp_awk_clrpt (((xp_awk_nde_exit_t*)p)->val); xp_awk_clrpt (((xp_awk_nde_exit_t*)p)->val);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_GRP: case XP_AWK_NDE_GRP:
{
xp_awk_clrpt (((xp_awk_nde_grp_t*)p)->body); xp_awk_clrpt (((xp_awk_nde_grp_t*)p)->body);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_ASS: case XP_AWK_NDE_ASS:
{
xp_awk_clrpt (((xp_awk_nde_ass_t*)p)->left); xp_awk_clrpt (((xp_awk_nde_ass_t*)p)->left);
xp_awk_clrpt (((xp_awk_nde_ass_t*)p)->right); xp_awk_clrpt (((xp_awk_nde_ass_t*)p)->right);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_EXP_BIN: case XP_AWK_NDE_EXP_BIN:
xp_assert ((((xp_awk_nde_exp_t*)p)->left)->next == XP_NULL); {
xp_assert ((((xp_awk_nde_exp_t*)p)->right)->next == XP_NULL); xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)p;
xp_assert (px->left->next == XP_NULL);
xp_assert (px->right->next == XP_NULL);
xp_awk_clrpt (((xp_awk_nde_exp_t*)p)->left); xp_awk_clrpt (px->left);
xp_awk_clrpt (((xp_awk_nde_exp_t*)p)->right); xp_awk_clrpt (px->right);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_EXP_UNR: case XP_AWK_NDE_EXP_UNR:
case XP_AWK_NDE_EXP_INCPRE: case XP_AWK_NDE_EXP_INCPRE:
case XP_AWK_NDE_EXP_INCPST: case XP_AWK_NDE_EXP_INCPST:
xp_assert (((xp_awk_nde_exp_t*)p)->right == XP_NULL); {
xp_awk_clrpt (((xp_awk_nde_exp_t*)p)->left); xp_awk_nde_exp_t* px = (xp_awk_nde_exp_t*)p;
xp_assert (px->right == XP_NULL);
xp_awk_clrpt (px->left);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_CND: case XP_AWK_NDE_CND:
{
xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->test); xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->test);
xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->left); xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->left);
xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->right); xp_awk_clrpt (((xp_awk_nde_cnd_t*)p)->right);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_INT: case XP_AWK_NDE_INT:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_REAL: case XP_AWK_NDE_REAL:
{
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_STR: case XP_AWK_NDE_STR:
{
xp_free (((xp_awk_nde_str_t*)p)->buf); xp_free (((xp_awk_nde_str_t*)p)->buf);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_REX: case XP_AWK_NDE_REX:
{
xp_free (((xp_awk_nde_rex_t*)p)->buf); xp_free (((xp_awk_nde_rex_t*)p)->buf);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_NAMED: case XP_AWK_NDE_NAMED:
xp_assert (((xp_awk_nde_var_t*)p)->id.name != XP_NULL);
case XP_AWK_NDE_GLOBAL: case XP_AWK_NDE_GLOBAL:
case XP_AWK_NDE_LOCAL: case XP_AWK_NDE_LOCAL:
case XP_AWK_NDE_ARG: case XP_AWK_NDE_ARG:
xp_assert (((xp_awk_nde_var_t*)p)->idx == XP_NULL); {
if (((xp_awk_nde_var_t*)p)->id.name != XP_NULL) xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)p;
xp_free (((xp_awk_nde_var_t*)p)->id.name); xp_assert (px->idx == XP_NULL);
if (px->id.name != XP_NULL)
xp_free (px->id.name);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_NAMEDIDX: case XP_AWK_NDE_NAMEDIDX:
xp_assert (((xp_awk_nde_var_t*)p)->id.name != XP_NULL);
case XP_AWK_NDE_GLOBALIDX: case XP_AWK_NDE_GLOBALIDX:
case XP_AWK_NDE_LOCALIDX: case XP_AWK_NDE_LOCALIDX:
case XP_AWK_NDE_ARGIDX: case XP_AWK_NDE_ARGIDX:
xp_assert (((xp_awk_nde_var_t*)p)->idx != XP_NULL); {
xp_awk_clrpt (((xp_awk_nde_var_t*)p)->idx); xp_awk_nde_var_t* px = (xp_awk_nde_var_t*)p;
if (((xp_awk_nde_var_t*)p)->id.name != XP_NULL) xp_assert (px->idx != XP_NULL);
xp_free (((xp_awk_nde_var_t*)p)->id.name); xp_awk_clrpt (px->idx);
if (px->id.name != XP_NULL)
xp_free (px->id.name);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_POS: case XP_AWK_NDE_POS:
xp_assert (((xp_awk_nde_pos_t*)p)->val != XP_NULL); {
xp_awk_clrpt (((xp_awk_nde_pos_t*)p)->val); xp_awk_clrpt (((xp_awk_nde_pos_t*)p)->val);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_CALL: case XP_AWK_NDE_CALL:
xp_free (((xp_awk_nde_call_t*)p)->name); {
xp_awk_clrpt (((xp_awk_nde_call_t*)p)->args); xp_awk_nde_call_t* px = (xp_awk_nde_call_t*)p;
xp_free (px->name);
xp_awk_clrpt (px->args);
xp_free (p); xp_free (p);
break; break;
}
case XP_AWK_NDE_GETLINE:
{
xp_awk_nde_getline_t* px =
(xp_awk_nde_getline_t*)p;
if (px->var != XP_NULL) xp_awk_clrpt (px->var);
if (px->cmd != XP_NULL) xp_awk_clrpt (px->cmd);
if (px->out != XP_NULL) xp_awk_clrpt (px->out);
xp_free (p);
break;
}
default: default:
{
xp_assert (!"should never happen - invalid node type"); xp_assert (!"should never happen - invalid node type");
xp_free (p); xp_free (p);
break; break;
} }
}
p = next; p = next;
} }

View File

@ -1,5 +1,5 @@
/* /*
* $Id: tree.h,v 1.41 2006-05-07 17:45:08 bacon Exp $ * $Id: tree.h,v 1.42 2006-06-12 15:11:02 bacon Exp $
*/ */
#ifndef _XP_AWK_TREE_H_ #ifndef _XP_AWK_TREE_H_
@ -52,7 +52,8 @@ enum
XP_AWK_NDE_GLOBALIDX, XP_AWK_NDE_GLOBALIDX,
XP_AWK_NDE_LOCALIDX, XP_AWK_NDE_LOCALIDX,
XP_AWK_NDE_ARGIDX, XP_AWK_NDE_ARGIDX,
XP_AWK_NDE_POS XP_AWK_NDE_POS,
XP_AWK_NDE_GETLINE
}; };
typedef struct xp_awk_func_t xp_awk_func_t; typedef struct xp_awk_func_t xp_awk_func_t;
@ -71,6 +72,7 @@ typedef struct xp_awk_nde_str_t xp_awk_nde_str_t;
typedef struct xp_awk_nde_rex_t xp_awk_nde_rex_t; typedef struct xp_awk_nde_rex_t xp_awk_nde_rex_t;
typedef struct xp_awk_nde_var_t xp_awk_nde_var_t; typedef struct xp_awk_nde_var_t xp_awk_nde_var_t;
typedef struct xp_awk_nde_call_t xp_awk_nde_call_t; typedef struct xp_awk_nde_call_t xp_awk_nde_call_t;
typedef struct xp_awk_nde_getline_t xp_awk_nde_getline_t;
typedef struct xp_awk_nde_if_t xp_awk_nde_if_t; typedef struct xp_awk_nde_if_t xp_awk_nde_if_t;
typedef struct xp_awk_nde_while_t xp_awk_nde_while_t; typedef struct xp_awk_nde_while_t xp_awk_nde_while_t;
@ -200,6 +202,15 @@ struct xp_awk_nde_call_t
xp_size_t nargs; xp_size_t nargs;
}; };
/* XP_AWK_NDE_GETLINE */
struct xp_awk_nde_getline_t
{
XP_AWK_NDE_HDR;
xp_awk_nde_t* var;
xp_awk_nde_t* cmd;
xp_awk_nde_t* out;
};
/* XP_AWK_NDE_IF */ /* XP_AWK_NDE_IF */
struct xp_awk_nde_if_t struct xp_awk_nde_if_t
{ {