hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

have refactored error information handling in error.c.

Browse Source 
removed hawk_seterror() and hawk_seterrstr()
This commit is contained in:
hyung-hwan 2020-01-04 04:47:41 +00:00
parent 9cae5a6130
commit f3f4ee4ebe
12 changed files with 806 additions and 836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
hawk/lib/err.c
View File

@ -44,8 +44,8 @@ const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum)
HAWK_T("system busy"), HAWK_T("system busy"),
HAWK_T("operation not allowed"), HAWK_T("operation not allowed"),
HAWK_T("not supported"), HAWK_T("not supported"),
HAWK_T("'${0}' not found"), HAWK_T("not found"),
HAWK_T("'${0}' already exists"), HAWK_T("already exists"),
HAWK_T("I/O error"), HAWK_T("I/O error"),
HAWK_T("buffer full"), HAWK_T("buffer full"),
HAWK_T("encoding conversion error"), HAWK_T("encoding conversion error"),
@ -75,23 +75,23 @@ const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum)
HAWK_T("comment not closed properly"), HAWK_T("comment not closed properly"),
HAWK_T("string or regular expression not closed"), HAWK_T("string or regular expression not closed"),
HAWK_T("invalid mbs character"), HAWK_T("invalid mbs character"),
HAWK_T("left brace expected in place of '${0}'"), HAWK_T("left brace expected"),
HAWK_T("left parenthesis expected in place of '${0}'"), HAWK_T("left parenthesis expected"),
HAWK_T("right parenthesis expected in place of '${0}'"), HAWK_T("right parenthesis expected"),
HAWK_T("right bracket expected in place of '${0}'"), HAWK_T("right bracket expected"),
HAWK_T("comma expected in place of '${0}'"), HAWK_T("comma expected"),
HAWK_T("semicolon expected in place of '${0}'"), HAWK_T("semicolon expected"),
HAWK_T("colon expected in place of '${0}'"), HAWK_T("colon expected"),
HAWK_T("integer literal expected"), HAWK_T("integer literal expected"),
HAWK_T("statement not ending with a semicolon"), HAWK_T("statement not ending with a semicolon"),
HAWK_T("keyword 'in' expected in place of '${0}'"), HAWK_T("keyword 'in' expected"),
HAWK_T("right-hand side of 'in' not a variable"), HAWK_T("right-hand side of 'in' not a variable"),
HAWK_T("expression not recognized"), HAWK_T("expression not recognized"),
HAWK_T("keyword 'function' expected"), HAWK_T("keyword 'function' expected"),
HAWK_T("keyword 'while' expected in place of '${0}'"), HAWK_T("keyword 'while' expected"),
HAWK_T("invalid assignment statement"), HAWK_T("invalid assignment statement"),
HAWK_T("identifier expected in place of '${0}'"), HAWK_T("identifier expected"),
HAWK_T("not a valid function name"), HAWK_T("not a valid function name"),
HAWK_T("BEGIN not followed by left bracket on the same line"), HAWK_T("BEGIN not followed by left bracket on the same line"),
HAWK_T("END not followed by left bracket on the same line"), HAWK_T("END not followed by left bracket on the same line"),
@ -113,7 +113,7 @@ const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum)
HAWK_T("too many local variables"), HAWK_T("too many local variables"),
HAWK_T("too many parameters"), HAWK_T("too many parameters"),
HAWK_T("too many segments"), HAWK_T("too many segments"),
HAWK_T("segment '${0}' too long"), HAWK_T("segment too long"),
HAWK_T("bad argument"), HAWK_T("bad argument"),
HAWK_T("no argument provided"), HAWK_T("no argument provided"),
HAWK_T("'break' outside a loop"), HAWK_T("'break' outside a loop"),
@ -126,7 +126,7 @@ const hawk_ooch_t* hawk_dflerrstr (hawk_t* awk, hawk_errnum_t errnum)
HAWK_T("illegal operand for increment/decrement operator"), HAWK_T("illegal operand for increment/decrement operator"),
HAWK_T("'@include' not followed by a string"), HAWK_T("'@include' not followed by a string"),
HAWK_T("include level too deep"), HAWK_T("include level too deep"),
HAWK_T("'${0}' not recognized"), HAWK_T("word after @ not recognized"),
HAWK_T("@ not followed by a valid word"), HAWK_T("@ not followed by a valid word"),
HAWK_T("stack error"), HAWK_T("stack error"),
@ -189,11 +189,6 @@ hawk_errstr_t hawk_geterrstr (hawk_t* hawk)
return hawk->errstr; return hawk->errstr;
} }
void hawk_seterrstr (hawk_t* hawk, hawk_errstr_t errstr)
{
hawk->errstr = errstr;
}
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
const hawk_loc_t* hawk_geterrloc (hawk_t* hawk) const hawk_loc_t* hawk_geterrloc (hawk_t* hawk)
@ -353,23 +348,6 @@ void hawk_seterrufmt (hawk_t* hawk, const hawk_loc_t* errloc, hawk_errnum_t errn
hawk->_gem.errloc = (errloc? *errloc: _nullloc); hawk->_gem.errloc = (errloc? *errloc: _nullloc);
} }
void hawk_seterror (hawk_t* hawk, hawk_errnum_t errnum, const hawk_oocs_t* errarg, const hawk_loc_t* errloc)
{
/* TODO: remove awk_rtx_seterror() and substitute hawk_rtx_seterrfmt()/seterrbfmt()/seterrufmt() */
const hawk_ooch_t* errfmt;
hawk->_gem.errnum = errnum;
errfmt = hawk_geterrstr(hawk)(hawk, errnum);
HAWK_ASSERT (errfmt != HAWK_NULL);
/* TODO: this change is buggy... copying won't process arguments...
hawk_strxfncpy (hawk->_gem.errmsg, HAWK_COUNTOF(hawk->_gem.errmsg), errfmt, errarg);
*/
hawk_copy_oocstr(hawk->_gem.errmsg, HAWK_COUNTOF(hawk->_gem.errmsg), errfmt);
/* TODO: remove awk_rtx_seterror() and substitute hawk_rtx_seterrfmt()/seterrbfmt()/seterrufmt() */
hawk->_gem.errloc = (errloc? *errloc: _nullloc);
}
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
const hawk_loc_t* hawk_rtx_geterrloc (hawk_rtx_t* rtx) const hawk_loc_t* hawk_rtx_geterrloc (hawk_rtx_t* rtx)

