Recovered from cvs revision 2007-08-26 14:33:00
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: Awk.cpp,v 1.49 2007/08/21 14:24:37 bacon Exp $
|
||||
* $Id: Awk.cpp,v 1.51 2007/08/24 15:11:36 bacon Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -441,6 +441,22 @@ namespace ASE
|
||||
}
|
||||
}
|
||||
|
||||
void Awk::setError (
|
||||
ErrorCode code, size_t line, const char_t* msg)
|
||||
{
|
||||
if (awk != ASE_NULL)
|
||||
{
|
||||
ase_awk_seterrmsg (awk, code, line, msg);
|
||||
retrieveError ();
|
||||
}
|
||||
else
|
||||
{
|
||||
this->errnum = code;
|
||||
this->errlin = line;
|
||||
ase_strxcpy (this->errmsg, ASE_COUNTOF(this->errmsg), msg);
|
||||
}
|
||||
}
|
||||
|
||||
void Awk::clearError ()
|
||||
{
|
||||
this->errnum = ERR_NOERR;
|
||||
@ -569,12 +585,18 @@ namespace ASE
|
||||
ase_awk_setmaxdepth (awk, ids, depth);
|
||||
}
|
||||
|
||||
size_t Awk::getMaxDepth (int id) const
|
||||
Awk::size_t Awk::getMaxDepth (int id) const
|
||||
{
|
||||
ASE_ASSERT (awk != ASE_NULL);
|
||||
return ase_awk_getmaxdepth (awk, id);
|
||||
}
|
||||
|
||||
const Awk::char_t* Awk::getErrorString (ErrorCode num) const
|
||||
{
|
||||
ASE_ASSERT (awk != ASE_NULL);
|
||||
return ase_awk_geterrstr (awk, (int)num);
|
||||
}
|
||||
|
||||
int Awk::setErrorString (ErrorCode num, const char_t* str)
|
||||
{
|
||||
ASE_ASSERT (awk != ASE_NULL);
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: Awk.hpp,v 1.47 2007/08/21 14:24:37 bacon Exp $
|
||||
* $Id: Awk.hpp,v 1.48 2007/08/24 13:17:59 bacon Exp $
|
||||
*/
|
||||
|
||||
#ifndef _ASE_AWK_AWK_HPP_
|
||||
@ -389,6 +389,8 @@ namespace ASE
|
||||
protected:
|
||||
void setError (ErrorCode code, size_t line = 0,
|
||||
const char_t* arg = ASE_NULL, size_t len = 0);
|
||||
void setError (ErrorCode code, size_t line, const char_t* msg);
|
||||
|
||||
void clearError ();
|
||||
void retrieveError ();
|
||||
|
||||
@ -412,6 +414,7 @@ namespace ASE
|
||||
virtual void setMaxDepth (int ids, size_t depth);
|
||||
virtual size_t getMaxDepth (int id) const;
|
||||
|
||||
virtual const char_t* getErrorString (ErrorCode num) const;
|
||||
virtual int setErrorString (ErrorCode num, const char_t* str);
|
||||
|
||||
virtual int setWord (
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: awk.h,v 1.8 2007/06/29 11:36:45 bacon Exp $
|
||||
* $Id: awk.h,v 1.9 2007/08/24 13:17:59 bacon Exp $
|
||||
*
|
||||
* {License}
|
||||
*/
|
||||
@ -202,12 +202,12 @@ enum ase_awk_errnum_t
|
||||
ASE_AWK_ENOMEM, /* out of memory */
|
||||
ASE_AWK_ENOSUP, /* not supported */
|
||||
ASE_AWK_ENOPER, /* operation not allowed */
|
||||
ASE_AWK_ENODEV, /* function '%.*s' not found */
|
||||
ASE_AWK_ENODEV, /* no such device */
|
||||
ASE_AWK_ENOSPC, /* no space left on device */
|
||||
ASE_AWK_EMFILE, /* too many open files */
|
||||
ASE_AWK_EMLINK, /* too many links */
|
||||
ASE_AWK_EAGAIN, /* resource temporarily unavailable */
|
||||
ASE_AWK_ENOENT, /* file or data not existing */
|
||||
ASE_AWK_ENOENT, /* "'%.*s' not existing */
|
||||
ASE_AWK_EEXIST, /* file or data exists */
|
||||
ASE_AWK_EFTBIG, /* file or data too big */
|
||||
ASE_AWK_ETBUSY, /* system too busy */
|
||||
@ -399,7 +399,10 @@ int ase_awk_seterrstr (ase_awk_t* awk, int num, const ase_char_t* str);
|
||||
int ase_awk_geterrnum (ase_awk_t* awk);
|
||||
ase_size_t ase_awk_geterrlin (ase_awk_t* awk);
|
||||
const ase_char_t* ase_awk_geterrmsg (ase_awk_t* awk);
|
||||
|
||||
void ase_awk_seterrnum (ase_awk_t* awk, int errnum);
|
||||
void ase_awk_seterrmsg (ase_awk_t* awk,
|
||||
int errnum, ase_size_t errlin, const ase_char_t* errmsg);
|
||||
|
||||
void ase_awk_geterror (
|
||||
ase_awk_t* awk, int* errnum,
|
||||
@ -463,6 +466,8 @@ int ase_awk_getrunerrnum (ase_awk_run_t* run);
|
||||
ase_size_t ase_awk_getrunerrlin (ase_awk_run_t* run);
|
||||
const ase_char_t* ase_awk_getrunerrmsg (ase_awk_run_t* run);
|
||||
void ase_awk_setrunerrnum (ase_awk_run_t* run, int errnum);
|
||||
void ase_awk_setrunerrmsg (ase_awk_run_t* run,
|
||||
int errnum, ase_size_t errlin, const ase_char_t* errmsg);
|
||||
|
||||
void ase_awk_getrunerror (
|
||||
ase_awk_run_t* run, int* errnum,
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: err.c,v 1.5 2007/06/29 11:36:45 bacon Exp $
|
||||
* $Id: err.c,v 1.6 2007/08/24 13:17:59 bacon Exp $
|
||||
*
|
||||
* {License}
|
||||
*/
|
||||
@ -219,6 +219,14 @@ void ase_awk_seterrnum (ase_awk_t* awk, int errnum)
|
||||
awk->errmsg[0] = ASE_T('\0');
|
||||
}
|
||||
|
||||
void ase_awk_seterrmsg (ase_awk_t* awk,
|
||||
int errnum, ase_size_t errlin, const ase_char_t* errmsg)
|
||||
{
|
||||
awk->errnum = errnum;
|
||||
awk->errlin = errlin;
|
||||
ase_strxcpy (awk->errmsg, ASE_COUNTOF(awk->errmsg), errmsg);
|
||||
}
|
||||
|
||||
void ase_awk_seterror (
|
||||
ase_awk_t* awk, int errnum, ase_size_t errlin,
|
||||
const ase_cstr_t* errarg, ase_size_t argcnt)
|
||||
@ -346,6 +354,14 @@ void ase_awk_setrunerrnum (ase_awk_run_t* run, int errnum)
|
||||
run->errmsg[0] = ASE_T('\0');
|
||||
}
|
||||
|
||||
void ase_awk_setrunerrmsg (ase_awk_run_t* run,
|
||||
int errnum, ase_size_t errlin, const ase_char_t* errmsg)
|
||||
{
|
||||
run->errnum = errnum;
|
||||
run->errlin = errlin;
|
||||
ase_strxcpy (run->errmsg, ASE_COUNTOF(run->errmsg), errmsg);
|
||||
}
|
||||
|
||||
void ase_awk_getrunerror (
|
||||
ase_awk_run_t* run, int* errnum,
|
||||
ase_size_t* errlin, const ase_char_t** errmsg)
|
||||
|
Reference in New Issue
Block a user