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-10-01 14:48:48 +00:00
parent 78855acb45
commit c569bd886b
2 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.214 2006-09-30 17:09:15 bacon Exp $ * $Id: run.c,v 1.215 2006-10-01 14:48:48 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -48,6 +48,17 @@ enum
#define DEFAULT_ORS XP_T("\n") #define DEFAULT_ORS XP_T("\n")
#define DEFAULT_SUBSEP XP_T("\034") #define DEFAULT_SUBSEP XP_T("\034")
/* the index of a positional variable should be a positive interger
* equal to or less than the maximum value of the type by which
* the index is represented. but it has an extra check against the
* maximum value of xp_size_t as the reference is represented
* in a pointer variable of xp_awk_val_ref_t and sizeof(void*) is
* equal to sizeof(xp_size_t). */
#define IS_VALID_POSIDX(idx) \
((idx) >= 0 && \
(idx) < XP_TYPE_MAX(xp_long_t) && \
(idx) < XP_TYPE_MAX(xp_size_t))
static void __add_run (xp_awk_t* awk, xp_awk_run_t* run); static void __add_run (xp_awk_t* awk, xp_awk_run_t* run);
static void __del_run (xp_awk_t* awk, xp_awk_run_t* run); static void __del_run (xp_awk_t* awk, xp_awk_run_t* run);
@ -154,7 +165,8 @@ static xp_awk_val_t* __eval_call (
xp_awk_run_t* run, xp_awk_nde_t* nde, xp_awk_run_t* run, xp_awk_nde_t* nde,
const xp_char_t* bfn_arg_spec, xp_awk_afn_t* afn); const xp_char_t* bfn_arg_spec, xp_awk_afn_t* afn);
static xp_awk_val_t** __get_reference (xp_awk_run_t* run, xp_awk_nde_t* nde); static int __get_reference (
xp_awk_run_t* run, xp_awk_nde_t* nde, xp_awk_val_t*** ref);
static xp_awk_val_t** __get_reference_indexed ( static xp_awk_val_t** __get_reference_indexed (
xp_awk_run_t* run, xp_awk_nde_var_t* nde, xp_awk_val_t** val); xp_awk_run_t* run, xp_awk_nde_var_t* nde, xp_awk_val_t** val);
@ -2444,7 +2456,7 @@ static xp_awk_val_t* __do_assignment_pos (
if (n == -1) PANIC (run, XP_AWK_EPOSIDX); if (n == -1) PANIC (run, XP_AWK_EPOSIDX);
if (n == 1) lv = (xp_long_t)rv; if (n == 1) lv = (xp_long_t)rv;
if (lv < 0) PANIC (run, XP_AWK_EPOSIDX); if (!IS_VALID_POSIDX(lv)) PANIC (run, XP_AWK_EPOSIDX);
/* convert the value to the string */ /* convert the value to the string */
str = xp_awk_valtostr (run, val, xp_true, XP_NULL, &len); str = xp_awk_valtostr (run, val, xp_true, XP_NULL, &len);
@ -4129,8 +4141,7 @@ static xp_awk_val_t* __eval_call (
{ {
xp_awk_val_t** ref; xp_awk_val_t** ref;
ref = __get_reference (run, p); if (__get_reference (run, p, &ref) == -1)
if (ref == XP_NULL)
{ {
UNWIND_RUN_STACK (run, nargs); UNWIND_RUN_STACK (run, nargs);
return XP_NULL; return XP_NULL;
@ -4284,9 +4295,11 @@ static xp_awk_val_t* __eval_call (
return (n == -1)? XP_NULL: v; return (n == -1)? XP_NULL: v;
} }
static xp_awk_val_t** __get_reference (xp_awk_run_t* run, xp_awk_nde_t* nde) static int __get_reference (
xp_awk_run_t* run, xp_awk_nde_t* nde, xp_awk_val_t*** ref)
{ {
xp_awk_nde_var_t* tgt = (xp_awk_nde_var_t*)nde; xp_awk_nde_var_t* tgt = (xp_awk_nde_var_t*)nde;
xp_awk_val_t** tmp;
/* refer to __eval_indexed for application of similar concept */ /* refer to __eval_indexed for application of similar concept */
@ -4304,25 +4317,33 @@ static xp_awk_val_t** __get_reference (xp_awk_run_t* run, xp_awk_nde_t* nde)
pair = xp_awk_map_put ( pair = xp_awk_map_put (
&run->named, tgt->id.name, &run->named, tgt->id.name,
tgt->id.name_len, xp_awk_val_nil); tgt->id.name_len, xp_awk_val_nil);
if (pair == XP_NULL) PANIC (run, XP_AWK_ENOMEM); if (pair == XP_NULL) PANIC_I (run, XP_AWK_ENOMEM);
} }
return (xp_awk_val_t**)&pair->val; //return (xp_awk_val_t**)&pair->val;
*ref = (xp_awk_val_t**)&pair->val;
return 0;
} }
if (nde->type == XP_AWK_NDE_GLOBAL) if (nde->type == XP_AWK_NDE_GLOBAL)
{ {
return (xp_awk_val_t**)&STACK_GLOBAL(run,tgt->id.idxa); //return (xp_awk_val_t**)&STACK_GLOBAL(run,tgt->id.idxa);
*ref = (xp_awk_val_t**)&STACK_GLOBAL(run,tgt->id.idxa);
return 0;
} }
if (nde->type == XP_AWK_NDE_LOCAL) if (nde->type == XP_AWK_NDE_LOCAL)
{ {
return (xp_awk_val_t**)&STACK_LOCAL(run,tgt->id.idxa); //return (xp_awk_val_t**)&STACK_LOCAL(run,tgt->id.idxa);
*ref = (xp_awk_val_t**)&STACK_LOCAL(run,tgt->id.idxa);
return 0;
} }
if (nde->type == XP_AWK_NDE_ARG) if (nde->type == XP_AWK_NDE_ARG)
{ {
return (xp_awk_val_t**)&STACK_ARG(run,tgt->id.idxa); //return (xp_awk_val_t**)&STACK_ARG(run,tgt->id.idxa);
*ref = (xp_awk_val_t**)&STACK_ARG(run,tgt->id.idxa);
return 0;
} }
if (nde->type == XP_AWK_NDE_NAMEDIDX) if (nde->type == XP_AWK_NDE_NAMEDIDX)
@ -4336,29 +4357,39 @@ static xp_awk_val_t** __get_reference (xp_awk_run_t* run, xp_awk_nde_t* nde)
pair = xp_awk_map_put ( pair = xp_awk_map_put (
&run->named, tgt->id.name, &run->named, tgt->id.name,
tgt->id.name_len, xp_awk_val_nil); tgt->id.name_len, xp_awk_val_nil);
if (pair == XP_NULL) PANIC (run, XP_AWK_ENOMEM); if (pair == XP_NULL) PANIC_I (run, XP_AWK_ENOMEM);
} }
return __get_reference_indexed ( //return __get_reference_indexed (
// run, tgt, (xp_awk_val_t**)&pair->val);
tmp = __get_reference_indexed (
run, tgt, (xp_awk_val_t**)&pair->val); run, tgt, (xp_awk_val_t**)&pair->val);
if (tmp == XP_NULL) return -1;
*ref = tmp;
} }
if (nde->type == XP_AWK_NDE_GLOBALIDX) if (nde->type == XP_AWK_NDE_GLOBALIDX)
{ {
return __get_reference_indexed (run, tgt, tmp = __get_reference_indexed (run, tgt,
(xp_awk_val_t**)&STACK_GLOBAL(run,tgt->id.idxa)); (xp_awk_val_t**)&STACK_GLOBAL(run,tgt->id.idxa));
if (tmp == XP_NULL) return -1;
*ref = tmp;
} }
if (nde->type == XP_AWK_NDE_LOCALIDX) if (nde->type == XP_AWK_NDE_LOCALIDX)
{ {
return __get_reference_indexed (run, tgt, tmp = __get_reference_indexed (run, tgt,
(xp_awk_val_t**)&STACK_LOCAL(run,tgt->id.idxa)); (xp_awk_val_t**)&STACK_LOCAL(run,tgt->id.idxa));
if (tmp == XP_NULL) return -1;
*ref = tmp;
} }
if (nde->type == XP_AWK_NDE_ARGIDX) if (nde->type == XP_AWK_NDE_ARGIDX)
{ {
return __get_reference_indexed (run, tgt, tmp = __get_reference_indexed (run, tgt,
(xp_awk_val_t**)&STACK_ARG(run,tgt->id.idxa)); (xp_awk_val_t**)&STACK_ARG(run,tgt->id.idxa));
if (tmp == XP_NULL) return -1;
*ref = tmp;
} }
if (nde->type == XP_AWK_NDE_POS) if (nde->type == XP_AWK_NDE_POS)
@ -4371,22 +4402,21 @@ static xp_awk_val_t** __get_reference (xp_awk_run_t* run, xp_awk_nde_t* nde)
/* the position number is returned for the positional /* the position number is returned for the positional
* variable unlike other reference types. */ * variable unlike other reference types. */
v = __eval_expression (run, ((xp_awk_nde_pos_t*)nde)->val); v = __eval_expression (run, ((xp_awk_nde_pos_t*)nde)->val);
if (v == XP_NULL) return XP_NULL; if (v == XP_NULL) return -1;
xp_awk_refupval (v); xp_awk_refupval (v);
n = xp_awk_valtonum (run, v, &lv, &rv); n = xp_awk_valtonum (run, v, &lv, &rv);
xp_awk_refdownval (run, v); xp_awk_refdownval (run, v);
if (n == -1) PANIC (run, XP_AWK_EPOSIDX); if (n == -1) PANIC_I (run, XP_AWK_EPOSIDX);
if (n == 1) lv = (xp_long_t)rv; if (n == 1) lv = (xp_long_t)rv;
if (!IS_VALID_POSIDX(lv)) PANIC_I (run, XP_AWK_EPOSIDX);
if (lv < 0) PANIC (run, XP_AWK_EPOSIDX); *ref = (xp_awk_val_t**)(lv);
return 0;
/* TODO: ............................................. */
return (xp_awk_val_t**)(lv+1);
} }
PANIC (run, XP_AWK_ENOTREFERENCEABLE); PANIC_I (run, XP_AWK_ENOTREFERENCEABLE);
} }
static xp_awk_val_t** __get_reference_indexed ( static xp_awk_val_t** __get_reference_indexed (

10
ase/awk/val.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: val.h,v 1.43 2006-09-30 17:02:36 bacon Exp $ * $Id: val.h,v 1.44 2006-10-01 14:48:48 bacon Exp $
*/ */
#ifndef _XP_AWK_VAL_H_ #ifndef _XP_AWK_VAL_H_
@ -106,8 +106,9 @@ struct xp_awk_val_map_t
{ {
XP_AWK_VAL_HDR; XP_AWK_VAL_HDR;
/* TODO: make val_map to array if the indices used are all integers /* TODO: make val_map to array if the indices used are all
* switch to map dynamically once the non-integral index is seen * integers switch to map dynamically once the
* non-integral index is seen.
*/ */
xp_awk_map_t* map; xp_awk_map_t* map;
}; };
@ -118,6 +119,9 @@ struct xp_awk_val_ref_t
XP_AWK_VAL_HDR; XP_AWK_VAL_HDR;
int id; int id;
/* if id is XP_AWK_VAL_REF_POS, adr holds an index of the
* positionalvariable. Otherwise, adr points to the value
* directly. */
xp_awk_val_t** adr; xp_awk_val_t** adr;
}; };