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-02 11:36:41 +00:00
parent d1183a418d
commit ab969f2171
3 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.252 2006-11-01 04:16:08 bacon Exp $ * $Id: run.c,v 1.253 2006-11-02 11:36:41 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -1562,14 +1562,6 @@ static int __run_statement (ase_awk_run_t* run, ase_awk_nde_t* nde)
break; break;
} }
/*
case ASE_AWK_NDE_PRINT:
{
TODO: PRINTF
break;
}
*/
default: default:
{ {
ase_awk_val_t* v; ase_awk_val_t* v;
@ -2316,7 +2308,7 @@ static int __run_printf (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
ase_awk_nde_print_t* p = (ase_awk_nde_print_t*)nde; ase_awk_nde_print_t* p = (ase_awk_nde_print_t*)nde;
ase_char_t* out = ASE_NULL; ase_char_t* out = ASE_NULL;
const ase_char_t* dst; const ase_char_t* dst;
ase_awk_val_t* v; ase_awk_val_t* v, * fmt;
ase_awk_nde_t* head, * np; ase_awk_nde_t* head, * np;
int n; int n;
@ -2378,7 +2370,6 @@ static int __run_printf (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
"a valid printf statement should have at least one argument. " "a valid printf statement should have at least one argument. "
"the parser must ensure this."); "the parser must ensure this.");
if (p->args->type == ASE_AWK_NDE_GRP) if (p->args->type == ASE_AWK_NDE_GRP)
{ {
/* parenthesized print */ /* parenthesized print */
@ -2387,29 +2378,22 @@ static int __run_printf (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
} }
else head = p->args; else head = p->args;
for (np = head; np != ASE_NULL; np = np->next) ASE_AWK_ASSERTX (run->awk, head != ASE_NULL,
{ "a valid printf statement should have at least one argument. "
if (np != head) "the parser must ensure this.");
{
n = ase_awk_writeextio_str (
run, p->out_type, dst,
run->global.ofs.ptr,
run->global.ofs.len);
if (n < 0 && run->errnum != ASE_AWK_EIOHANDLER)
{
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
return -1;
}
}
v = __eval_expression (run, np); v = __eval_expression (run, head);
if (v == ASE_NULL) if (v == ASE_NULL)
{ {
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out); if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
return -1; return -1;
} }
ase_awk_refupval (v);
ase_awk_refupval (v);
if (v->type != ASE_AWK_VAL_STR)
{
/* the remaining arguments are ignored as the format cannot
* contain any % characters */
n = ase_awk_writeextio_val (run, p->out_type, dst, v); n = ase_awk_writeextio_val (run, p->out_type, dst, v);
if (n < 0 && run->errnum != ASE_AWK_EIOHANDLER) if (n < 0 && run->errnum != ASE_AWK_EIOHANDLER)
{ {
@ -2417,13 +2401,29 @@ static int __run_printf (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
ase_awk_refdownval (run, v); ase_awk_refdownval (run, v);
return -1; return -1;
} }
ase_awk_refdownval (run, v);
/* TODO: how to handle n == -1 && run->errnum == ASE_AWK_EIOHANDLER.
* that is the user handler returned an error... */
} }
else
{
/* check the formatting characters */
ase_char_t* fmt = ((ase_awk_val_str_t*)v)->buf;
ase_size_t fmt_len = ((ase_awk_val_str_t*)v)->len;
ase_size_t i;
for (i = 0; i < fmt_len; i++)
{
if (fmt[i] == ASE_T('%'))
{
/* TODO: */
}
else
{
/* TODO: do buffering and call these... */
ase_awk_writeextio_str (
run, p->out_type, dst, &fmt[i], 1);
}
}
}
ase_awk_refdownval (run, v);
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out); if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
@ -4772,7 +4772,11 @@ static int __get_reference (
pair = ase_awk_map_put ( pair = ase_awk_map_put (
&run->named, tgt->id.name, &run->named, tgt->id.name,
tgt->id.name_len, ase_awk_val_nil); tgt->id.name_len, ase_awk_val_nil);
if (pair == ASE_NULL) PANIC_I (run, ASE_AWK_ENOMEM); if (pair == ASE_NULL)
{
run->errnum = ASE_AWK_ENOMEM;
return -1;
}
} }
*ref = (ase_awk_val_t**)&pair->val; *ref = (ase_awk_val_t**)&pair->val;
@ -4808,7 +4812,11 @@ static int __get_reference (
pair = ase_awk_map_put ( pair = ase_awk_map_put (
&run->named, tgt->id.name, &run->named, tgt->id.name,
tgt->id.name_len, ase_awk_val_nil); tgt->id.name_len, ase_awk_val_nil);
if (pair == ASE_NULL) PANIC_I (run, ASE_AWK_ENOMEM); if (pair == ASE_NULL)
{
run->errnum = ASE_AWK_ENOMEM;
return -1;
}
} }
tmp = __get_reference_indexed ( tmp = __get_reference_indexed (
@ -4857,15 +4865,24 @@ static int __get_reference (
n = ase_awk_valtonum (run, v, &lv, &rv); n = ase_awk_valtonum (run, v, &lv, &rv);
ase_awk_refdownval (run, v); ase_awk_refdownval (run, v);
if (n == -1) PANIC_I (run, ASE_AWK_EPOSIDX); if (n == -1)
{
run->errnum = ASE_AWK_EPOSIDX;
return -1;
}
if (n == 1) lv = (ase_long_t)rv; if (n == 1) lv = (ase_long_t)rv;
if (!IS_VALID_POSIDX(lv)) PANIC_I (run, ASE_AWK_EPOSIDX); if (!IS_VALID_POSIDX(lv))
{
run->errnum = ASE_AWK_EPOSIDX;
return -1;
}
*ref = (ase_awk_val_t**)((ase_size_t)lv); *ref = (ase_awk_val_t**)((ase_size_t)lv);
return 0; return 0;
} }
PANIC_I (run, ASE_AWK_ENOTREFERENCEABLE); run->errnum = ASE_AWK_ENOTREFERENCEABLE;
return -1;
} }
static ase_awk_val_t** __get_reference_indexed ( static ase_awk_val_t** __get_reference_indexed (

10
ase/test/awk/arg.awk
View File

@ -13,11 +13,13 @@ BEGIN {
print "ARGV[" i "]", ARGV[i]; print "ARGV[" i "]", ARGV[i];
} }
#for (i = 0 #for (i = 0
# i < 20 # i < 20
# i;;) print i; # i;;) print "[" i "]";
#for (i = 0
# (i < 20)
# i;;) print "[" i "]";
#printf 10, 20, 30;
if (ARGC >= 0) printf "ARGC is positive"; if (ARGC >= 0) printf "ARGC is positive\n";
} }