24
hawk/lib/hawk-cmn.h
View File

@ -805,23 +805,23 @@ enum hawk_errnum_t
HAWK_ECMTNC, /**< comment not closed properly */ HAWK_ECMTNC, /**< comment not closed properly */
HAWK_ESTRNC, /**< string or regular expression not closed */ HAWK_ESTRNC, /**< string or regular expression not closed */
HAWK_EMBSCHR, /**< invalid mbs character */ HAWK_EMBSCHR, /**< invalid mbs character */
HAWK_ELBRACE, /**< left brace expected in place of '${0}' */ HAWK_ELBRACE, /**< left brace expected */
HAWK_ELPAREN, /**< left parenthesis expected in place of '${0}' */ HAWK_ELPAREN, /**< left parenthesis expected */
HAWK_ERPAREN, /**< right parenthesis expected in place of '${0}' */ HAWK_ERPAREN, /**< right parenthesis expected */
HAWK_ERBRACK, /**< right bracket expected in place of '${0}' */ HAWK_ERBRACK, /**< right bracket expected */
HAWK_ECOMMA, /**< comma expected in place of '${0}' */ HAWK_ECOMMA, /**< comma expected */
HAWK_ESCOLON, /**< semicolon expected in place of '${0}' */ HAWK_ESCOLON, /**< semicolon expected */
HAWK_ECOLON, /**< colon expected in place of '${0}' */ HAWK_ECOLON, /**< colon expected */
HAWK_EINTLIT, /**< integer literal expected */ HAWK_EINTLIT, /**< integer literal expected */
HAWK_ESTMEND, /**< statement not ending with a semicolon */ HAWK_ESTMEND, /**< statement not ending with a semicolon */
HAWK_EKWIN, /**< keyword 'in' expected */ HAWK_EKWIN, /**< keyword 'in' expected */
HAWK_ENOTVAR, /**< right-hand side of 'in' not a variable */ HAWK_ENOTVAR, /**< right-hand side of 'in' not a variable */
HAWK_EEXPRNR, /**< expression not recognized */ HAWK_EEXPRNR, /**< expression not recognized */
HAWK_EKWFNC, /**< keyword 'function' expected in place of '${0}' */ HAWK_EKWFNC, /**< keyword 'function' expected */
HAWK_EKWWHL, /**< keyword 'while' expected in place of '${0}' */ HAWK_EKWWHL, /**< keyword 'while' expected */
HAWK_EASSIGN, /**< assignment statement expected */ HAWK_EASSIGN, /**< assignment statement expected */
HAWK_EIDENT, /**< identifier expected in place of '${0}' */ HAWK_EIDENT, /**< identifier expected */
HAWK_EFUNNAM, /**< not a valid function name */ HAWK_EFUNNAM, /**< not a valid function name */
HAWK_EBLKBEG, /**< BEGIN not followed by left bracket on the same line */ HAWK_EBLKBEG, /**< BEGIN not followed by left bracket on the same line */
HAWK_EBLKEND, /**< END not followed by left bracket on the same line */ HAWK_EBLKEND, /**< END not followed by left bracket on the same line */
@ -843,7 +843,7 @@ enum hawk_errnum_t
HAWK_ELCLTM, /**< too many local variables */ HAWK_ELCLTM, /**< too many local variables */
HAWK_EPARTM, /**< too many parameters */ HAWK_EPARTM, /**< too many parameters */
HAWK_ESEGTM, /**< too many segments */ HAWK_ESEGTM, /**< too many segments */
HAWK_ESEGTL, /**< segment '${0}' too long */ HAWK_ESEGTL, /**< segment too long */
HAWK_EBADARG, /**< bad argument */ HAWK_EBADARG, /**< bad argument */
HAWK_ENOARG, /**< no argument */ HAWK_ENOARG, /**< no argument */
HAWK_EBREAK, /**< 'break' outside a loop */ HAWK_EBREAK, /**< 'break' outside a loop */
@ -856,7 +856,7 @@ enum hawk_errnum_t
HAWK_EINCDECOPR,/**< illegal operand for incr/decr operator */ HAWK_EINCDECOPR,/**< illegal operand for incr/decr operator */
HAWK_EINCLSTR, /**< 'include' not followed by a string */ HAWK_EINCLSTR, /**< 'include' not followed by a string */
HAWK_EINCLTD, /**< include level too deep */ HAWK_EINCLTD, /**< include level too deep */
HAWK_EXKWNR, /**< @word '${0}' not recognized */ HAWK_EXKWNR, /**< word after @ not recognized */
HAWK_EXKWEM, /**< @ not followed by a valid word */ HAWK_EXKWEM, /**< @ not followed by a valid word */
/* run time error */ /* run time error */

39
hawk/lib/hawk.h
View File

