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-06 03:37:40 +00:00
parent c4a787ac59
commit 2b3754ad15
6 changed files with 273 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ase/awk/awk.h
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.h,v 1.121 2006-10-05 14:20:57 bacon Exp $
* $Id: awk.h,v 1.122 2006-10-06 03:33:43 bacon Exp $
*/
#ifndef _XP_AWK_AWK_H_
@ -352,8 +352,9 @@ int xp_awk_setrec (xp_awk_run_t* run, xp_size_t idx, const xp_char_t* str, xp_si
xp_long_t xp_awk_strxtolong (
xp_awk_t* awk, const xp_char_t* str, xp_size_t len,
int base, const xp_char_t** endptr);
xp_real_t xp_awk_strtoreal (
xp_awk_t* awk, const xp_char_t* str);
xp_real_t xp_awk_strxtoreal (
xp_awk_t* awk, const xp_char_t* str, xp_size_t len,
const xp_char_t* endptr);
xp_size_t xp_awk_longtostr (
xp_long_t value, int radix, const xp_char_t* prefix,

217
ase/awk/misc.c
View File

@ -1,5 +1,5 @@
/*
* $Id: misc.c,v 1.23 2006-10-05 14:20:57 bacon Exp $
* $Id: misc.c,v 1.24 2006-10-06 03:33:43 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -45,11 +45,13 @@ xp_long_t xp_awk_strxtolong (
xp_assert (base < 37);
end = str + len;
p = str;
end = str + len;
/* strip off leading spaces */
/*while (XP_AWK_ISSPACE(awk,*p)) p++;*/
/* check for a sign */
/*while (*p != XP_T('\0')) */
while (p < end)
{
@ -62,6 +64,7 @@ xp_long_t xp_awk_strxtolong (
else break;
}
/* check for a binary/octal/hexadecimal notation */
rem = end - p;
if (base == 0)
{
@ -93,6 +96,7 @@ xp_long_t xp_awk_strxtolong (
(*(p+1) == XP_T('b') || *(p+1) == XP_T('B'))) p += 2;
}
/* process the digits */
/*while (*p != XP_T('\0'))*/
while (p < end)
{
@ -166,18 +170,19 @@ xp_real_t xp_awk_strtoreal (xp_awk_t* awk, const xp_char_t* str)
int mant_size; /* Number of digits in mantissa. */
int dec_pt; /* Number of mantissa digits BEFORE decimal point */
const xp_char_t *pexp; /* Temporarily holds location of exponent in string */
int sign = 0, exp_sign = 0;
int negative = 0, exp_negative = 0;
p = str;
/* Strip off leading blanks and check for a sign */
/* strip off leading blanks */
/*while (XP_AWK_ISSPACE(awk,*p)) p++;*/
/* check for a sign */
while (*p != XP_T('\0'))
{
if (*p == XP_T('-'))
{
sign = ~sign;
negative = ~negative;
p++;
}
else if (*p == XP_T('+')) p++;
@ -267,13 +272,13 @@ xp_real_t xp_awk_strtoreal (xp_awk_t* awk, const xp_char_t* str)
p++;
if (*p == XP_T('-'))
{
exp_sign = 1;
exp_negative = 1;
p++;
}
else
{
if (*p == XP_T('+')) p++;
exp_sign = 0;
exp_negative = 0;
}
if (!XP_AWK_ISDIGIT (awk, *p))
{
@ -287,7 +292,7 @@ xp_real_t xp_awk_strtoreal (xp_awk_t* awk, const xp_char_t* str)
}
}
if (exp_sign) exp = frac_exp - exp;
if (exp_negative) exp = frac_exp - exp;
else exp = frac_exp + exp;
/*
@ -298,10 +303,10 @@ xp_real_t xp_awk_strtoreal (xp_awk_t* awk, const xp_char_t* str)
*/
if (exp < 0)
{
exp_sign = 1;
exp_negative = 1;
exp = -exp;
}
else exp_sign = 0;
else exp_negative = 0;
if (exp > MAX_EXPONENT) exp = MAX_EXPONENT;
@ -312,11 +317,199 @@ xp_real_t xp_awk_strtoreal (xp_awk_t* awk, const xp_char_t* str)
if (exp & 01) dbl_exp *= *d;
}
if (exp_sign) fraction /= dbl_exp;
if (exp_negative) fraction /= dbl_exp;
else fraction *= dbl_exp;
done:
return (sign)? -fraction: fraction;
return (negative)? -fraction: fraction;
}
xp_real_t xp_awk_strxtoreal (
xp_awk_t* awk, const xp_char_t* str, xp_size_t len,
const xp_char_t** endptr)
{
/*
* Table giving binary powers of 10. Entry is 10^2^i.
* Used to convert decimal exponents into floating-point numbers.
*/
static xp_real_t powers_of_10[] =
{
10., 100., 1.0e4, 1.0e8, 1.0e16,
1.0e32, 1.0e64, 1.0e128, 1.0e256
};
xp_real_t fraction, dbl_exp, * d;
const xp_char_t* p, * end;
xp_cint_t c;
int exp = 0; /* Exponent read from "EX" field */
/*
* Exponent that derives from the fractional part. Under normal
* circumstatnces, it is the negative of the number of digits in F.
* However, if I is very long, the last digits of I get dropped
* (otherwise a long I with a large negative exponent could cause an
* unnecessary overflow on I alone). In this case, frac_exp is
* incremented one for each dropped digit.
*/
int frac_exp;
int mant_size; /* Number of digits in mantissa. */
int dec_pt; /* Number of mantissa digits BEFORE decimal point */
const xp_char_t *pexp; /* Temporarily holds location of exponent in string */
int negative = 0, exp_negative = 0;
p = str;
end = str + len;
/* Strip off leading blanks and check for a sign */
/*while (XP_AWK_ISSPACE(awk,*p)) p++;*/
/*while (*p != XP_T('\0')) */
while (p < end)
{
if (*p == XP_T('-'))
{
negative = ~negative;
p++;
}
else if (*p == XP_T('+')) p++;
else break;
}
/* Count the number of digits in the mantissa (including the decimal
* point), and also locate the decimal point. */
dec_pt = -1;
/*for (mant_size = 0; ; mant_size++) */
for (mant_size = 0; p < end; mant_size++)
{
c = *p;
if (!XP_AWK_ISDIGIT (awk, c))
{
if ((c != XP_T('.')) || (dec_pt >= 0)) break;
dec_pt = mant_size;
}
p++;
}
/*
* Now suck up the digits in the mantissa. Use two integers to
* collect 9 digits each (this is faster than using floating-point).
* If the mantissa has more than 18 digits, ignore the extras, since
* they can't affect the value anyway.
*/
pexp = p;
p -= mant_size;
if (dec_pt < 0)
{
dec_pt = mant_size;
}
else
{
mant_size--; /* One of the digits was the point */
}
if (mant_size > 18) /* TODO: is 18 correct for xp_real_t??? */
{
frac_exp = dec_pt - 18;
mant_size = 18;
}
else
{
frac_exp = dec_pt - mant_size;
}
if (mant_size == 0)
{
fraction = 0.0;
/*p = str;*/
goto done;
}
else
{
int frac1, frac2;
frac1 = 0;
for ( ; mant_size > 9; mant_size--)
{
c = *p;
p++;
if (c == XP_T('.'))
{
c = *p;
p++;
}
frac1 = 10 * frac1 + (c - XP_T('0'));
}
frac2 = 0;
for (; mant_size > 0; mant_size--) {
c = *p;
p++;
if (c == XP_T('.'))
{
c = *p;
p++;
}
frac2 = 10*frac2 + (c - XP_T('0'));
}
fraction = (1.0e9 * frac1) + frac2;
}
/* Skim off the exponent */
p = pexp;
if ((*p == XP_T('E')) || (*p == XP_T('e')))
{
p++;
if (*p == XP_T('-'))
{
exp_negative = 1;
p++;
}
else
{
if (*p == XP_T('+')) p++;
exp_negative = 0;
}
if (!XP_AWK_ISDIGIT (awk, *p))
{
/* p = pexp; */
goto done;
}
while (XP_AWK_ISDIGIT (awk, *p))
{
exp = exp * 10 + (*p - XP_T('0'));
p++;
}
}
if (exp_negative) exp = frac_exp - exp;
else exp = frac_exp + exp;
/*
* Generate a floating-point number that represents the exponent.
* Do this by processing the exponent one bit at a time to combine
* many powers of 2 of 10. Then combine the exponent with the
* fraction.
*/
if (exp < 0)
{
exp_negative = 1;
exp = -exp;
}
else exp_negative = 0;
if (exp > MAX_EXPONENT) exp = MAX_EXPONENT;
dbl_exp = 1.0;
for (d = powers_of_10; exp != 0; exp >>= 1, d++)
{
if (exp & 01) dbl_exp *= *d;
}
if (exp_negative) fraction /= dbl_exp;
else fraction *= dbl_exp;
done:
return (negative)? -fraction: fraction;
}
xp_size_t xp_awk_longtostr (

9
ase/awk/parse.c
View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c,v 1.185 2006-10-05 14:20:57 bacon Exp $
* $Id: parse.c,v 1.186 2006-10-06 03:33:43 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -1412,6 +1412,7 @@ static xp_awk_nde_t* __parse_binary_expr (
return XP_NULL;
}
#if 0
/* TODO: enhance constant folding. do it in a better way */
/* TODO: differentiate different types of numbers ... */
if (left->type == XP_AWK_NDE_INT &&
@ -1472,6 +1473,7 @@ static xp_awk_nde_t* __parse_binary_expr (
/* TODO: enhance constant folding more... */
skip_constant_folding:
#endif
nde = (xp_awk_nde_exp_t*) XP_AWK_MALLOC (
awk, xp_sizeof(xp_awk_nde_exp_t));
if (nde == XP_NULL)
@ -1986,8 +1988,9 @@ static xp_awk_nde_t* __parse_primary (xp_awk_t* awk)
nde->type = XP_AWK_NDE_REAL;
nde->next = XP_NULL;
nde->val = xp_awk_strtoreal (
awk, XP_AWK_STR_BUF(&awk->token.name));
nde->val = xp_awk_strxtoreal (awk,
XP_AWK_STR_BUF(&awk->token.name),
XP_AWK_STR_LEN(&awk->token.name), XP_NULL);
nde->str = xp_awk_strxdup (awk,
XP_AWK_STR_BUF(&awk->token.name),
XP_AWK_STR_LEN(&awk->token.name));

28
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.223 2006-10-05 14:20:57 bacon Exp $
* $Id: run.c,v 1.224 2006-10-06 03:37:40 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -2850,20 +2850,22 @@ static int __cmp_int_str (
if (((xp_awk_val_int_t*)left)->val < r) return -1;
return 0;
}
/* TODO: */
/*
r = xp_awk_strxtoreal (run->awk,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len, &str);
if (str == ((xp_awk_val_str_t*)right)->buf +
((xp_awk_val_str_t*)right)->len)
else if (*str == XP_T('.') || *str == XP_T('E') || *sstr == XP_T('e'))
{
if (((xp_awk_val_int_t*)left)->val > rr) return 1;
if (((xp_awk_val_int_t*)left)->val < rr) return -1;
return 0;
/* TODO: */
/*
r = xp_awk_strxtoreal (run->awk,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len, &str);
if (str == ((xp_awk_val_str_t*)right)->buf +
((xp_awk_val_str_t*)right)->len)
{
if (((xp_awk_val_int_t*)left)->val > rr) return 1;
if (((xp_awk_val_int_t*)left)->val < rr) return -1;
return 0;
}
*/
}
*/
str = xp_awk_valtostr (run, left, xp_true, XP_NULL, &len);
if (str == XP_NULL)

58
ase/awk/tree.c
View File

@ -1,5 +1,5 @@
/*
* $Id: tree.c,v 1.77 2006-09-28 14:21:23 bacon Exp $
* $Id: tree.c,v 1.78 2006-10-06 03:33:43 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -222,32 +222,50 @@ static int __print_expression (xp_awk_t* awk, xp_awk_nde_t* nde)
case XP_AWK_NDE_INT:
{
xp_char_t tmp[xp_sizeof(xp_long_t)*8+2];
xp_size_t n;
if (((xp_awk_nde_int_t*)nde)->str == XP_NULL)
{
xp_char_t tmp[xp_sizeof(xp_long_t)*8+2];
xp_size_t n;
n = xp_awk_longtostr (
((xp_awk_nde_int_t*)nde)->val,
10, XP_NULL, tmp, xp_countof(tmp));
n = xp_awk_longtostr (
((xp_awk_nde_int_t*)nde)->val,
10, XP_NULL, tmp, xp_countof(tmp));
PUT_SRCSTRX (awk, tmp, n);
PUT_SRCSTRX (awk, tmp, n);
}
else
{
PUT_SRCSTRX (awk,
((xp_awk_nde_int_t*)nde)->str,
((xp_awk_nde_int_t*)nde)->len);
}
break;
}
case XP_AWK_NDE_REAL:
{
xp_char_t tmp[128];
#if (XP_SIZEOF_LONG_DOUBLE != 0)
awk->syscas->sprintf (
tmp, xp_countof(tmp), XP_T("%Lf"),
(long double)((xp_awk_nde_real_t*)nde)->val);
#elif (XP_SIZEOF_DOUBLE != 0)
awk->syscas->sprintf (
tmp, xp_countof(tmp), XP_T("%f"),
(double)((xp_awk_nde_real_t*)nde)->val);
#else
#error unsupported floating-point data type
#endif
PUT_SRCSTR (awk, tmp);
if (((xp_awk_nde_real_t*)nde)->str == XP_NULL)
{
xp_char_t tmp[128];
#if (XP_SIZEOF_LONG_DOUBLE != 0)
awk->syscas->sprintf (
tmp, xp_countof(tmp), XP_T("%Lf"),
(long double)((xp_awk_nde_real_t*)nde)->val);
#elif (XP_SIZEOF_DOUBLE != 0)
awk->syscas->sprintf (
tmp, xp_countof(tmp), XP_T("%f"),
(double)((xp_awk_nde_real_t*)nde)->val);
#else
#error unsupported floating-point data type
#endif
PUT_SRCSTR (awk, tmp);
}
else
{
PUT_SRCSTRX (awk,
((xp_awk_nde_real_t*)nde)->str,
((xp_awk_nde_real_t*)nde)->len);
}
break;
}

10
ase/awk/val.c
View File

@ -1,5 +1,5 @@
/*
* $Id: val.c,v 1.68 2006-10-05 14:22:36 bacon Exp $
* $Id: val.c,v 1.69 2006-10-06 03:33:43 bacon Exp $
*/
#include <xp/awk/awk_i.h>
@ -611,7 +611,6 @@ static xp_char_t* __val_real_to_str (
return tmp;
}
int xp_awk_valtonum (
xp_awk_run_t* run, xp_awk_val_t* v, xp_long_t* l, xp_real_t* r)
{
@ -637,7 +636,6 @@ int xp_awk_valtonum (
{
const xp_char_t* endptr;
/* don't care about val->len */
*l = xp_awk_strxtolong (run->awk,
((xp_awk_val_str_t*)v)->buf,
((xp_awk_val_str_t*)v)->len, 0, &endptr);
@ -645,8 +643,10 @@ int xp_awk_valtonum (
*endptr == XP_T('E') ||
*endptr == XP_T('e'))
{
*r = xp_awk_strtoreal (
run->awk, ((xp_awk_val_str_t*)v)->buf);
*r = xp_awk_strxtoreal (run->awk,
((xp_awk_val_str_t*)v)->buf,
((xp_awk_val_str_t*)v)->len, XP_NULL);
/* TODO: need to check if it is a valid number using endptr for strxtoreal? */
return 1; /* real */
}