27
ase/test/awk/awk.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.c,v 1.109 2006-10-31 14:32:50 bacon Exp $ * $Id: awk.c,v 1.110 2006-11-02 11:36:41 bacon Exp $
*/ */
#include <ase/awk/awk.h> #include <ase/awk/awk.h>
@ -161,13 +161,15 @@ static FILE* popen_t (const ase_char_t* cmd, const ase_char_t* mode)
#ifdef WIN32 #ifdef WIN32
#define fgets_t _fgetts #define fgets_t _fgetts
#define fputs_t _fputts #define fputs_t _fputts
#define fputc_t _fputtc
#else #else
#ifdef ASE_CHAR_IS_MCHAR #ifdef ASE_CHAR_IS_MCHAR
#define fgets_t fgets #define fgets_t fgets
#define fputs_t fputs #define fputs_t fputs
#define fputc_t fputc
#else #else
#define fgets_t fgetws #define fgets_t fgetws
#define fputs_t fputws #define fputc_t fputwc
#endif #endif
#endif #endif
@ -271,8 +273,12 @@ xp_printf (ASE_T("closing %s of type (pipe) %d\n"), epa->name, epa->type);
case ASE_AWK_IO_WRITE: case ASE_AWK_IO_WRITE:
{ {
/* TODO: size... */ ase_size_t i;
fputs_t (data, (FILE*)epa->handle); /* TODO: how to return error or 0 */
for (i = 0; i < size; i++)
{
fputc_t (data[i], (FILE*)epa->handle);
}
return size; return size;
} }
@ -336,8 +342,12 @@ xp_printf (ASE_T("closing %s of type %d (file)\n"), epa->name, epa->type);
case ASE_AWK_IO_WRITE: case ASE_AWK_IO_WRITE:
{ {
ase_size_t i;
/* TODO: how to return error or 0 */ /* TODO: how to return error or 0 */
fputs_t (data, /*size,*/ (FILE*)epa->handle); for (i = 0; i < size; i++)
{
fputc_t (data[i], (FILE*)epa->handle);
}
return size; return size;
} }
@ -437,8 +447,13 @@ xp_printf (ASE_T("open the next console [%s]\n"), infiles[infile_no]);
} }
else if (cmd == ASE_AWK_IO_WRITE) else if (cmd == ASE_AWK_IO_WRITE)
{ {
ase_size_t i;
/* TODO: how to return error or 0 */ /* TODO: how to return error or 0 */
fputs_t (data, /*size,*/ (FILE*)epa->handle); for (i = 0; i < size; i++)
{
fputc_t (data[i], (FILE*)epa->handle);
}
/*MessageBox (NULL, data, data, MB_OK);*/ /*MessageBox (NULL, data, data, MB_OK);*/
return size; return size;
} }