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-11-15 15:05:36 +00:00
parent 8b3794ceea
commit 35903ff382
4 changed files with 119 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ase/awk/awk_i.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk_i.h,v 1.78 2006-11-13 15:08:53 bacon Exp $ * $Id: awk_i.h,v 1.79 2006-11-15 15:04:41 bacon Exp $
*/ */
#ifndef _ASE_AWK_AWKI_H_ #ifndef _ASE_AWK_AWKI_H_
@ -275,6 +275,13 @@ struct ase_awk_run_t
ase_char_t tmp[4096]; ase_char_t tmp[4096];
} sprintf; } sprintf;
struct
{
ase_awk_str_t fmt;
ase_awk_str_t out;
ase_char_t tmp[4096];
} sconvf;
int errnum; int errnum;
ase_awk_t* awk; ase_awk_t* awk;

116
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.259 2006-11-14 14:54:17 bacon Exp $ * $Id: run.c,v 1.260 2006-11-15 15:04:41 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -676,9 +676,30 @@ static int __init_run (ase_awk_run_t* run, ase_awk_runios_t* runios, int* errnum
return -1; return -1;
} }
if (ase_awk_str_open (&run->sconvf.out, 256, run->awk) == ASE_NULL)
{
ase_awk_str_close (&run->sprintf.fmt);
ase_awk_str_close (&run->sprintf.out);
ase_awk_str_close (&run->inrec.line);
*errnum = ASE_AWK_ENOMEM;
return -1;
}
if (ase_awk_str_open (&run->sconvf.fmt, 256, run->awk) == ASE_NULL)
{
ase_awk_str_close (&run->sconvf.out);
ase_awk_str_close (&run->sprintf.fmt);
ase_awk_str_close (&run->sprintf.out);
ase_awk_str_close (&run->inrec.line);
*errnum = ASE_AWK_ENOMEM;
return -1;
}
if (ase_awk_map_open (&run->named, if (ase_awk_map_open (&run->named,
run, DEF_BUF_CAPA, __free_namedval, run->awk) == ASE_NULL) run, DEF_BUF_CAPA, __free_namedval, run->awk) == ASE_NULL)
{ {
ase_awk_str_close (&run->sconvf.fmt);
ase_awk_str_close (&run->sconvf.out);
ase_awk_str_close (&run->sprintf.fmt); ase_awk_str_close (&run->sprintf.fmt);
ase_awk_str_close (&run->sprintf.out); ase_awk_str_close (&run->sprintf.out);
ase_awk_str_close (&run->inrec.line); ase_awk_str_close (&run->inrec.line);
@ -693,6 +714,8 @@ static int __init_run (ase_awk_run_t* run, ase_awk_runios_t* runios, int* errnum
if (run->pattern_range_state == ASE_NULL) if (run->pattern_range_state == ASE_NULL)
{ {
ase_awk_map_close (&run->named); ase_awk_map_close (&run->named);
ase_awk_str_close (&run->sconvf.fmt);
ase_awk_str_close (&run->sconvf.out);
ase_awk_str_close (&run->sprintf.fmt); ase_awk_str_close (&run->sprintf.fmt);
ase_awk_str_close (&run->sprintf.out); ase_awk_str_close (&run->sprintf.out);
ase_awk_str_close (&run->inrec.line); ase_awk_str_close (&run->inrec.line);
@ -781,6 +804,8 @@ static void __deinit_run (ase_awk_run_t* run)
run->global.subsep.len = 0; run->global.subsep.len = 0;
} }
ase_awk_str_close (&run->sconvf.fmt);
ase_awk_str_close (&run->sconvf.out);
ase_awk_str_close (&run->sprintf.fmt); ase_awk_str_close (&run->sprintf.fmt);
ase_awk_str_close (&run->sprintf.out); ase_awk_str_close (&run->sprintf.out);
@ -5508,10 +5533,12 @@ ase_char_t* ase_awk_sprintf (
{ {
ase_size_t i, j; ase_size_t i, j;
ase_size_t stack_arg_idx = 1; ase_size_t stack_arg_idx = 1;
ase_awk_str_t* out, * fbu;
ase_awk_val_t* val;
#define OUT_CHAR(c) \ #define OUT_CHAR(c) \
do { \ do { \
if (ase_awk_str_ccat (&run->sprintf.out, (c)) == -1) \ if (ase_awk_str_ccat (out, (c)) == -1) \
{ \ { \
run->errnum = ASE_AWK_ENOMEM; \ run->errnum = ASE_AWK_ENOMEM; \
return ASE_NULL; \ return ASE_NULL; \
@ -5520,19 +5547,33 @@ ase_char_t* ase_awk_sprintf (
#define FMT_CHAR(c) \ #define FMT_CHAR(c) \
do { \ do { \
if (ase_awk_str_ccat (&run->sprintf.fmt, (c)) == -1) \ if (ase_awk_str_ccat (fbu, (c)) == -1) \
{ \ { \
run->errnum = ASE_AWK_ENOMEM; \ run->errnum = ASE_AWK_ENOMEM; \
return ASE_NULL; \ return ASE_NULL; \
} \ } \
} while (0) } while (0)
ase_awk_str_clear (&run->sprintf.out); if (nargs_on_stack == (ase_size_t)-1)
ase_awk_str_clear (&run->sprintf.fmt); {
out = &run->sconvf.out;
fbu = &run->sconvf.fmt;
val = (ase_awk_val_t*)args;
nargs_on_stack = 2;
}
else
{
out = &run->sprintf.out;
fbu = &run->sprintf.fmt;
val = ASE_NULL;
}
ase_awk_str_clear (out);
ase_awk_str_clear (fbu);
for (i = 0; i < fmt_len; i++) for (i = 0; i < fmt_len; i++)
{ {
if (ASE_AWK_STR_LEN(&run->sprintf.fmt) == 0) if (ASE_AWK_STR_LEN(fbu) == 0)
{ {
if (fmt[i] == ASE_T('%')) FMT_CHAR (fmt[i]); if (fmt[i] == ASE_T('%')) FMT_CHAR (fmt[i]);
else OUT_CHAR (fmt[i]); else OUT_CHAR (fmt[i]);
@ -5563,7 +5604,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5622,7 +5664,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5684,7 +5727,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5698,10 +5742,11 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
ASE_AWK_STR_BUF(fbu),
#ifdef _WIN32 #ifdef _WIN32
run->sprintf.fmt.buf, (__int64)l); (__int64)l);
#else #else
run->sprintf.fmt.buf, (long long)l); (long long)l);
#endif #endif
p = run->sprintf.tmp; p = run->sprintf.tmp;
@ -5732,7 +5777,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5746,7 +5792,8 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, (long double)r); ASE_AWK_STR_BUF(fbu),
(long double)r);
p = run->sprintf.tmp; p = run->sprintf.tmp;
while (*p != ASE_T('\0')) while (*p != ASE_T('\0'))
@ -5770,7 +5817,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5783,7 +5831,7 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, ASE_AWK_STR_BUF(fbu),
(int)((ase_awk_val_int_t*)v)->val); (int)((ase_awk_val_int_t*)v)->val);
} }
else if (v->type == ASE_AWK_VAL_REAL) else if (v->type == ASE_AWK_VAL_REAL)
@ -5791,7 +5839,7 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, ASE_AWK_STR_BUF(fbu),
(int)((ase_awk_val_real_t*)v)->val); (int)((ase_awk_val_real_t*)v)->val);
} }
else if (v->type == ASE_AWK_VAL_STR) else if (v->type == ASE_AWK_VAL_STR)
@ -5803,7 +5851,8 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, str->buf[0]); ASE_AWK_STR_BUF(fbu),
str->buf[0]);
} }
else run->sprintf.tmp[0] = ASE_T('\0'); else run->sprintf.tmp[0] = ASE_T('\0');
} }
@ -5838,7 +5887,8 @@ ase_char_t* ase_awk_sprintf (
v = (args == ASE_NULL)? v = (args == ASE_NULL)?
ase_awk_getarg (run, stack_arg_idx): ase_awk_getarg (run, stack_arg_idx):
__eval_expression (run, args); (val == ASE_NULL)?
__eval_expression (run, args): val;
if (v == ASE_NULL) return ASE_NULL; if (v == ASE_NULL) return ASE_NULL;
ase_awk_refupval (v); ase_awk_refupval (v);
@ -5854,13 +5904,22 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, ASE_AWK_STR_BUF(fbu),
((ase_awk_val_str_t*)v)->buf); ((ase_awk_val_str_t*)v)->buf);
} }
else else
{ {
ase_size_t l; ase_size_t l;
/* TODO:XXXXX
if (v == val)
{
ase_awk_refdownval (run, v);
run->errnum = ASE_AWK_EPRINTFARG;
return ASE_NULL;
}
*/
p = ase_awk_valtostr (run, v, p = ase_awk_valtostr (run, v,
ASE_AWK_VALTOSTR_CLEAR, ASE_NULL, &l); ASE_AWK_VALTOSTR_CLEAR, ASE_NULL, &l);
if (p == ASE_NULL) if (p == ASE_NULL)
@ -5872,11 +5931,11 @@ ase_char_t* ase_awk_sprintf (
run->awk->syscas.sprintf ( run->awk->syscas.sprintf (
run->sprintf.tmp, run->sprintf.tmp,
ase_countof(run->sprintf.tmp), ase_countof(run->sprintf.tmp),
run->sprintf.fmt.buf, p); ASE_AWK_STR_BUF(fbu),
p);
ASE_AWK_FREE (run->awk, p); ASE_AWK_FREE (run->awk, p);
} }
ase_awk_refdownval (run, v); ase_awk_refdownval (run, v);
p = run->sprintf.tmp; p = run->sprintf.tmp;
@ -5888,20 +5947,21 @@ ase_char_t* ase_awk_sprintf (
} }
else /*if (fmt[i] == ASE_T('%'))*/ else /*if (fmt[i] == ASE_T('%'))*/
{ {
for (j = 0; j < ASE_AWK_STR_LEN(&run->sprintf.fmt); j++) for (j = 0; j < ASE_AWK_STR_LEN(fbu); j++)
OUT_CHAR (ASE_AWK_STR_CHAR(&run->sprintf.fmt,j)); OUT_CHAR (ASE_AWK_STR_CHAR(fbu,j));
OUT_CHAR (fmt[i]); OUT_CHAR (fmt[i]);
} }
if (args == ASE_NULL) stack_arg_idx++; if (args == ASE_NULL) stack_arg_idx++;
else args = args->next; else args = args->next;
ase_awk_str_clear (&run->sprintf.fmt); ase_awk_str_clear (fbu);
} }
/* flush uncompleted formatting sequence */ /* flush uncompleted formatting sequence */
for (j = 0; j < ASE_AWK_STR_LEN(&run->sprintf.fmt); j++) for (j = 0; j < ASE_AWK_STR_LEN(fbu); j++)
OUT_CHAR (ASE_AWK_STR_CHAR(&run->sprintf.fmt,j)); OUT_CHAR (ASE_AWK_STR_CHAR(fbu,j));
*len = ASE_AWK_STR_LEN(&run->sprintf.out); *len = ASE_AWK_STR_LEN(out);
return ASE_AWK_STR_BUF(&run->sprintf.out); return ASE_AWK_STR_BUF(out);
} }

