From 2a4e4341bf02f1ca5bf2a89c65d2b3884e601414 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 20 Mar 2007 10:46:27 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/awk.h | 12 +--- ase/awk/err.c | 12 +--- ase/awk/extio.c | 116 ++++++++++++++++++++------------------- ase/awk/func.c | 32 ++++++----- ase/awk/run.c | 80 +++++---------------------- ase/test/awk/awk.c | 14 ++++- ase/test/awk/err-001.out | 2 +- ase/test/awk/err-003.out | 2 +- ase/test/awk/err-004.out | 2 +- ase/test/awk/err-005.out | 2 +- ase/test/awk/err-006.out | 2 +- ase/test/awk/err-007.out | 2 +- ase/test/awk/err-008.out | 2 +- ase/test/awk/err-009.out | 2 +- ase/test/awk/err-010.out | 2 +- ase/test/awk/err-011.out | 2 +- ase/test/awk/err-012.out | 2 +- ase/test/awk/err-013.out | 2 +- ase/test/awk/err-014.out | 2 +- ase/test/awk/err-015.out | 2 +- ase/test/awk/err-016.out | 2 +- ase/test/awk/err-017.out | 2 +- ase/test/awk/err-018.out | 2 +- ase/test/awk/err-019.out | 2 +- ase/test/awk/err-020.out | 2 +- ase/test/awk/err-021.out | 2 +- 26 files changed, 125 insertions(+), 181 deletions(-) diff --git a/ase/awk/awk.h b/ase/awk/awk.h index 97e879f5..cf55819e 100644 --- a/ase/awk/awk.h +++ b/ase/awk/awk.h @@ -1,5 +1,5 @@ /* - * $Id: awk.h,v 1.211 2007-03-19 15:25:50 bacon Exp $ + * $Id: awk.h,v 1.212 2007-03-20 10:44:44 bacon Exp $ * * {License} */ @@ -229,16 +229,6 @@ enum ASE_AWK_ESOUTCL, ASE_AWK_ESOUTWR, - ASE_AWK_ECINOP, - ASE_AWK_ECINCL, - ASE_AWK_ECINNX, - ASE_AWK_ECINRD, - - ASE_AWK_ECOUTOP, - ASE_AWK_ECOUTCL, - ASE_AWK_ECOUTNX, - ASE_AWK_ECOUTWR, - ASE_AWK_ELXCHR, /* lexer came accross an wrong character */ ASE_AWK_ELXUNG, /* lexer failed to unget a character */ diff --git a/ase/awk/err.c b/ase/awk/err.c index eb310c5e..3168c005 100644 --- a/ase/awk/err.c +++ b/ase/awk/err.c @@ -1,5 +1,5 @@ /* - * $Id: err.c,v 1.95 2007-03-19 15:25:50 bacon Exp $ + * $Id: err.c,v 1.96 2007-03-20 10:44:44 bacon Exp $ * * {License} */ @@ -46,16 +46,6 @@ static const ase_char_t* __geterrstr (int errnum) ASE_T("cannot close source output"), ASE_T("cannot write source output"), - ASE_T("cannot open console for read"), - ASE_T("cannot close console for read"), - ASE_T("cannot switch to next console for read"), - ASE_T("cannot read from console"), - - ASE_T("cannot open console for write"), - ASE_T("cannot close console for write"), - ASE_T("cannot switch to next console for write"), - ASE_T("cannot write to console"), - ASE_T("invalid character '%.*s'"), ASE_T("cannot unget character"), diff --git a/ase/awk/extio.c b/ase/awk/extio.c index 77be73b6..3c33d0d5 100644 --- a/ase/awk/extio.c +++ b/ase/awk/extio.c @@ -1,5 +1,5 @@ /* - * $Id: extio.c,v 1.77 2007-03-19 15:25:50 bacon Exp $ + * $Id: extio.c,v 1.78 2007-03-20 10:44:44 bacon Exp $ * * {License} */ @@ -100,7 +100,7 @@ int ase_awk_readextio ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -144,7 +144,7 @@ int ase_awk_readextio ( p->in.eof = ase_false; p->in.eos = ase_false; -run->errnum = ASE_AWK_ENOERR; + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_OPEN, p, ASE_NULL, 0); if (n <= -1) @@ -152,12 +152,12 @@ run->errnum = ASE_AWK_ENOERR; 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); -} + if (run->errnum == ASE_AWK_ENOERR) + { + /* if the error number has not been + * set by the user handler */ + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); + } return -1; } @@ -227,16 +227,19 @@ if (run->errnum == ASE_AWK_ENOERR) break; } -run->errnum = ASE_AWK_ENOERR; - n = handler (ASE_AWK_IO_READ, p, p->in.buf, ASE_COUNTOF(p->in.buf)); + ase_awk_setrunerrnum (run, 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); -} + if (run->errnum == ASE_AWK_ENOERR) + { + /* if the error number has not been + * set by the user handler */ + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); + } + ret = -1; break; } @@ -434,7 +437,7 @@ int ase_awk_writeextio_str ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -487,13 +490,16 @@ int ase_awk_writeextio_str ( p->out.eof = ase_false; p->out.eos = ase_false; + ase_awk_setrunerrnum (run, 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); - ase_awk_setrunerror ( - run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); + return -1; } @@ -528,12 +534,13 @@ int ase_awk_writeextio_str ( while (len > 0) { + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_WRITE, p, str, len); - if (n <= -1) { - ase_awk_setrunerror ( - run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); + return -1; } @@ -571,7 +578,7 @@ int ase_awk_flushextio ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -579,14 +586,15 @@ int ase_awk_flushextio ( while (p != ASE_NULL) { if (p->type == (extio_type | extio_mask) && - (name == ASE_NULL || ase_strcmp (p->name, name) == 0)) + (name == ASE_NULL || ase_strcmp(p->name,name) == 0)) { + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_FLUSH, p, ASE_NULL, 0); if (n <= -1) { - ase_awk_setrunerror ( - run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); return -1; } @@ -599,7 +607,7 @@ int ase_awk_flushextio ( if (ok) return 0; /* there is no corresponding extio for name */ - ase_awk_setrunerror (run, ASE_AWK_EIONONE, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIONONE); return -1; } @@ -623,7 +631,7 @@ int ase_awk_nextextio_read ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -649,10 +657,12 @@ int ase_awk_nextextio_read ( return 0; } + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_NEXT, p, ASE_NULL, 0); if (n <= -1) { - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); return -1; } @@ -697,7 +707,7 @@ int ase_awk_nextextio_write ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -723,23 +733,12 @@ int ase_awk_nextextio_write ( return 0; } + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_NEXT, p, ASE_NULL, 0); if (n <= -1) { - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); - return -1; - } - - if (p->out.eos) - { - /* no more streams. */ - return 0; - } - - n = handler (ASE_AWK_IO_NEXT, p, ASE_NULL, 0); - if (n <= -1) - { - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); return -1; } @@ -780,7 +779,7 @@ int ase_awk_closeextio_read ( if (handler == ASE_NULL) { /* no io handler provided */ - ase_awk_setrunerror (run, ASE_AWK_EIOUSER, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIOUSER); return -1; } @@ -814,8 +813,8 @@ int ase_awk_closeextio_read ( p = p->next; } - /* this is not a run-time error */ - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + /* the name given is not found */ + ase_awk_setrunerrnum (run, ASE_AWK_EIONONE); return -1; } @@ -853,10 +852,11 @@ int ase_awk_closeextio_write ( handler = run->extio.handler[p->type & __MASK_CLEAR]; if (handler != ASE_NULL) { + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) <= -1) { - /* this is not a run-time error.*/ - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); return -1; } } @@ -873,8 +873,7 @@ int ase_awk_closeextio_write ( p = p->next; } - /* this is not a run-time error */ - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIONONE); return -1; } @@ -893,10 +892,12 @@ int ase_awk_closeextio (ase_awk_run_t* run, const ase_char_t* name) handler = run->extio.handler[p->type & __MASK_CLEAR]; if (handler != ASE_NULL) { + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); if (handler (ASE_AWK_IO_CLOSE, p, ASE_NULL, 0) <= -1) { /* this is not a run-time error.*/ - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); return -1; } } @@ -906,6 +907,7 @@ int ase_awk_closeextio (ase_awk_run_t* run, const ase_char_t* name) ASE_AWK_FREE (run->awk, p->name); ASE_AWK_FREE (run->awk, p); + return 0; } @@ -913,8 +915,7 @@ int ase_awk_closeextio (ase_awk_run_t* run, const ase_char_t* name) p = p->next; } - /* this is not a run-time error */ - ase_awk_setrunerror (run, ASE_AWK_EIOIMPL, 0, ASE_NULL, 0); + ase_awk_setrunerrnum (run, ASE_AWK_EIONONE); return -1; } @@ -932,10 +933,13 @@ void ase_awk_clearextio (ase_awk_run_t* run) if (handler != ASE_NULL) { + ase_awk_setrunerrnum (run, ASE_AWK_ENOERR); n = handler (ASE_AWK_IO_CLOSE, run->extio.chain, ASE_NULL, 0); if (n <= -1) { - /* TODO: some warnings needs to be shown */ + if (run->errnum == ASE_AWK_ENOERR) + ase_awk_setrunerrnum (run, ASE_AWK_EIOIMPL); + /* TODO: some warnings need to be shown??? */ } } diff --git a/ase/awk/func.c b/ase/awk/func.c index 4d860637..248204a4 100644 --- a/ase/awk/func.c +++ b/ase/awk/func.c @@ -1,5 +1,5 @@ /* - * $Id: func.c,v 1.101 2007-03-10 11:58:35 bacon Exp $ + * $Id: func.c,v 1.102 2007-03-20 10:44:44 bacon Exp $ * * {License} */ @@ -234,17 +234,19 @@ static int __bfn_close ( } n = ase_awk_closeextio (run, name); - if (n == -1 && run->errnum != ASE_AWK_EIOIMPL) + /* + if (n == -1 && run->errnum != ASE_AWK_EIONONE) { if (a0->type != ASE_AWK_VAL_STR) ASE_AWK_FREE (run->awk, name); return -1; } + */ if (a0->type != ASE_AWK_VAL_STR) ASE_AWK_FREE (run->awk, name); skip_close: - v = ase_awk_makeintval (run, n); + v = ase_awk_makeintval (run, (ase_long_t)n); if (v == ASE_NULL) { ase_awk_setrunerrnum (run, ASE_AWK_ENOMEM); @@ -265,12 +267,19 @@ static int __flush_extio ( n2 = ase_awk_flushextio (run, extio, name); if (n2 == -1) { + /* if (run->errnum == ASE_AWK_EIOIMPL) n = -1; else if (run->errnum == ASE_AWK_EIONONE) { if (n != 0) n = -2; } else n = -99; + */ + if (run->errnum == ASE_AWK_EIONONE) + { + if (n != 0) n = -2; + } + else n = -1; } else if (n != -1) n = 0; } @@ -292,16 +301,9 @@ static int __bfn_fflush ( if (nargs == 0) { - /* flush the console output */ + /* flush the console output. + * fflush() should return -1 on errors */ n = ase_awk_flushextio (run, ASE_AWK_OUT_CONSOLE, ASE_T("")); - if (n == -1 && - run->errnum != ASE_AWK_EIOIMPL && - run->errnum != ASE_AWK_EIONONE) - { - return -1; - } - - /* fflush() should return -1 on EIOIMPL and EIONONE */ } else { @@ -341,15 +343,15 @@ static int __bfn_fflush ( n = __flush_extio ( run, ASE_AWK_EXTIO_FILE, ((len0 == 0)? ASE_NULL: str0), 1); - if (n == -99) return -1; + /*if (n == -99) return -1;*/ n = __flush_extio ( run, ASE_AWK_EXTIO_PIPE, ((len0 == 0)? ASE_NULL: str0), n); - if (n == -99) return -1; + /*if (n == -99) return -1;*/ n = __flush_extio ( run, ASE_AWK_EXTIO_COPROC, ((len0 == 0)? ASE_NULL: str0), n); - if (n == -99) return -1; + /*if (n == -99) return -1;*/ /* if n remains 1, no ip handlers have been defined for * file, pipe, and coproc. so make fflush return -1. diff --git a/ase/awk/run.c b/ase/awk/run.c index bb9dc97d..e4896025 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.346 2007-03-19 15:25:51 bacon Exp $ + * $Id: run.c,v 1.347 2007-03-20 10:44:44 bacon Exp $ * * {License} */ @@ -1626,12 +1626,9 @@ static int __run_block0 (ase_awk_run_t* run, ase_awk_nde_blk_t* nde) { ase_awk_refdownval (run, run->inrec.d0); - if (run->errnum == ASE_AWK_EIOIMPL) - { - ase_awk_setrunerror ( - run, ASE_AWK_ECOUTWR, nde->line, - ASE_NULL, 0); - } + /* adjust the error line */ + run->errlin = nde->line; + return -1; } @@ -1642,17 +1639,8 @@ static int __run_block0 (ase_awk_run_t* run, ase_awk_nde_blk_t* nde) { ase_awk_refdownval (run, run->inrec.d0); - if (run->errnum == ASE_AWK_EIOIMPL) - { - ase_awk_setrunerror ( - run, ASE_AWK_ECOUTWR, nde->line, - ASE_NULL, 0); - } - else - { - /* adjust the error line */ - run->errlin = nde->line; - } + /* adjust the error line */ + run->errlin = nde->line; return -1; } @@ -2212,18 +2200,8 @@ static int __run_nextinfile (ase_awk_run_t* run, ase_awk_nde_nextfile_t* nde) n = ase_awk_nextextio_read (run, ASE_AWK_IN_CONSOLE, ASE_T("")); if (n == -1) { - if (run->errnum == ASE_AWK_EIOIMPL) - { - /* replace the error by ECINNX */ - ase_awk_setrunerror ( - run, ASE_AWK_ECINNX, nde->line, ASE_NULL, 0); - } - else - { - /* adjust the error line */ - run->errlin = nde->line; - } - + /* adjust the error line */ + run->errlin = nde->line; return -1; } @@ -2252,17 +2230,8 @@ static int __run_nextoutfile (ase_awk_run_t* run, ase_awk_nde_nextfile_t* nde) n = ase_awk_nextextio_write (run, ASE_AWK_OUT_CONSOLE, ASE_T("")); if (n == -1) { - if (run->errnum == ASE_AWK_EIOIMPL) - { - ase_awk_setrunerror ( - run, ASE_AWK_ECOUTNX, nde->line, ASE_NULL, 0); - } - else - { - /* adjust the error line */ - run->errlin = nde->line; - } - + /* adjust the error line */ + run->errlin = nde->line; return -1; } @@ -2787,7 +2756,7 @@ static int __run_printf (ase_awk_run_t* run, ase_awk_nde_print_t* nde) 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; } @@ -2835,7 +2804,8 @@ static ase_awk_val_t* __eval_expression (ase_awk_run_t* run, ase_awk_nde_t* nde) /* the record has never been read. * probably, this functions has been triggered * by the statements in the BEGIN block */ - n = ase_awk_isemptyrex (run->awk, ((ase_awk_val_rex_t*)v)->code)? 1: 0; + n = ase_awk_isemptyrex ( + run->awk, ((ase_awk_val_rex_t*)v)->code)? 1: 0; } else { @@ -6026,16 +5996,7 @@ static ase_awk_val_t* __eval_getline (ase_awk_run_t* run, ase_awk_nde_t* nde) if (n <= -1) { - if (run->errnum != ASE_AWK_EIOIMPL) - { - ase_str_close (&buf); - /* adjust the line number */ - run->errlin = nde->line; - return ASE_NULL; - } - - /* if run->errnum == ASE_AWK_EIOIMPL, - * make getline return -1 */ + /* make getline return -1 */ n = -1; } @@ -6150,20 +6111,7 @@ 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; } diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 2f3c14e1..fcf471d9 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.191 2007-03-19 15:25:51 bacon Exp $ + * $Id: awk.c,v 1.192 2007-03-20 10:44:45 bacon Exp $ */ #include @@ -376,7 +376,17 @@ static ase_ssize_t awk_extio_file ( dprintf (ASE_T("opening %s of type %d (file)\n"), epa->name, epa->type); handle = ase_fopen (epa->name, mode); - if (handle == NULL) return -1; + if (handle == NULL) + { + ase_cstr_t errarg; + + errarg.ptr = epa->name; + errarg.len = ase_strlen(epa->name); + + + ase_awk_setrunerror (epa->run, ASE_AWK_EOPEN, 0, &errarg, 1); + return -1; + } epa->handle = (void*)handle; return 1; diff --git a/ase/test/awk/err-001.out b/ase/test/awk/err-001.out index 0bcc6e8d..19507db9 100644 --- a/ase/test/awk/err-001.out +++ b/ase/test/awk/err-001.out @@ -1 +1 @@ -PARSE ERROR: CODE [34] LINE [2] invalid character '' +PARSE ERROR: CODE [30] LINE [2] invalid character '' diff --git a/ase/test/awk/err-003.out b/ase/test/awk/err-003.out index 168a050b..44b68fe2 100644 --- a/ase/test/awk/err-003.out +++ b/ase/test/awk/err-003.out @@ -5,4 +5,4 @@ BEGIN { abc = 10; } -RUN ERROR: CODE [98] LINE [5] map 'abc' not assignable with a scalar +RUN ERROR: CODE [94] LINE [5] map 'abc' not assignable with a scalar diff --git a/ase/test/awk/err-004.out b/ase/test/awk/err-004.out index 9b766b92..310c82bf 100644 --- a/ase/test/awk/err-004.out +++ b/ase/test/awk/err-004.out @@ -2,4 +2,4 @@ BEGIN { delete ARGC; } -RUN ERROR: CODE [90] LINE [2] variable 'ARGC' not deletable +RUN ERROR: CODE [86] LINE [2] variable 'ARGC' not deletable diff --git a/ase/test/awk/err-005.out b/ase/test/awk/err-005.out index 72c4358c..52eec318 100644 --- a/ase/test/awk/err-005.out +++ b/ase/test/awk/err-005.out @@ -3,4 +3,4 @@ BEGIN { delete iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix; } -RUN ERROR: CODE [90] LINE [3] variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii...' not deletable +RUN ERROR: CODE [86] LINE [3] variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii...' not deletable diff --git a/ase/test/awk/err-006.out b/ase/test/awk/err-006.out index 3155deb8..1bbe4bd9 100644 --- a/ase/test/awk/err-006.out +++ b/ase/test/awk/err-006.out @@ -2,4 +2,4 @@ BEGIN { helpxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxhelphelp (); } -RUN ERROR: CODE [88] LINE [2] function 'helpxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxhel...' not found +RUN ERROR: CODE [84] LINE [2] function 'helpxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxhel...' not found diff --git a/ase/test/awk/err-007.out b/ase/test/awk/err-007.out index 6357beaa..832e41f8 100644 --- a/ase/test/awk/err-007.out +++ b/ase/test/awk/err-007.out @@ -1 +1 @@ -PARSE ERROR: CODE [59] LINE [2] built-in function 'substr' redefined +PARSE ERROR: CODE [55] LINE [2] built-in function 'substr' redefined diff --git a/ase/test/awk/err-008.out b/ase/test/awk/err-008.out index ce5660d2..0730f29c 100644 --- a/ase/test/awk/err-008.out +++ b/ase/test/awk/err-008.out @@ -1 +1 @@ -PARSE ERROR: CODE [59] LINE [3] built-in function 'substr' redefined +PARSE ERROR: CODE [55] LINE [3] built-in function 'substr' redefined diff --git a/ase/test/awk/err-009.out b/ase/test/awk/err-009.out index 539cefa1..78591512 100644 --- a/ase/test/awk/err-009.out +++ b/ase/test/awk/err-009.out @@ -1 +1 @@ -PARSE ERROR: CODE [60] LINE [9] function 'abc' redefined +PARSE ERROR: CODE [56] LINE [9] function 'abc' redefined diff --git a/ase/test/awk/err-010.out b/ase/test/awk/err-010.out index ba261aba..3d50b139 100644 --- a/ase/test/awk/err-010.out +++ b/ase/test/awk/err-010.out @@ -1 +1 @@ -PARSE ERROR: CODE [61] LINE [4] global variable 'abc' redefined +PARSE ERROR: CODE [57] LINE [4] global variable 'abc' redefined diff --git a/ase/test/awk/err-011.out b/ase/test/awk/err-011.out index 636449d8..1fe5f6be 100644 --- a/ase/test/awk/err-011.out +++ b/ase/test/awk/err-011.out @@ -1 +1 @@ -PARSE ERROR: CODE [62] LINE [4] parameter 'x' redefined +PARSE ERROR: CODE [58] LINE [4] parameter 'x' redefined diff --git a/ase/test/awk/err-012.out b/ase/test/awk/err-012.out index c549e6ea..8cb73ecf 100644 --- a/ase/test/awk/err-012.out +++ b/ase/test/awk/err-012.out @@ -1 +1 @@ -PARSE ERROR: CODE [60] LINE [11] function 'abc' redefined +PARSE ERROR: CODE [56] LINE [11] function 'abc' redefined diff --git a/ase/test/awk/err-013.out b/ase/test/awk/err-013.out index 94e08e01..bd715dfc 100644 --- a/ase/test/awk/err-013.out +++ b/ase/test/awk/err-013.out @@ -1 +1 @@ -PARSE ERROR: CODE [60] LINE [1] function 'abc' redefined +PARSE ERROR: CODE [56] LINE [1] function 'abc' redefined diff --git a/ase/test/awk/err-014.out b/ase/test/awk/err-014.out index ff02cf45..f87deed2 100644 --- a/ase/test/awk/err-014.out +++ b/ase/test/awk/err-014.out @@ -1 +1 @@ -PARSE ERROR: CODE [46] LINE [5] a colon expected in place of ';' +PARSE ERROR: CODE [42] LINE [5] a colon expected in place of ';' diff --git a/ase/test/awk/err-015.out b/ase/test/awk/err-015.out index 1c061382..ea5ebd12 100644 --- a/ase/test/awk/err-015.out +++ b/ase/test/awk/err-015.out @@ -1 +1 @@ -PARSE ERROR: CODE [41] LINE [2] a left parenthesis expected in place of '=' +PARSE ERROR: CODE [37] LINE [2] a left parenthesis expected in place of '=' diff --git a/ase/test/awk/err-016.out b/ase/test/awk/err-016.out index 514025e5..83889449 100644 --- a/ase/test/awk/err-016.out +++ b/ase/test/awk/err-016.out @@ -1 +1 @@ -PARSE ERROR: CODE [55] LINE [2] BEGIN not followed by a left bracket on the same line +PARSE ERROR: CODE [51] LINE [2] BEGIN not followed by a left bracket on the same line diff --git a/ase/test/awk/err-017.out b/ase/test/awk/err-017.out index 82efcf63..8c10f2ef 100644 --- a/ase/test/awk/err-017.out +++ b/ase/test/awk/err-017.out @@ -1 +1 @@ -PARSE ERROR: CODE [66] LINE [1] '+' not a valid parameter name +PARSE ERROR: CODE [62] LINE [1] '+' not a valid parameter name diff --git a/ase/test/awk/err-018.out b/ase/test/awk/err-018.out index fe048c82..22349b0c 100644 --- a/ase/test/awk/err-018.out +++ b/ase/test/awk/err-018.out @@ -1 +1 @@ -PARSE ERROR: CODE [67] LINE [1] '+' not a valid variable name +PARSE ERROR: CODE [63] LINE [1] '+' not a valid variable name diff --git a/ase/test/awk/err-019.out b/ase/test/awk/err-019.out index ef881643..2d89bac0 100644 --- a/ase/test/awk/err-019.out +++ b/ase/test/awk/err-019.out @@ -1 +1 @@ -PARSE ERROR: CODE [67] LINE [3] '+' not a valid variable name +PARSE ERROR: CODE [63] LINE [3] '+' not a valid variable name diff --git a/ase/test/awk/err-020.out b/ase/test/awk/err-020.out index 7330188b..813ae97a 100644 --- a/ase/test/awk/err-020.out +++ b/ase/test/awk/err-020.out @@ -2,4 +2,4 @@ BEGIN { print abc > "123\0abc"; } -RUN ERROR: CODE [113] LINE [2] i/o name containing a null character +RUN ERROR: CODE [109] LINE [2] i/o name containing a null character diff --git a/ase/test/awk/err-021.out b/ase/test/awk/err-021.out index 0be3032a..cf176329 100644 --- a/ase/test/awk/err-021.out +++ b/ase/test/awk/err-021.out @@ -3,4 +3,4 @@ BEGIN { split ("a b c",xx); } -RUN ERROR: CODE [99] LINE [3] cannot change a scalar value to a map +RUN ERROR: CODE [95] LINE [3] cannot change a scalar value to a map