@ -1501,35 +1501,6 @@ HAWK_EXPORT hawk_errstr_t hawk_geterrstr (
hawk_t* awk /**< awk */ hawk_t* awk /**< awk */
); );
/**
* The hawk_seterrstr() sets an error string getter that is called to
* compose an error message when its retrieval is requested.
*
* Here is an example of changing the formatting string for the #HAWK_SED_ECMDNR
* error.
* \code
* hawk_errstr_t orgerrstr;
*
* const hawk_ooch_t* myerrstr (hawk_t* awk, hawk_errnum_t num)
* {
* if (num == HAWK_SED_ECMDNR) return HAWK_T("unrecognized command ${0}");
* return orgerrstr (awk, num);
* }
* int main ()
* {
* hawk_t* awk;
* ...
* orgerrstr = hawk_geterrstr (awk);
* hawk_seterrstr (awk, myerrstr);
* ...
* }
* \endcode
*/
HAWK_EXPORT void hawk_seterrstr (
hawk_t* awk, /**< awk */
hawk_errstr_t errstr /**< error string getter */
);
/** /**
* The hawk_geterrnum() function returns the number of the last error * The hawk_geterrnum() function returns the number of the last error
* occurred. * occurred.
@ -1647,16 +1618,6 @@ HAWK_EXPORT void hawk_geterror (
hawk_loc_t* errloc /**< error location */ hawk_loc_t* errloc /**< error location */
); );
/**
* The hawk_seterror() function sets error information.
*/
HAWK_EXPORT void hawk_seterror (
hawk_t* awk, /**< awk */
hawk_errnum_t errnum, /**< error number */
const hawk_oocs_t* errarg, /**< argument array for formatting an error message */
const hawk_loc_t* errloc /**< error location */
);
/** /**
* The hawk_getopt() function gets the value of an option * The hawk_getopt() function gets the value of an option
* specified by \a id into the buffer pointed to by \a value. * specified by \a id into the buffer pointed to by \a value.

5
hawk/lib/mod-math.c
View File

@ -639,7 +639,6 @@ static fnctab_t fnctab[] =
static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym) static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym)
{ {
hawk_oocs_t ea;
int left, right, mid, n; int left, right, mid, n;
left = 0; right = HAWK_COUNTOF(fnctab) - 1; left = 0; right = HAWK_COUNTOF(fnctab) - 1;
@ -677,9 +676,7 @@ static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mo
} }
#endif #endif
ea.ptr = (hawk_ooch_t*)name; hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("'%js' not found"), name);
ea.len = hawk_count_oocstr(name);
hawk_seterror (awk, HAWK_ENOENT, &ea, HAWK_NULL);
return -1; return -1;
} }

5
hawk/lib/mod-str.c
View File

@ -593,7 +593,6 @@ static inttab_t inttab[] =
static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym) static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym)
{ {
hawk_oocs_t ea;
int left, right, mid, n; int left, right, mid, n;
left = 0; right = HAWK_COUNTOF(fnctab) - 1; left = 0; right = HAWK_COUNTOF(fnctab) - 1;
@ -629,9 +628,7 @@ static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mo
} }
} }
ea.ptr = (hawk_ooch_t*)name; hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("'%js' not found"), name);
ea.len = hawk_count_oocstr(name);
hawk_seterror (awk, HAWK_ENOENT, &ea, HAWK_NULL);
return -1; return -1;
} }

5
hawk/lib/mod-sys.c
View File

@ -2727,7 +2727,6 @@ static inttab_t inttab[] =
static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym) static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mod_sym_t* sym)
{ {
hawk_oocs_t ea;
int left, right, mid, n; int left, right, mid, n;
left = 0; right = HAWK_COUNTOF(fnctab) - 1; left = 0; right = HAWK_COUNTOF(fnctab) - 1;
@ -2763,9 +2762,7 @@ static int query (hawk_mod_t* mod, hawk_t* awk, const hawk_ooch_t* name, hawk_mo
} }
} }
ea.ptr = (hawk_ooch_t*)name; hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("'%js' not found"), name);
ea.len = hawk_count_oocstr(name);
hawk_seterror (awk, HAWK_ENOENT, &ea, HAWK_NULL);
return -1; return -1;
} }

154
hawk/lib/parse.c
View File

@ -42,6 +42,30 @@
# define HAWK_DEFAULT_MODPOSTFIX "" # define HAWK_DEFAULT_MODPOSTFIX ""
#endif #endif
#define FMT_EBADVAR HAWK_T("'%.*js' not a valid variable name")
#define FMT_ECOMMA HAWK_T("comma expected in place of '%.*js'")
#define FMT_ECOLON HAWK_T("colon expected in place of '%.*js'")
#define FMT_EDUPLCL HAWK_T("duplicate local variable name - %.*js")
#define FMT_EFUNNF HAWK_T("function '%.*js' not defined")
#define FMT_EIDENT HAWK_T("identifier expected in place of '%.*js'")
#define FMT_EINTLIT HAWK_T("integer literal expected in place of '%.*js'")
#define FMT_EIONMNL HAWK_T("invalid I/O name of length %zu containing '\\0'")
#define FMT_EKWFNC HAWK_T("keyword 'function' expected in place of '%.*js'")
#define FMT_EKWIN HAWK_T("keyword 'in' expected in place of '%.*js'")
#define FMT_EKWWHL HAWK_T("keyword 'while' expected in place of '%.*js'")
#define FMT_ELBRACE HAWK_T("left brace expected in place of '%.*js'")
#define FMT_ELPAREN HAWK_T("left parenthesis expected in place of '%.*js'")
#define FMT_ENOENT_GBL_HS HAWK_T("no such global variable - %.*hs")
#define FMT_ENOENT_GBL_LS HAWK_T("no such global variable - %.*ls")
#define FMT_ERBRACK HAWK_T("right bracket expected in place of '%.*js'")
#define FMT_ERPAREN HAWK_T("right parenthesis expected in place of '%.*js'")
#define FMT_ESCOLON HAWK_T("semicolon expected in place of '%.*js'")
#define FMT_ESEGTL HAWK_T("segment '%.*js' too long")
#define FMT_EUNDEF HAWK_T("undefined identifier '%.*js'")
#define FMT_EXKWNR HAWK_T("'%.*js' not recognized")
enum tok_t enum tok_t
{ {
TOK_EOF, TOK_EOF,
@ -410,9 +434,6 @@ static global_t gtab[] =
#define MATCH_TERMINATOR(awk) \ #define MATCH_TERMINATOR(awk) \
(MATCH_TERMINATOR_NORMAL(awk) || MATCH_TERMINATOR_RBRACE(awk)) (MATCH_TERMINATOR_NORMAL(awk) || MATCH_TERMINATOR_RBRACE(awk))
#define SETERR_TOK(awk,code) \
hawk_seterror (awk, code, HAWK_OOECS_OOCS((awk)->tok.name), &(awk)->tok.loc)
#define ADJERR_LOC(hawk,l) do { (hawk)->_gem.errloc = *(l); } while (0) #define ADJERR_LOC(hawk,l) do { (hawk)->_gem.errloc = *(l); } while (0)
static HAWK_INLINE int is_plain_var (hawk_nde_t* nde) static HAWK_INLINE int is_plain_var (hawk_nde_t* nde)
@ -556,7 +577,7 @@ static int parse (hawk_t* awk)
/* see parse_fncall() for what is /* see parse_fncall() for what is
* stored into awk->tree.funs */ * stored into awk->tree.funs */
nde = (hawk_nde_t*)HAWK_HTB_VPTR(p); nde = (hawk_nde_t*)HAWK_HTB_VPTR(p);
hawk_seterrfmt (awk, &nde->loc, HAWK_EFUNNF, HAWK_T("function '%.*js' not defined"), HAWK_HTB_KLEN(p), HAWK_HTB_KPTR(p)); hawk_seterrfmt (awk, &nde->loc, HAWK_EFUNNF, FMT_EFUNNF, HAWK_HTB_KLEN(p), HAWK_HTB_KPTR(p));
goto oops; goto oops;
} }
@ -793,7 +814,7 @@ static int begin_include (hawk_t* awk, int once)
{ {
/* a '\0' character included in the include file name. /* a '\0' character included in the include file name.
* we don't support such a file name */ * we don't support such a file name */
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EIONMNL, HAWK_T("invalid I/O name of length %zu containing '\\0'"), HAWK_OOECS_LEN(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EIONMNL, FMT_EIONMNL, HAWK_OOECS_LEN(awk->tok.name));
return -1; return -1;
} }
@ -984,7 +1005,7 @@ static int parse_progunit (hawk_t* awk)
if (get_token(awk) <= -1) return -1; if (get_token(awk) <= -1) return -1;
if (!MATCH(awk, TOK_INT)) if (!MATCH(awk, TOK_INT))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EINTLIT, HAWK_T("integer literal expected in place of '%.*js'"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EINTLIT, FMT_EINTLIT, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1013,7 +1034,7 @@ static int parse_progunit (hawk_t* awk)
{ {
if (!(awk->opt.trait & HAWK_PABLOCK)) /* pattern action block not allowed */ if (!(awk->opt.trait & HAWK_PABLOCK)) /* pattern action block not allowed */
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, HAWK_T("keyword 'function' expected in place of '%.*js'"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, FMT_EKWFNC, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1030,7 +1051,7 @@ static int parse_progunit (hawk_t* awk)
if (!MATCH(awk, TOK_LBRACE)) if (!MATCH(awk, TOK_LBRACE))
{ {
SETERR_TOK (awk, HAWK_ELBRACE); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELBRACE, FMT_ELBRACE, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1044,7 +1065,7 @@ static int parse_progunit (hawk_t* awk)
{ {
if (!(awk->opt.trait & HAWK_PABLOCK)) if (!(awk->opt.trait & HAWK_PABLOCK))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, HAWK_T("keyword 'function' expected in place of '%.*js'"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, FMT_EKWFNC, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1061,7 +1082,7 @@ static int parse_progunit (hawk_t* awk)
if (!MATCH(awk, TOK_LBRACE)) if (!MATCH(awk, TOK_LBRACE))
{ {
SETERR_TOK (awk, HAWK_ELBRACE); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELBRACE, FMT_ELBRACE, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1076,7 +1097,7 @@ static int parse_progunit (hawk_t* awk)
/* patternless block */ /* patternless block */
if (!(awk->opt.trait & HAWK_PABLOCK)) if (!(awk->opt.trait & HAWK_PABLOCK))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, HAWK_T("keyword 'function' expected in place of '%.*js'"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, FMT_EKWFNC, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1102,7 +1123,7 @@ static int parse_progunit (hawk_t* awk)
if (!(awk->opt.trait & HAWK_PABLOCK)) if (!(awk->opt.trait & HAWK_PABLOCK))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, HAWK_T("keyword 'function' expected in place of '%.*js'"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWFNC, FMT_EKWFNC, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1176,7 +1197,7 @@ static int parse_progunit (hawk_t* awk)
if (!MATCH(awk,TOK_LBRACE)) if (!MATCH(awk,TOK_LBRACE))
{ {
hawk_clrpt (awk, ptn); hawk_clrpt (awk, ptn);
SETERR_TOK (awk, HAWK_ELBRACE); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELBRACE, FMT_ELBRACE, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
@ -1253,7 +1274,7 @@ static hawk_nde_t* parse_function (hawk_t* awk)
if (!MATCH(awk,TOK_LPAREN)) if (!MATCH(awk,TOK_LPAREN))
{ {
/* a function name is not followed by a left parenthesis */ /* a function name is not followed by a left parenthesis */
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -1338,7 +1359,7 @@ static hawk_nde_t* parse_function (hawk_t* awk)
if (!MATCH(awk,TOK_COMMA)) if (!MATCH(awk,TOK_COMMA))
{ {
SETERR_TOK (awk, HAWK_ECOMMA); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ECOMMA, FMT_ECOMMA, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -1364,7 +1385,7 @@ static hawk_nde_t* parse_function (hawk_t* awk)
/* check if the function body starts with a left brace */ /* check if the function body starts with a left brace */
if (!MATCH(awk,TOK_LBRACE)) if (!MATCH(awk,TOK_LBRACE))
{ {
SETERR_TOK (awk, HAWK_ELBRACE); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELBRACE, FMT_ELBRACE, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
if (get_token(awk) <= -1) goto oops; if (get_token(awk) <= -1) goto oops;
@ -1992,7 +2013,7 @@ int hawk_delgblwithbcstr (hawk_t* hawk, const hawk_bch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*hs"), ncs.len, ncs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_HS, ncs.len, ncs.ptr);
return -1; return -1;
} }
#else #else
@ -2001,7 +2022,7 @@ int hawk_delgblwithbcstr (hawk_t* hawk, const hawk_bch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, wcs.ptr, wcs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, wcs.ptr, wcs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*ls"), wcs.len, wcs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_LS, wcs.len, wcs.ptr);
hawk_freemem (hawk, wcs.ptr); hawk_freemem (hawk, wcs.ptr);
return -1; return -1;
} }
@ -2045,7 +2066,7 @@ int hawk_delgblwithucstr (hawk_t* hawk, const hawk_uch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, mbs.ptr, mbs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, mbs.ptr, mbs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*hs"), mbs.len, mbs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_HS, mbs.len, mbs.ptr);
hawk_freemem (hawk, mbs.ptr); hawk_freemem (hawk, mbs.ptr);
return -1; return -1;
} }
@ -2054,7 +2075,7 @@ int hawk_delgblwithucstr (hawk_t* hawk, const hawk_uch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*ls"), ncs.len, ncs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_LS, ncs.len, ncs.ptr);
return -1; return -1;
} }
#endif #endif
@ -2087,7 +2108,7 @@ int hawk_findgblwithbcstr (hawk_t* hawk, const hawk_bch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*hs"), ncs.len, ncs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_HS, ncs.len, ncs.ptr);
return -1; return -1;
} }
#else #else
@ -2096,7 +2117,7 @@ int hawk_findgblwithbcstr (hawk_t* hawk, const hawk_bch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, wcs.ptr, wcs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, wcs.ptr, wcs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*ls"), wcs.len, wcs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_LS, wcs.len, wcs.ptr);
hawk_freemem (hawk, wcs.ptr); hawk_freemem (hawk, wcs.ptr);
return -1; return -1;
} }
@ -2121,7 +2142,7 @@ int hawk_findgblwithucstr (hawk_t* hawk, const hawk_uch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, mbs.ptr, mbs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, mbs.ptr, mbs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*hs"), mbs.len, mbs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_HS, mbs.len, mbs.ptr);
hawk_freemem (hawk, mbs.ptr); hawk_freemem (hawk, mbs.ptr);
return -1; return -1;
} }
@ -2130,7 +2151,7 @@ int hawk_findgblwithucstr (hawk_t* hawk, const hawk_uch_t* name)
n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len); n = hawk_arr_search(hawk->parse.gbls, HAWK_NUM_STATIC_GBLS, ncs.ptr, ncs.len);
if (n == HAWK_ARR_NIL) if (n == HAWK_ARR_NIL)
{ {
hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, HAWK_T("no such global variable - %.*ls"), ncs.len, ncs.ptr); hawk_seterrfmt (hawk, HAWK_NULL, HAWK_ENOENT, FMT_ENOENT_GBL_LS, ncs.len, ncs.ptr);
return -1; return -1;
} }
#endif #endif
@ -2153,7 +2174,7 @@ static hawk_t* collect_globals (hawk_t* awk)
{ {
if (!MATCH(awk,TOK_IDENT)) if (!MATCH(awk,TOK_IDENT))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EBADVAR, HAWK_T("'%.*js' not a valid variable name"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EBADVAR, FMT_EBADVAR, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
@ -2177,7 +2198,7 @@ static hawk_t* collect_globals (hawk_t* awk)
if (!MATCH(awk,TOK_COMMA)) if (!MATCH(awk,TOK_COMMA))
{ {
SETERR_TOK (awk, HAWK_ECOMMA); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ECOMMA, FMT_ECOMMA, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
@ -2208,7 +2229,7 @@ static hawk_t* collect_locals (hawk_t* awk, hawk_oow_t nlcls, int istop)
if (!MATCH(awk,TOK_IDENT)) if (!MATCH(awk,TOK_IDENT))
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EBADVAR, HAWK_T("'%.*js' not a valid variable name"), HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name)); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EBADVAR, FMT_EBADVAR, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
@ -2252,7 +2273,7 @@ static hawk_t* collect_locals (hawk_t* awk, hawk_oow_t nlcls, int istop)
n = hawk_arr_search(awk->parse.lcls, nlcls, lcl.ptr, lcl.len); n = hawk_arr_search(awk->parse.lcls, nlcls, lcl.ptr, lcl.len);
if (n != HAWK_ARR_NIL) if (n != HAWK_ARR_NIL)
{ {
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EDUPLCL, HAWK_T("duplicate local variable name - %.*js"), lcl.len, lcl.ptr); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EDUPLCL, FMT_EDUPLCL, lcl.len, lcl.ptr);
return HAWK_NULL; return HAWK_NULL;
} }
@ -2263,7 +2284,7 @@ static hawk_t* collect_locals (hawk_t* awk, hawk_oow_t nlcls, int istop)
if (n < awk->tree.ngbls_base) if (n < awk->tree.ngbls_base)
{ {
/* it is a conflict only if it is one of a static global variable */ /* it is a conflict only if it is one of a static global variable */
hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EDUPLCL, HAWK_T("duplicate local variable name - %.*js"), lcl.len, lcl.ptr); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EDUPLCL, FMT_EDUPLCL, lcl.len, lcl.ptr);
return HAWK_NULL; return HAWK_NULL;
} }
} }
@ -2297,7 +2318,7 @@ static hawk_t* collect_locals (hawk_t* awk, hawk_oow_t nlcls, int istop)
if (!MATCH(awk,TOK_COMMA)) if (!MATCH(awk,TOK_COMMA))
{ {
SETERR_TOK (awk, HAWK_ECOMMA); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ECOMMA, FMT_ECOMMA, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
@ -2321,7 +2342,7 @@ static hawk_nde_t* parse_if (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_LPAREN)) if (!MATCH(awk,TOK_LPAREN))
{ {
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
if (get_token(awk) <= -1) return HAWK_NULL; if (get_token(awk) <= -1) return HAWK_NULL;
@ -2332,7 +2353,7 @@ static hawk_nde_t* parse_if (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2395,7 +2416,7 @@ static hawk_nde_t* parse_while (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_LPAREN)) if (!MATCH(awk,TOK_LPAREN))
{ {
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
if (get_token(awk) <= -1) goto oops; if (get_token(awk) <= -1) goto oops;
@ -2406,7 +2427,7 @@ static hawk_nde_t* parse_while (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2446,7 +2467,7 @@ static hawk_nde_t* parse_for (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_LPAREN)) if (!MATCH(awk,TOK_LPAREN))
{ {
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
if (get_token(awk) <= -1) return HAWK_NULL; if (get_token(awk) <= -1) return HAWK_NULL;
@ -2470,7 +2491,7 @@ static hawk_nde_t* parse_for (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2498,7 +2519,7 @@ static hawk_nde_t* parse_for (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_SEMICOLON)) if (!MATCH(awk,TOK_SEMICOLON))
{ {
SETERR_TOK (awk, HAWK_ESCOLON); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ESCOLON, FMT_ESCOLON, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
} }
@ -2518,7 +2539,7 @@ static hawk_nde_t* parse_for (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_SEMICOLON)) if (!MATCH(awk,TOK_SEMICOLON))
{ {
SETERR_TOK (awk, HAWK_ESCOLON); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ESCOLON, FMT_ESCOLON, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
} }
@ -2542,7 +2563,7 @@ static hawk_nde_t* parse_for (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
} }
@ -2597,7 +2618,7 @@ static hawk_nde_t* parse_dowhile (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_WHILE)) if (!MATCH(awk,TOK_WHILE))
{ {
SETERR_TOK (awk, HAWK_EKWWHL); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWWHL, FMT_EKWWHL, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2605,7 +2626,7 @@ static hawk_nde_t* parse_dowhile (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_LPAREN)) if (!MATCH(awk,TOK_LPAREN))
{ {
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2617,7 +2638,7 @@ static hawk_nde_t* parse_dowhile (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2852,7 +2873,7 @@ static hawk_nde_t* parse_delete (hawk_t* awk, const hawk_loc_t* xloc)
if (!MATCH(awk,TOK_IDENT)) if (!MATCH(awk,TOK_IDENT))
{ {
SETERR_TOK (awk, HAWK_EIDENT); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EIDENT, FMT_EIDENT, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -2871,7 +2892,7 @@ static hawk_nde_t* parse_delete (hawk_t* awk, const hawk_loc_t* xloc)
{ {
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -3362,7 +3383,7 @@ static hawk_nde_t* parse_expr_basic (hawk_t* awk, const hawk_loc_t* xloc)
} }
eloc = awk->tok.loc; eloc = awk->tok.loc;
n1 = parse_expr_withdc (awk, &eloc); n1 = parse_expr_withdc(awk, &eloc);
if (n1 == HAWK_NULL) if (n1 == HAWK_NULL)
{ {
hawk_clrpt (awk, nde); hawk_clrpt (awk, nde);
@ -3373,7 +3394,7 @@ static hawk_nde_t* parse_expr_basic (hawk_t* awk, const hawk_loc_t* xloc)
{ {
hawk_clrpt (awk, nde); hawk_clrpt (awk, nde);
hawk_clrpt (awk, n1); hawk_clrpt (awk, n1);
SETERR_TOK (awk, HAWK_ECOLON); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ECOLON, FMT_ECOLON, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
if (get_token(awk) <= -1) if (get_token(awk) <= -1)
@ -3384,7 +3405,7 @@ static hawk_nde_t* parse_expr_basic (hawk_t* awk, const hawk_loc_t* xloc)
} }
eloc = awk->tok.loc; eloc = awk->tok.loc;
n2 = parse_expr_withdc (awk, &eloc); n2 = parse_expr_withdc(awk, &eloc);
if (n2 == HAWK_NULL) if (n2 == HAWK_NULL)
{ {
hawk_clrpt (awk, nde); hawk_clrpt (awk, nde);
@ -4764,7 +4785,7 @@ static hawk_nde_t* parse_primary_lparen (hawk_t* awk, const hawk_loc_t* xloc)
/* check for the closing parenthesis */ /* check for the closing parenthesis */
if (!MATCH(awk,TOK_RPAREN)) if (!MATCH(awk,TOK_RPAREN))
{ {
SETERR_TOK (awk, HAWK_ERPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERPAREN, FMT_ERPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -4786,7 +4807,7 @@ static hawk_nde_t* parse_primary_lparen (hawk_t* awk, const hawk_loc_t* xloc)
{ {
if (!(awk->opt.trait & HAWK_TOLERANT) && !MATCH(awk,TOK_IN)) if (!(awk->opt.trait & HAWK_TOLERANT) && !MATCH(awk,TOK_IN))
{ {
SETERR_TOK (awk, HAWK_EKWIN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EKWIN, FMT_EKWIN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
} }
@ -5151,7 +5172,7 @@ static int dup_ident_and_get_next (hawk_t* awk, const hawk_loc_t* xloc, hawk_ooc
* TOK_XGLOBAL to TOK_XRESET are excuded from the check for that reason. */ * TOK_XGLOBAL to TOK_XRESET are excuded from the check for that reason. */
if (!MATCH(awk, TOK_IDENT) && !(MATCH_RANGE(awk, TOK_BEGIN, TOK_GETLINE))) if (!MATCH(awk, TOK_IDENT) && !(MATCH_RANGE(awk, TOK_BEGIN, TOK_GETLINE)))
{ {
SETERR_TOK (awk, HAWK_EIDENT); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EIDENT, FMT_EIDENT, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -5231,7 +5252,7 @@ static hawk_nde_t* parse_primary_ident_noseg (hawk_t* awk, const hawk_loc_t* xlo
else else
{ {
/* an intrinsic function should be in the form of the function call */ /* an intrinsic function should be in the form of the function call */
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
} }
} }
/* now we know that name is a normal identifier. */ /* now we know that name is a normal identifier. */
@ -5367,7 +5388,7 @@ static hawk_nde_t* parse_primary_ident_noseg (hawk_t* awk, const hawk_loc_t* xlo
else else
{ {
/* undefined variable */ /* undefined variable */
hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, HAWK_T("undefined identifier '%.*js'"), name->len, name->ptr); hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, FMT_EUNDEF, name->len, name->ptr);
} }
} }
} }
@ -5396,7 +5417,7 @@ static hawk_nde_t* parse_primary_ident_segs (hawk_t* awk, const hawk_loc_t* xloc
case HAWK_MOD_FNC: case HAWK_MOD_FNC:
if ((awk->opt.trait & sym.u.fnc.trait) != sym.u.fnc.trait) if ((awk->opt.trait & sym.u.fnc.trait) != sym.u.fnc.trait)
{ {
hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, HAWK_T("undefined identifier '%.*js'"), full->len, full->ptr); hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, FMT_EUNDEF, full->len, full->ptr);
break; break;
} }
@ -5411,7 +5432,7 @@ static hawk_nde_t* parse_primary_ident_segs (hawk_t* awk, const hawk_loc_t* xloc
} }
else else
{ {
SETERR_TOK (awk, HAWK_ELPAREN); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ELPAREN, FMT_ELPAREN, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
} }
break; break;
@ -5427,7 +5448,7 @@ static hawk_nde_t* parse_primary_ident_segs (hawk_t* awk, const hawk_loc_t* xloc
default: default:
/* TODO: support MOD_VAR */ /* TODO: support MOD_VAR */
hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, HAWK_T("undefined identifier '%.*js'"), full->len, full->ptr); hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, FMT_EUNDEF, full->len, full->ptr);
break; break;
} }
} }
@ -5538,7 +5559,7 @@ static hawk_nde_t* parse_hashidx (hawk_t* awk, const hawk_oocs_t* name, const ha
if (!MATCH(awk,TOK_RBRACK)) if (!MATCH(awk,TOK_RBRACK))
{ {
hawk_clrpt (awk, idx); hawk_clrpt (awk, idx);
SETERR_TOK (awk, HAWK_ERBRACK); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ERBRACK, FMT_ERBRACK, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return HAWK_NULL; return HAWK_NULL;
} }
@ -5629,7 +5650,7 @@ static hawk_nde_t* parse_hashidx (hawk_t* awk, const hawk_oocs_t* name, const ha
} }
/* undefined variable */ /* undefined variable */
hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, HAWK_T("undefined identifier '%.*js'"), name->len, name->ptr); hawk_seterrfmt (awk, xloc, HAWK_EUNDEF, FMT_EUNDEF, name->len, name->ptr);
exit_func: exit_func:
hawk_clrpt (awk, idx); hawk_clrpt (awk, idx);
@ -5680,7 +5701,7 @@ static hawk_nde_t* parse_fncall (hawk_t* awk, const hawk_oocs_t* name, hawk_fnc_
if (!MATCH(awk,TOK_COMMA)) if (!MATCH(awk,TOK_COMMA))
{ {
SETERR_TOK (awk, HAWK_ECOMMA); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_ECOMMA, FMT_ECOMMA, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
goto oops; goto oops;
} }
@ -6458,7 +6479,7 @@ retry:
type = classify_ident(awk, HAWK_OOECS_OOCS(tok->name)); type = classify_ident(awk, HAWK_OOECS_OOCS(tok->name));
if (type == TOK_IDENT) if (type == TOK_IDENT)
{ {
SETERR_TOK (awk, HAWK_EXKWNR); hawk_seterrfmt (awk, &awk->tok.loc, HAWK_EXKWNR, FMT_EXKWNR, HAWK_OOECS_LEN(awk->tok.name), HAWK_OOECS_PTR(awk->tok.name));
return -1; return -1;
} }
SET_TOKEN_TYPE (awk, tok, type); SET_TOKEN_TYPE (awk, tok, type);
@ -6542,9 +6563,8 @@ retry:
if (skip_semicolon_after_include && !(awk->opt.trait & HAWK_NEWLINE)) if (skip_semicolon_after_include && !(awk->opt.trait & HAWK_NEWLINE))
{ {
/* semiclon has not been skipped yet and the /* semiclon has not been skipped yet and the newline option is not set. */
* newline option is not set. */ hawk_seterrfmt (awk, &tok->loc, HAWK_ESCOLON, FMT_ESCOLON, HAWK_OOECS_LEN(tok->name), HAWK_OOECS_PTR(tok->name));
hawk_seterror (awk, HAWK_ESCOLON, HAWK_OOECS_OOCS(tok->name), &tok->loc);
return -1; return -1;
} }
@ -6989,7 +7009,6 @@ static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nseg
{ {
hawk_rbt_pair_t* pair; hawk_rbt_pair_t* pair;
hawk_mod_data_t* mdp; hawk_mod_data_t* mdp;
hawk_oocs_t ea;
int n; int n;
HAWK_ASSERT (nsegs == 2); HAWK_ASSERT (nsegs == 2);
@ -7019,9 +7038,7 @@ static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nseg
if (segs[0].len > HAWK_COUNTOF(buf) - 15) if (segs[0].len > HAWK_COUNTOF(buf) - 15)
{ {
/* module name too long */ /* module name too long */
ea.ptr = segs[0].ptr; hawk_seterrfmt (awk, HAWK_NULL, HAWK_ESEGTL, FMT_ESEGTL, segs[0].len, segs[0].ptr);
ea.len = segs[0].len;
hawk_seterror (awk, HAWK_ESEGTL, &ea, HAWK_NULL);
return HAWK_NULL; return HAWK_NULL;
} }
@ -7040,10 +7057,7 @@ static hawk_mod_t* query_module (hawk_t* awk, const hawk_oocs_t segs[], int nseg
/*if (n >= HAWK_COUNTOF(static_modtab)) /*if (n >= HAWK_COUNTOF(static_modtab))
{ {
hawk_seterrfmt (awk, HAWK_NULL, HAWK_ENOENT, HAWK_T("'%.*js' not found"), segs[0].len, segs[0].ptr);
ea.ptr = segs[0].ptr;
ea.len = segs[0].len;
hawk_seterror (awk, HAWK_ENOENT, &ea, HAWK_NULL);
return HAWK_NULL; return HAWK_NULL;
}*/ }*/

602
hawk/mod/mod-mysql.c
View File

File diff suppressed because it is too large Load Diff

8
hawk/mod/mod-mysql.h
View File

@ -24,16 +24,16 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _QSE_LIB_AWKMOD_MYSQL_H_ #ifndef _HAWK_MOD_MYSQL_H_
#define _QSE_LIB_AWKMOD_MYSQL_H_ #define _HAWK_MOD_MYSQL_H_
#include <qse/awk/awk.h> #include <hawk.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
QSE_EXPORT int qse_awk_mod_mysql (qse_awk_mod_t* mod, qse_awk_t* awk); HAWK_EXPORT int hawk_mod_mysql (hawk_mod_t* mod, hawk_t* hawk);
#if defined(__cplusplus) #if defined(__cplusplus)
} }

700
hawk/mod/mod-uci.c
View File

File diff suppressed because it is too large Load Diff

8
hawk/mod/mod-uci.h
View File

@ -24,16 +24,16 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _QSE_LIB_AWKMOD_UCI_H_ #ifndef _HAWK_MOD_UCI_H_
#define _QSE_LIB_AWKMOD_UCI_H_ #define _HAWK_MOD_UCI_H_
#include <qse/awk/awk.h> #include <hawk.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
QSE_EXPORT int qse_awk_mod_uci (qse_awk_mod_t* mod, qse_awk_t* awk); HAWK_EXPORT int hawk_mod_uci (hawk_mod_t* mod, hawk_t* hawk);
#if defined(__cplusplus) #if defined(__cplusplus)
} }

42
hawk/t/test.txt
View File

@ -148,8 +148,46 @@ $ ~/xxx/bin/hawk --implicit=off 'BEGIN { print kcx[10]; }'
HAWK_EUNDEF -> ERROR: CODE 69 LINE 1 COLUMN 16 - undefined identifier 'kcx' HAWK_EUNDEF -> ERROR: CODE 69 LINE 1 COLUMN 16 - undefined identifier 'kcx'
$ ~/xxx/bin/hawk --implicit=off 'BEGIN { print ax; }' $ ~/xxx/bin/hawk --implicit=off 'BEGIN { print ax; }'
ERROR: CODE 69 LINE 1 COLUMN 16 - undefined identifier 'ax' HAWK_EUNDEF -> ERROR: CODE 69 LINE 1 COLUMN 16 - undefined identifier 'ax'
$ ~/xxx/bin/hawk 'function 1.2(a) {}' $ ~/xxx/bin/hawk 'function 1.2(a) {}'
ERROR: CODE 54 LINE 1 COLUMN 10 - '1.2' not a valid function name HAWK_EFUNNAM -> ERROR: CODE 54 LINE 1 COLUMN 10 - '1.2' not a valid function name
$ ~/xxx/bin/hawk 'function abc(x) print t; }'
HAWK_ELBRACE -> ERROR: CODE 38 LINE 1 COLUMN 17 - left brace expected in place of 'print'
$ ~/xxx/bin/hawk 'function abc(x) { print a[10; }'
HAWK_ERBRACK -> ERROR: CODE 41 LINE 1 COLUMN 29 - right bracket expected in place of ';'
$ ~/xxx/bin/hawk 'function abc x) { print 10; }'
HAWK_ELPAREN -> ERROR: CODE 39 LINE 1 COLUMN 14 - left parenthesis expected in place of 'x'
$ ~/xxx/bin/hawk 'function abc (x) { print (x; }'
HAWK_EPAREN -> ERROR: CODE 40 LINE 1 COLUMN 28 - right parenthesis expected in place of ';'
$ ~/xxx/bin/hawk 'function abc (x { print 10; }'
HAWK_ECOMMA -> ERROR: CODE 42 LINE 1 COLUMN 17 - comma expected in place of '{'
$ ~/xxx/bin/hawk 'function abc (x) { for (i = 10) print i; }'
HAWK_ESCOLON -> ERROR: CODE 43 LINE 1 COLUMN 31 - semicolon expected in place of ')'
$ ~/xxx/bin/hawk 'function abc (x) { print (i? 20, 30); }'
HAWK_ECOLON -> ERROR: CODE 44 LINE 1 COLUMN 32 - colon expected in place of ','
$ ~/xxx/bin/hawk '@includ "xxx.inc"; BEGIN {}'
HAWK_EXKWNR -> ERROR: CODE 88 LINE 1 COLUMN 1 - '@includ' not recognized
$ ~/xxx/bin/hawk 'function abc (x) { do { print x }; }'
HAWK_EKWWHL -> ERROR: CODE 51 LINE 1 COLUMN 34 - keyword 'while' expected in place of ';'
$ ~/xxx/bin/hawk 'function abc (x) { do { print sysxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxtt::xx }; }'
HAWK_ESEGTL -> ERROR: CODE 75 LINE 1 COLUMN 31 - segment 'sysxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxtt' too long
$ ~/xxx/bin/hawk --tolerant=off 'function abc (x) { (1, 2, 3) }'
HAWK_EKWIN -> ERROR: CODE 47 LINE 1 COLUMN 30 - keyword 'in' expected in place of '}'