Recovered from cvs revision 2007-08-22 11:25:00

This commit is contained in:
2007-08-22 22:56:00 +00:00
parent a7a4d8de4c
commit a2c56938e7
10 changed files with 215 additions and 48 deletions

View File

@ -1,7 +1,8 @@
/*
* $Id: Awk.cpp,v 1.48 2007/08/18 15:41:46 bacon Exp $
* $Id: Awk.cpp,v 1.49 2007/08/21 14:24:37 bacon Exp $
*/
#include <ase/awk/Awk.hpp>
#include <ase/awk/val.h>
#include <ase/cmn/str.h>
@ -568,7 +569,7 @@ namespace ASE
ase_awk_setmaxdepth (awk, ids, depth);
}
int Awk::getMaxDepth (int id) const
size_t Awk::getMaxDepth (int id) const
{
ASE_ASSERT (awk != ASE_NULL);
return ase_awk_getmaxdepth (awk, id);
@ -1014,7 +1015,6 @@ namespace ASE
{
Run* r = (Run*)custom;
if (r->callbackFailed) return;
r->awk->onRunStatement (*r, line);
}

View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.hpp,v 1.46 2007/08/18 15:41:46 bacon Exp $
* $Id: Awk.hpp,v 1.47 2007/08/21 14:24:37 bacon Exp $
*/
#ifndef _ASE_AWK_AWK_HPP_
@ -409,8 +409,8 @@ namespace ASE
DEPTH_REX_MATCH = ASE_AWK_DEPTH_REX_MATCH
};
virtual void setMaxDepth (int ids, size_t depth);
virtual int getMaxDepth (int id) const;
virtual void setMaxDepth (int ids, size_t depth);
virtual size_t getMaxDepth (int id) const;
virtual int setErrorString (ErrorCode num, const char_t* str);
@ -477,7 +477,7 @@ namespace ASE
virtual void onRunEnd (const Run& run);
virtual void onRunReturn (const Run& run, const Argument& ret);
virtual void onRunStatement (const Run& run, size_t line);
// primitive handlers
virtual void* allocMem (size_t n) = 0;
virtual void* reallocMem (void* ptr, size_t n) = 0;

View File

@ -1,5 +1,5 @@
/*
* $Id: StdAwk.cpp,v 1.22 2007/07/15 16:31:59 bacon Exp $
* $Id: StdAwk.cpp,v 1.23 2007/08/21 14:24:37 bacon Exp $
*/
#include <ase/awk/StdAwk.hpp>
@ -22,7 +22,7 @@ namespace ASE
StdAwk::StdAwk ()
{
seed = ::time(NULL);
seed = (unsigned int)::time(NULL);
::srand (seed);
}

View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.9 2007/07/25 07:00:09 bacon Exp $
* $Id: run.c,v 1.10 2007/08/21 14:24:37 bacon Exp $
*
* {License}
*/
@ -1724,7 +1724,7 @@ static int __run_block0 (ase_awk_run_t* run, ase_awk_nde_blk_t* nde)
(run)->cbs->on_statement != ASE_NULL) \
{ \
(run)->cbs->on_statement ( \
run, (nde)->line, (run)->custom_data); \
run, (nde)->line, (run)->cbs->custom_data); \
}
static int __run_statement (ase_awk_run_t* run, ase_awk_nde_t* nde)