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-06-27 14:18:19 +00:00
parent 2e70ee9475
commit 538acef312
5 changed files with 132 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ase/awk/parse.c
View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c,v 1.123 2006-06-27 10:53:04 bacon Exp $
* $Id: parse.c,v 1.124 2006-06-27 14:18:19 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -2779,8 +2779,30 @@ static xp_awk_nde_t* __parse_exit (xp_awk_t* awk)
static xp_awk_nde_t* __parse_delete (xp_awk_t* awk)
{
/* TODO: implement this... */
return XP_NULL;
xp_awk_nde_delete_t* nde;
xp_awk_nde_t* var;
if (!MATCH(awk,TOKEN_IDENT)) PANIC (awk, XP_AWK_EIDENT);
var = __parse_primary_ident (awk);
if (var == XP_NULL) return XP_NULL;
if (!__is_plain_var (var))
{
/* a normal identifier is expected */
xp_awk_clrpt (var);
PANIC (awk, XP_AWK_EIDENT);
}
/* TODO: .... delete var[pattern]... */
nde = (xp_awk_nde_delete_t*)xp_malloc(xp_sizeof(xp_awk_nde_delete_t));
if (nde == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
nde->type = XP_AWK_NDE_DELETE;
nde->next = XP_NULL;
nde->var = var;
return (xp_awk_nde_t*)nde;
}
static xp_awk_nde_t* __parse_print (xp_awk_t* awk)

87
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.109 2006-06-27 10:53:04 bacon Exp $
* $Id: run.c,v 1.110 2006-06-27 14:18:19 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -45,17 +45,18 @@ static int __run_pattern_blocks (xp_awk_run_t* run);
static int __run_pattern_block_chain (xp_awk_run_t* run, xp_awk_chain_t* chain);
static int __run_block (xp_awk_run_t* run, xp_awk_nde_blk_t* nde);
static int __run_statement (xp_awk_run_t* run, xp_awk_nde_t* nde);
static int __run_if_statement (xp_awk_run_t* run, xp_awk_nde_if_t* nde);
static int __run_while_statement (xp_awk_run_t* run, xp_awk_nde_while_t* nde);
static int __run_for_statement (xp_awk_run_t* run, xp_awk_nde_for_t* nde);
static int __run_foreach_statement (xp_awk_run_t* run, xp_awk_nde_foreach_t* nde);
static int __run_break_statement (xp_awk_run_t* run, xp_awk_nde_break_t* nde);
static int __run_continue_statement (xp_awk_run_t* run, xp_awk_nde_continue_t* nde);
static int __run_return_statement (xp_awk_run_t* run, xp_awk_nde_return_t* nde);
static int __run_exit_statement (xp_awk_run_t* run, xp_awk_nde_exit_t* nde);
static int __run_next_statement (xp_awk_run_t* run, xp_awk_nde_next_t* nde);
static int __run_nextfile_statement (xp_awk_run_t* run, xp_awk_nde_nextfile_t* nde);
static int __run_print_statement (xp_awk_run_t* run, xp_awk_nde_print_t* nde);
static int __run_if (xp_awk_run_t* run, xp_awk_nde_if_t* nde);
static int __run_while (xp_awk_run_t* run, xp_awk_nde_while_t* nde);
static int __run_for (xp_awk_run_t* run, xp_awk_nde_for_t* nde);
static int __run_foreach (xp_awk_run_t* run, xp_awk_nde_foreach_t* nde);
static int __run_break (xp_awk_run_t* run, xp_awk_nde_break_t* nde);
static int __run_continue (xp_awk_run_t* run, xp_awk_nde_continue_t* nde);
static int __run_return (xp_awk_run_t* run, xp_awk_nde_return_t* nde);
static int __run_exit (xp_awk_run_t* run, xp_awk_nde_exit_t* nde);
static int __run_next (xp_awk_run_t* run, xp_awk_nde_next_t* nde);
static int __run_nextfile (xp_awk_run_t* run, xp_awk_nde_nextfile_t* nde);
static int __run_delete (xp_awk_run_t* run, xp_awk_nde_delete_t* nde);
static int __run_print (xp_awk_run_t* run, xp_awk_nde_print_t* nde);
static xp_awk_val_t* __eval_expression (
xp_awk_run_t* run, xp_awk_nde_t* nde);
@ -651,7 +652,7 @@ static int __run_statement (xp_awk_run_t* run, xp_awk_nde_t* nde)
case XP_AWK_NDE_IF:
{
if (__run_if_statement (
if (__run_if (
run, (xp_awk_nde_if_t*)nde) == -1) return -1;
break;
}
@ -659,70 +660,77 @@ static int __run_statement (xp_awk_run_t* run, xp_awk_nde_t* nde)
case XP_AWK_NDE_WHILE:
case XP_AWK_NDE_DOWHILE:
{
if (__run_while_statement (
if (__run_while (
run, (xp_awk_nde_while_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_FOR:
{
if (__run_for_statement (
if (__run_for (
run, (xp_awk_nde_for_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_FOREACH:
{
if (__run_foreach_statement (
if (__run_foreach (
run, (xp_awk_nde_foreach_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_BREAK:
{
if (__run_break_statement(
if (__run_break (
run, (xp_awk_nde_break_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_CONTINUE:
{
if (__run_continue_statement (
if (__run_continue (
run, (xp_awk_nde_continue_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_RETURN:
{
if (__run_return_statement (
if (__run_return (
run, (xp_awk_nde_return_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_EXIT:
{
if (__run_exit_statement (
if (__run_exit (
run, (xp_awk_nde_exit_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_NEXT:
{
if (__run_next_statement (
if (__run_next (
run, (xp_awk_nde_next_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_NEXTFILE:
{
if (__run_nextfile_statement (
if (__run_nextfile (
run, (xp_awk_nde_nextfile_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_DELETE:
{
if (__run_delete (
run, (xp_awk_nde_delete_t*)nde) == -1) return -1;
break;
}
case XP_AWK_NDE_PRINT:
{
if (__run_print_statement (
if (__run_print (
run, (xp_awk_nde_print_t*)nde) == -1) return -1;
break;
}
@ -741,7 +749,7 @@ static int __run_statement (xp_awk_run_t* run, xp_awk_nde_t* nde)
return 0;
}
static int __run_if_statement (xp_awk_run_t* run, xp_awk_nde_if_t* nde)
static int __run_if (xp_awk_run_t* run, xp_awk_nde_if_t* nde)
{
xp_awk_val_t* test;
int n = 0;
@ -768,7 +776,7 @@ static int __run_if_statement (xp_awk_run_t* run, xp_awk_nde_if_t* nde)
return n;
}
static int __run_while_statement (xp_awk_run_t* run, xp_awk_nde_while_t* nde)
static int __run_while (xp_awk_run_t* run, xp_awk_nde_while_t* nde)
{
xp_awk_val_t* test;
@ -855,7 +863,7 @@ static int __run_while_statement (xp_awk_run_t* run, xp_awk_nde_while_t* nde)
return 0;
}
static int __run_for_statement (xp_awk_run_t* run, xp_awk_nde_for_t* nde)
static int __run_for (xp_awk_run_t* run, xp_awk_nde_for_t* nde)
{
xp_awk_val_t* val;
@ -964,7 +972,7 @@ static int __walk_foreach (xp_awk_pair_t* pair, void* arg)
return 0;
}
static int __run_foreach_statement (xp_awk_run_t* run, xp_awk_nde_foreach_t* nde)
static int __run_foreach (xp_awk_run_t* run, xp_awk_nde_foreach_t* nde)
{
int n;
xp_awk_nde_exp_t* test;
@ -1000,19 +1008,19 @@ static int __run_foreach_statement (xp_awk_run_t* run, xp_awk_nde_foreach_t* nde
return n;
}
static int __run_break_statement (xp_awk_run_t* run, xp_awk_nde_break_t* nde)
static int __run_break (xp_awk_run_t* run, xp_awk_nde_break_t* nde)
{
run->exit_level = EXIT_BREAK;
return 0;
}
static int __run_continue_statement (xp_awk_run_t* run, xp_awk_nde_continue_t* nde)
static int __run_continue (xp_awk_run_t* run, xp_awk_nde_continue_t* nde)
{
run->exit_level = EXIT_CONTINUE;
return 0;
}
static int __run_return_statement (xp_awk_run_t* run, xp_awk_nde_return_t* nde)
static int __run_return (xp_awk_run_t* run, xp_awk_nde_return_t* nde)
{
if (nde->val != XP_NULL)
@ -1037,7 +1045,7 @@ static int __run_return_statement (xp_awk_run_t* run, xp_awk_nde_return_t* nde)
return 0;
}
static int __run_exit_statement (xp_awk_run_t* run, xp_awk_nde_exit_t* nde)
static int __run_exit (xp_awk_run_t* run, xp_awk_nde_exit_t* nde)
{
if (nde->val != XP_NULL)
{
@ -1060,14 +1068,14 @@ static int __run_exit_statement (xp_awk_run_t* run, xp_awk_nde_exit_t* nde)
return 0;
}
static int __run_next_statement (xp_awk_run_t* run, xp_awk_nde_next_t* nde)
static int __run_next (xp_awk_run_t* run, xp_awk_nde_next_t* nde)
{
/* TODO */
xp_printf (XP_T("**** next NOT IMPLEMENTED...\n"));
return -1;
}
static int __run_nextfile_statement (xp_awk_run_t* run, xp_awk_nde_nextfile_t* nde)
static int __run_nextfile (xp_awk_run_t* run, xp_awk_nde_nextfile_t* nde)
{
xp_ssize_t n;
@ -1077,7 +1085,14 @@ static int __run_nextfile_statement (xp_awk_run_t* run, xp_awk_nde_nextfile_t* n
return (n == -1)? -1: 0;
}
static int __run_print_statement (xp_awk_run_t* run, xp_awk_nde_print_t* nde)
static int __run_delete (xp_awk_run_t* run, xp_awk_nde_delete_t* nde)
{
/* TODO */
xp_printf (XP_T("**** delete NOT IMPLEMENTED...\n"));
return -1;
}
static int __run_print (xp_awk_run_t* run, xp_awk_nde_print_t* nde)
{
xp_awk_nde_print_t* p = (xp_awk_nde_print_t*)nde;
xp_char_t* out = XP_NULL;
@ -2913,11 +2928,11 @@ static xp_awk_val_t* __eval_call (
}
/*xp_printf (XP_T("got return value\n")); */
/* this is the trick mentioned in __run_return_statement.
/* this is the trick mentioned in __run_return.
* adjust the reference count of the return value.
* the value must not be freed even if the reference count
* is decremented to zero because its reference has been incremented
* in __run_return_statement regardless of its reference count. */
* in __run_return regardless of its reference count. */
v = STACK_RETVAL(run);
xp_awk_refdownval_nofree (run, v);

51
ase/awk/tree.c
View File

@ -1,5 +1,5 @@
/*
* $Id: tree.c,v 1.57 2006-06-25 15:26:57 bacon Exp $
* $Id: tree.c,v 1.58 2006-06-27 14:18:19 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -651,6 +651,14 @@ static void __print_statements (xp_awk_nde_t* tree, int depth)
break;
}
case XP_AWK_NDE_DELETE:
{
__print_tabs (depth);
xp_printf (XP_T("delete "));
xp_awk_prnpt (((xp_awk_nde_delete_t*)p)->var);
break;
}
case XP_AWK_NDE_PRINT:
{
xp_awk_nde_print_t* px = (xp_awk_nde_print_t*)p;
@ -792,13 +800,6 @@ void xp_awk_clrpt (xp_awk_nde_t* tree)
break;
}
case XP_AWK_NDE_NEXT:
case XP_AWK_NDE_NEXTFILE:
{
xp_free (p);
break;
}
case XP_AWK_NDE_RETURN:
{
xp_awk_nde_return_t* px =
@ -816,6 +817,30 @@ void xp_awk_clrpt (xp_awk_nde_t* tree)
break;
}
case XP_AWK_NDE_NEXT:
case XP_AWK_NDE_NEXTFILE:
{
xp_free (p);
break;
}
case XP_AWK_NDE_DELETE:
{
xp_awk_clrpt (((xp_awk_nde_delete_t*)p)->var);
xp_free (p);
break;
}
case XP_AWK_NDE_PRINT:
{
xp_awk_nde_print_t* px =
(xp_awk_nde_print_t*)p;
if (px->args != XP_NULL) xp_awk_clrpt (px->args);
if (px->out != XP_NULL) xp_awk_clrpt (px->out);
xp_free (p);
break;
}
case XP_AWK_NDE_GRP:
{
xp_awk_clrpt (((xp_awk_nde_grp_t*)p)->body);
@ -951,16 +976,6 @@ void xp_awk_clrpt (xp_awk_nde_t* tree)
break;
}
case XP_AWK_NDE_PRINT:
{
xp_awk_nde_print_t* px =
(xp_awk_nde_print_t*)p;
if (px->args != XP_NULL) xp_awk_clrpt (px->args);
if (px->out != XP_NULL) xp_awk_clrpt (px->out);
xp_free (p);
break;
}
default:
{
xp_assert (!"should never happen - invalid node type");

34
ase/awk/tree.h
View File

@ -1,5 +1,5 @@
/*
* $Id: tree.h,v 1.50 2006-06-26 15:09:28 bacon Exp $
* $Id: tree.h,v 1.51 2006-06-27 14:18:19 bacon Exp $
*/
#ifndef _XP_AWK_TREE_H_
@ -26,9 +26,10 @@ enum
XP_AWK_NDE_EXIT,
XP_AWK_NDE_NEXT,
XP_AWK_NDE_NEXTFILE,
XP_AWK_NDE_DELETE,
XP_AWK_NDE_PRINT,
/* expression */
/* if you change the following values including their order,
* you should change __eval_func of __eval_expression
* in run.c accordingly */
@ -55,7 +56,6 @@ enum
XP_AWK_NDE_ARGIDX,
XP_AWK_NDE_POS,
XP_AWK_NDE_GETLINE,
XP_AWK_NDE_PRINT
};
enum
@ -93,7 +93,6 @@ 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_call_t xp_awk_nde_call_t;
typedef struct xp_awk_nde_getline_t xp_awk_nde_getline_t;
typedef struct xp_awk_nde_print_t xp_awk_nde_print_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;
@ -105,6 +104,8 @@ typedef struct xp_awk_nde_return_t xp_awk_nde_return_t;
typedef struct xp_awk_nde_exit_t xp_awk_nde_exit_t;
typedef struct xp_awk_nde_next_t xp_awk_nde_next_t;
typedef struct xp_awk_nde_nextfile_t xp_awk_nde_nextfile_t;
typedef struct xp_awk_nde_delete_t xp_awk_nde_delete_t;
typedef struct xp_awk_nde_print_t xp_awk_nde_print_t;
struct xp_awk_afn_t
{
@ -236,15 +237,6 @@ struct xp_awk_nde_getline_t
xp_awk_nde_t* in;
};
/* XP_AWK_NDE_PRINT */
struct xp_awk_nde_print_t
{
XP_AWK_NDE_HDR;
xp_awk_nde_t* args;
int out_type; /* XP_AWK_PRINT_XXX */
xp_awk_nde_t* out;
};
/* XP_AWK_NDE_IF */
struct xp_awk_nde_if_t
{
@ -318,6 +310,22 @@ struct xp_awk_nde_nextfile_t
XP_AWK_NDE_HDR;
};
/* XP_AWK_NDE_DELETE */
struct xp_awk_nde_delete_t
{
XP_AWK_NDE_HDR;
xp_awk_nde_t* var;
};
/* XP_AWK_NDE_PRINT */
struct xp_awk_nde_print_t
{
XP_AWK_NDE_HDR;
xp_awk_nde_t* args;
int out_type; /* XP_AWK_PRINT_XXX */
xp_awk_nde_t* out;
};
#ifdef __cplusplus
extern "C" {
#endif

2
ase/test/awk/t11.awk
View File

@ -7,4 +7,6 @@ BEGIN
print 3, 4, 5 >> 10;
close (10);
print "-------------" >> 10;
delete abc;
}