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-20 05:44:29 +00:00
parent 30040f4691
commit 12c435e374
3 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.62 2006-04-19 16:09:51 bacon Exp $ * $Id: run.c,v 1.63 2006-04-20 05:44:29 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -118,7 +118,7 @@ static void __raw_pop (xp_awk_t* awk);
static void __raw_pop_times (xp_awk_t* awk, xp_size_t times); static void __raw_pop_times (xp_awk_t* awk, xp_size_t times);
static int __val_to_num (xp_awk_val_t* v, xp_long_t* l, xp_real_t* r); static int __val_to_num (xp_awk_val_t* v, xp_long_t* l, xp_real_t* r);
static xp_char_t* __val_to_str (xp_awk_val_t* v); static xp_char_t* __val_to_str (xp_awk_val_t* v, int* errnum);
typedef xp_awk_val_t* (*binop_func_t) ( typedef xp_awk_val_t* (*binop_func_t) (
xp_awk_t* awk, xp_awk_val_t* left, xp_awk_val_t* right); xp_awk_t* awk, xp_awk_val_t* left, xp_awk_val_t* right);
@ -896,6 +896,7 @@ static xp_awk_val_t* __do_assignment_map (
/* TODO: while (nde != XP_NULL) */ /* TODO: while (nde != XP_NULL) */
{ {
xp_awk_val_t* tmp; xp_awk_val_t* tmp;
int errnum;
tmp = __eval_expression (awk, nde); tmp = __eval_expression (awk, nde);
if (tmp == XP_NULL) if (tmp == XP_NULL)
@ -906,13 +907,11 @@ static xp_awk_val_t* __do_assignment_map (
xp_awk_refupval (tmp); xp_awk_refupval (tmp);
str = __val_to_str (tmp); str = __val_to_str (tmp, &errnum);
if (str == XP_NULL) if (str == XP_NULL)
{ {
/* TODO: how to tell memory from conversion error? */
xp_awk_refdownval (awk, tmp); xp_awk_refdownval (awk, tmp);
/*PANIC (awk, XP_AWK_ENOMEM);*/ PANIC (awk, errnum);
PANIC (awk, XP_AWK_EWRONGINDEX);
} }
xp_awk_refdownval (awk, tmp); xp_awk_refdownval (awk, tmp);
@ -2230,18 +2229,18 @@ static xp_awk_val_t* __eval_indexed (
while (tmp != XP_NULL) while (tmp != XP_NULL)
*/ */
{ {
int errnum;
idx = __eval_expression (awk, tmp); idx = __eval_expression (awk, tmp);
if (idx == XP_NULL) return XP_NULL; if (idx == XP_NULL) return XP_NULL;
xp_awk_refupval (idx); xp_awk_refupval (idx);
str = __val_to_str (idx); str = __val_to_str (idx, &errnum);
if (str == XP_NULL) if (str == XP_NULL)
{ {
/* TODO: how to tell memory error from conversion error? */
xp_awk_refdownval (awk, idx); xp_awk_refdownval (awk, idx);
/*PANIC (awk, XP_AWK_ENOMEM);*/ PANIC (awk, errnum);
PANIC (awk, XP_AWK_EWRONGINDEX);
} }
xp_awk_refdownval (awk, idx); xp_awk_refdownval (awk, idx);
@ -2370,14 +2369,52 @@ static int __val_to_num (xp_awk_val_t* v, xp_long_t* l, xp_real_t* r)
return -1; /* error */ return -1; /* error */
} }
static xp_char_t* __val_to_str (xp_awk_val_t* v) static xp_char_t* __val_to_str (xp_awk_val_t* v, int* errnum)
{ {
/*TODO:*/ if (v->type == XP_AWK_VAL_INT)
if (v->type == XP_AWK_VAL_STR)
{ {
return xp_strxdup ( xp_char_t* tmp;
((xp_awk_val_str_t*)v)->buf, xp_long_t t;
((xp_awk_val_str_t*)v)->len); xp_size_t len = 0;
}
t = ((xp_awk_val_int_t*)v)->val;
if (t < 0) { t = -t; len++; }
while (t > 0) { len++; t /= 10; }
tmp = xp_malloc (len + 1 * xp_sizeof(xp_char_t));
if (tmp == XP_NULL)
{
*errnum = XP_AWK_ENOMEM;
return XP_NULL;
}
t = ((xp_awk_val_int_t*)v)->val;
if (t < 0) t = -t;
tmp[len] = XP_CHAR('\0');
while (t > 0)
{
tmp[--len] = (xp_char_t)(t % 10) + XP_CHAR('0');
t /= 10;
}
if (v < 0) tmp[--len] = XP_CHAR('-');
return tmp;
}
if (v->type == XP_AWK_VAL_STR)
{
xp_char_t* tmp;
tmp = xp_strxdup (
((xp_awk_val_str_t*)v)->buf,
((xp_awk_val_str_t*)v)->len);
if (tmp == XP_NULL) *errnum = XP_AWK_ENOMEM;
return tmp;
}
/* TODO: process more value types */
*errnum = XP_AWK_EWRONGINDEX;
return XP_NULL; return XP_NULL;
} }

14
ase/awk/val.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: val.c,v 1.21 2006-04-18 10:28:03 bacon Exp $ * $Id: val.c,v 1.22 2006-04-20 05:44:29 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -291,6 +291,14 @@ xp_bool_t xp_awk_boolval (xp_awk_val_t* val)
return xp_false; return xp_false;
} }
static int __print_pair (xp_awk_pair_t* pair)
{
xp_printf (XP_TEXT(" %s=>"), pair->key);
xp_awk_printval (pair->val);
xp_printf (XP_TEXT(" "));
return 0;
}
void xp_awk_printval (xp_awk_val_t* val) void xp_awk_printval (xp_awk_val_t* val)
{ {
/* TODO: better value printing...................... */ /* TODO: better value printing...................... */
@ -326,7 +334,9 @@ void xp_awk_printval (xp_awk_val_t* val)
break; break;
case XP_AWK_VAL_MAP: case XP_AWK_VAL_MAP:
xp_printf (XP_TEXT("***MAP***")); xp_printf (XP_TEXT("MAP["));
xp_awk_map_walk (((xp_awk_val_map_t*)val)->map, __print_pair);
xp_printf (XP_TEXT("]"));
break; break;
default: default:

4
ase/test/awk/t3.awk
View File

@ -1,4 +1,4 @@
global x, j; //global x, j;
func func1 (x) func func1 (x)
{ {
@ -11,6 +11,8 @@ BEGIN
idx="abc"; idx="abc";
x[idx] = 12345; x[idx] = 12345;
i = x[idx]; i = x[idx];
x["1"] = 1;
x["2"] = 2;
func1 (x); func1 (x);
k = x[idx]; k = x[idx];