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
2007-03-19 15:25:51 +00:00
parent 1abc5fdb67
commit f25d2f88d5
5 changed files with 117 additions and 34 deletions
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.210 2007-03-10 15:32:54 bacon Exp $
* $Id: awk.h,v 1.211 2007-03-19 15:25:50 bacon Exp $
*
* {License}
*/
@ -211,6 +211,11 @@ enum
ASE_AWK_EISDIR, /* is a directory */
ASE_AWK_EIOERR, /* i/o error */
ASE_AWK_EOPEN, /* cannot open */
ASE_AWK_EREAD, /* cannot read */
ASE_AWK_EWRITE, /* cannot write */
ASE_AWK_ECLOSE, /* cannot close */
ASE_AWK_EINTERN, /* internal error */
ASE_AWK_ERUNTIME, /* run-time error */
ASE_AWK_EBLKNST, /* blocke nested too deeply */

7
ase/awk/err.c
View File

@ -1,5 +1,5 @@
/*
* $Id: err.c,v 1.94 2007-03-10 15:32:54 bacon Exp $
* $Id: err.c,v 1.95 2007-03-19 15:25:50 bacon Exp $
*
* {License}
*/
@ -27,6 +27,11 @@ static const ase_char_t* __geterrstr (int errnum)
ASE_T("system too busy"),
ASE_T("is a directory"),
ASE_T("i/o error"),
ASE_T("cannot open '%.*s'"),
ASE_T("cannot read '%.*s'"),
ASE_T("cannot write '%.*s'"),
ASE_T("cannot close '%.*s'"),
ASE_T("internal error that should never have happened"),
ASE_T("general run-time error"),

14
ase/awk/extio.c
View File

@ -1,5 +1,5 @@
/*
* $Id: extio.c,v 1.76 2007-03-10 15:02:30 bacon Exp $
* $Id: extio.c,v 1.77 2007-03-19 15:25:50 bacon Exp $
*
* {License}
*/
@ -144,13 +144,21 @@ int ase_awk_readextio (
p->in.eof = ase_false;
p->in.eos = ase_false;
run->errnum = ASE_AWK_ENOERR;
n = handler (ASE_AWK_IO_OPEN, p, ASE_NULL, 0);
if (n <= -1)
{
ASE_AWK_FREE (run->awk, p->name);
ASE_AWK_FREE (run->awk, p);
if (run->errnum == ASE_AWK_ENOERR)
{
/* if the error number has not been set by the user */
ase_awk_setrunerror (
run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0);
}
return -1;
}
@ -219,12 +227,16 @@ int ase_awk_readextio (
break;
}
run->errnum = ASE_AWK_ENOERR;
n = handler (ASE_AWK_IO_READ, p, p->in.buf, ASE_COUNTOF(p->in.buf));
if (n <= -1)
{
/* handler error. getline should return -1 */
if (run->errnum == ASE_AWK_ENOERR)
{
ase_awk_setrunerror (
run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0);
}
ret = -1;
break;
}

38
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.345 2007-03-19 03:33:53 bacon Exp $
* $Id: run.c,v 1.346 2007-03-19 15:25:51 bacon Exp $
*
* {License}
*/
@ -1648,6 +1648,12 @@ static int __run_block0 (ase_awk_run_t* run, ase_awk_nde_blk_t* nde)
run, ASE_AWK_ECOUTWR, nde->line,
ASE_NULL, 0);
}
else
{
/* adjust the error line */
run->errlin = nde->line;
}
return -1;
}
@ -2253,6 +2259,7 @@ static int __run_nextoutfile (ase_awk_run_t* run, ase_awk_nde_nextfile_t* nde)
}
else
{
/* adjust the error line */
run->errlin = nde->line;
}
@ -2585,8 +2592,10 @@ static int __run_print (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
ASE_STR_LEN(&run->inrec.line));
if (n <= -1 /*&& run->errnum != ASE_AWK_EIOIMPL*/)
{
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
/* change the error line */
if (out != ASE_NULL)
ASE_AWK_FREE (run->awk, out);
/* adjust the error line */
run->errlin = nde->line;
return -1;
}
@ -2615,8 +2624,10 @@ static int __run_print (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
run->global.ofs.len);
if (n <= -1 /*&& run->errnum != ASE_AWK_EIOIMPL*/)
{
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
/* change the error line */
if (out != ASE_NULL)
ASE_AWK_FREE (run->awk, out);
/* adjust the error line */
run->errlin = nde->line;
return -1;
}
@ -2625,7 +2636,8 @@ static int __run_print (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
v = __eval_expression (run, np);
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;
}
ase_awk_refupval (run, v);
@ -2633,9 +2645,11 @@ static int __run_print (ase_awk_run_t* run, ase_awk_nde_print_t* nde)
n = ase_awk_writeextio_val (run, nde->out_type, dst, v);
if (n <= -1 /*&& run->errnum != ASE_AWK_EIOIMPL*/)
{
if (out != ASE_NULL) ASE_AWK_FREE (run->awk, out);
if (out != ASE_NULL)
ASE_AWK_FREE (run->awk, out);
ase_awk_refdownval (run, v);
/* change the error line */
/* adjust the error line */
run->errlin = nde->line;
return -1;
}
@ -6136,15 +6150,23 @@ static int __read_record (ase_awk_run_t* run)
run, ASE_AWK_IN_CONSOLE, ASE_T(""), &run->inrec.line);
if (n <= -1)
{
/* save the error number first as the error number can
* be changed by ase_awk_clrrec if it fails */
/*
int saved = run->errnum;
*/
ase_awk_clrrec (run, ase_false);
/*
if (saved == ASE_AWK_EIOIMPL)
{
ase_awk_setrunerror (
run, ASE_AWK_ECINRD, 0, ASE_NULL, 0);
}
*/
return -1;
}
#ifdef DEBUG_RUN
ase_dprintf (ASE_T("record len = %d str=[%.*s]\n"),
(int)ASE_STR_LEN(&run->inrec.line),