From fb46759c43da0037ab6aed6d2f0743502bb8020f Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 10 Oct 2006 07:06:42 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/run.c | 10 ++++++---- ase/awk/tree.h | 4 ++-- ase/test/awk/comp.awk | 1 + ase/test/awk/t28.awk | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ase/awk/run.c b/ase/awk/run.c index 3e25ead9..94fbe9f5 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.228 2006-10-10 07:02:38 bacon Exp $ + * $Id: run.c,v 1.229 2006-10-10 07:06:42 bacon Exp $ */ #include @@ -2833,7 +2833,8 @@ static int __cmp_int_str ( { rr = xp_awk_strxtoreal (run->awk, ((xp_awk_val_str_t*)right)->buf, - ((xp_awk_val_str_t*)right)->len, &str); + ((xp_awk_val_str_t*)right)->len, + (const xp_char_t**)&str); if (str == ((xp_awk_val_str_t*)right)->buf + ((xp_awk_val_str_t*)right)->len) { @@ -2907,7 +2908,8 @@ static int __cmp_real_str ( rr = xp_awk_strxtoreal (run->awk, ((xp_awk_val_str_t*)right)->buf, - ((xp_awk_val_str_t*)right)->len, &str); + ((xp_awk_val_str_t*)right)->len, + (const xp_char_t**)&str); if (str == ((xp_awk_val_str_t*)right)->buf + ((xp_awk_val_str_t*)right)->len) { @@ -4381,7 +4383,7 @@ static int __get_reference ( if (n == 1) lv = (xp_long_t)rv; if (!IS_VALID_POSIDX(lv)) PANIC_I (run, XP_AWK_EPOSIDX); - *ref = (xp_awk_val_t**)lv; + *ref = (xp_awk_val_t**)((xp_size_t)lv); return 0; } diff --git a/ase/awk/tree.h b/ase/awk/tree.h index dec71ce7..d01fb7e3 100644 --- a/ase/awk/tree.h +++ b/ase/awk/tree.h @@ -1,5 +1,5 @@ /* - * $Id: tree.h,v 1.73 2006-09-30 17:02:36 bacon Exp $ + * $Id: tree.h,v 1.74 2006-10-10 07:02:38 bacon Exp $ */ #ifndef _XP_AWK_TREE_H_ @@ -258,7 +258,7 @@ struct xp_awk_nde_call_t xp_size_t min_args; xp_size_t max_args; const xp_char_t* arg_spec; - int (*handler) (xp_awk_t* awk, void* run); + int (*handler) (xp_awk_run_t* awk); } bfn; /* xp_awk_bfn_t* bfn; */ } what; diff --git a/ase/test/awk/comp.awk b/ase/test/awk/comp.awk index a229299f..4c6220e9 100644 --- a/ase/test/awk/comp.awk +++ b/ase/test/awk/comp.awk @@ -117,4 +117,5 @@ BEGIN { print .123E-; print +.123E-; print -.123E-; + print -.123E- + "123"; } diff --git a/ase/test/awk/t28.awk b/ase/test/awk/t28.awk index 49a85cfc..42872dc6 100644 --- a/ase/test/awk/t28.awk +++ b/ase/test/awk/t28.awk @@ -27,6 +27,7 @@ END { arr[0] = "xxx"; #print split ("abc def abc", arr); print split ("abc def kkk", j); + print split ("abc def kkk", $0); #xyz = 20; #print xyz;