From 2ba73c0ae682d9a2c7f482d290bd94012f9b90d3 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 26 Dec 2006 13:27:02 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/parse.c | 16 +++++++++++++--- ase/awk/run.c | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ase/awk/parse.c b/ase/awk/parse.c index df2eb30c..9d530ce6 100644 --- a/ase/awk/parse.c +++ b/ase/awk/parse.c @@ -1,5 +1,5 @@ /* - * $Id: parse.c,v 1.232 2006-12-26 10:04:58 bacon Exp $ + * $Id: parse.c,v 1.233 2006-12-26 13:26:24 bacon Exp $ */ #include @@ -1696,8 +1696,18 @@ static ase_awk_nde_t* __parse_statement_nb (ase_awk_t* awk, ase_size_t line) { if (nde != ASE_NULL) ase_awk_clrpt (awk, nde); - SET_ERROR_0 (awk, ASE_AWK_ESCOLON, - ASE_T("semicolon expected in place of '%.*s'")); + if (MATCH(awk,TOKEN_EOF)) + { + ase_awk_seterror ( + awk, ASE_AWK_EENDSRC, + awk->token.prev.line, ASE_NULL); + } + else + { + ase_awk_seterror ( + awk, ASE_AWK_ESCOLON, awk->token.prev.line, + ASE_T("statement not terminated with a semicolon")); + } return ASE_NULL; } diff --git a/ase/awk/run.c b/ase/awk/run.c index f3836a60..3657a74f 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.310 2006-12-26 10:05:12 bacon Exp $ + * $Id: run.c,v 1.311 2006-12-26 13:27:02 bacon Exp $ */ #include @@ -2953,7 +2953,7 @@ static ase_awk_val_t* __eval_group (ase_awk_run_t* run, ase_awk_nde_t* nde) /* __eval_binop_in evaluates the ASE_AWK_NDE_GRP specially. * so this function should never be reached. */ ASE_AWK_ASSERT (run->awk, !"should never happen - NDE_GRP only for in"); - PANIC (run, ASE_AWK_EINTERNAL); + ase_awk_setrunerror (run, ASE_AWK_EINTERNAL, nde->line, ASE_NULL); return ASE_NULL; }