27
ase/awk/val.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: val.c,v 1.83 2006-11-15 05:49:22 bacon Exp $ * $Id: val.c,v 1.84 2006-11-15 15:04:41 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -573,18 +573,32 @@ static ase_char_t* __val_real_to_str (
{ {
/* TODO: change the code */ /* TODO: change the code */
ase_char_t tbuf[256], * tmp; ase_char_t tbuf[256], * tmp;
ase_size_t tmp_len;
tmp = (opt & ASE_AWK_VALTOSTR_PRINT)? if (opt & ASE_AWK_VALTOSTR_PRINT)
run->global.ofmt.ptr: run->global.convfmt.ptr; {
tmp = run->global.ofmt.ptr;
tmp_len = run->global.ofmt.len;
}
else
{
tmp = run->global.convfmt.ptr;
tmp_len = run->global.convfmt.len;
}
/* TODO: need to use awk's own version of sprintf so that it would have /* TODO: need to use awk's own version of sprintf so that it would have
* problems with handling long double or double... */ * problems with handling long double or double... */
/* TODO: does it need to check if a null character is included in convfmt??? */ /* TODO: does it need to check if a null character is included in convfmt??? */
/* TODO: check if convfmt contains more that one format specifier */ /* TODO: check if convfmt contains more that one format specifier */
run->awk->syscas.sprintf (tbuf, ase_countof(tbuf), tmp, (double)v->val); //run->awk->syscas.sprintf (tbuf, ase_countof(tbuf), tmp, (double)v->val);
tmp = ase_awk_sprintf (run, tmp, tmp_len,
(ase_size_t)-1, (ase_awk_nde_t*)v, &tmp_len);
if (buf == ASE_NULL) if (buf == ASE_NULL)
{ {
tmp = ase_awk_strdup (run->awk, tbuf); //tmp = ase_awk_strdup (run->awk, tbuf);
tmp = ase_awk_strxdup (run->awk, tmp, tmp_len);
if (tmp == ASE_NULL) if (tmp == ASE_NULL)
{ {
run->errnum = ASE_AWK_ENOMEM; run->errnum = ASE_AWK_ENOMEM;
@ -597,7 +611,8 @@ static ase_char_t* __val_real_to_str (
{ {
if (opt & ASE_AWK_VALTOSTR_CLEAR) ase_awk_str_clear (buf); if (opt & ASE_AWK_VALTOSTR_CLEAR) ase_awk_str_clear (buf);
if (ase_awk_str_cat (buf, tbuf) == (ase_size_t)-1) //if (ase_awk_str_cat (buf, tbuf) == (ase_size_t)-1)
if (ase_awk_str_ncat (buf, tmp, tmp_len) == (ase_size_t)-1)
{ {
run->errnum = ASE_AWK_ENOMEM; run->errnum = ASE_AWK_ENOMEM;
return ASE_NULL; return ASE_NULL;

1
ase/test/awk/crash01.awk Normal file
View File

@ -0,0 +1 @@
BEGIN { CONVFMT="%s"; printf ("%s\n", 10.34); }