*** empty log message ***

This commit is contained in:
2007-03-02 10:06:17 +00:00
parent 616e04112e
commit ed79190a0c
7 changed files with 104 additions and 35 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: awk.c,v 1.110 2007-02-24 14:31:43 bacon Exp $
* $Id: awk.c,v 1.111 2007-03-02 10:06:17 bacon Exp $
*
* {License}
*/
@ -151,8 +151,10 @@ ase_awk_t* ase_awk_open (
ase_awk_setmaxdepth (awk, ASE_AWK_DEPTH_REX_BUILD, 0);
ase_awk_setmaxdepth (awk, ASE_AWK_DEPTH_REX_MATCH, 0);
/*
awk->run.count = 0;
awk->run.ptr = ASE_NULL;
*/
awk->custom_data = custom_data;
return awk;
@ -174,7 +176,9 @@ int ase_awk_close (ase_awk_t* awk)
if (ase_awk_clear (awk) == -1) return -1;
ase_awk_clrbfn (awk);
/*
ASE_AWK_ASSERT (awk, awk->run.count == 0 && awk->run.ptr == ASE_NULL);
*/
ase_awk_map_close (&awk->tree.afns);
ase_awk_tab_close (&awk->parse.globals);
@ -191,11 +195,13 @@ int ase_awk_close (ase_awk_t* awk)
int ase_awk_clear (ase_awk_t* awk)
{
/* you should stop all running instances beforehand */
/*
if (awk->run.ptr != ASE_NULL)
{
awk->errnum = ASE_AWK_ERUNNING;
return -1;
}
*/
ase_memset (&awk->src.ios, 0, ASE_SIZEOF(awk->src.ios));
awk->src.lex.curc = ASE_CHAR_EOF;

View File

@ -1,5 +1,5 @@
/*
* $Id: awk.h,v 1.192 2007-02-24 14:31:43 bacon Exp $
* $Id: awk.h,v 1.193 2007-03-02 10:06:17 bacon Exp $
*
* {License}
*/
@ -435,7 +435,6 @@ int ase_awk_run (
ase_awk_runarg_t* runarg, void* custom_data);
int ase_awk_stop (ase_awk_t* awk, ase_awk_run_t* run);
void ase_awk_stopall (ase_awk_t* awk);
/* functions to access internal stack structure */
ase_size_t ase_awk_getnargs (ase_awk_run_t* run);

View File

@ -1,5 +1,5 @@
/*
* $Id: awk_i.h,v 1.103 2007-02-23 15:18:36 bacon Exp $
* $Id: awk_i.h,v 1.104 2007-03-02 10:06:17 bacon Exp $
*
* {License}
*/
@ -189,8 +189,10 @@ struct ase_awk_t
struct
{
/*
ase_size_t count;
ase_awk_run_t* ptr;
*/
struct
{

View File

@ -1,5 +1,5 @@
/*
* $Id: run.c,v 1.331 2007-02-28 11:00:33 bacon Exp $
* $Id: run.c,v 1.332 2007-03-02 10:06:17 bacon Exp $
*
* {License}
*/
@ -55,8 +55,10 @@ static int __set_global (
ase_awk_run_t* run, ase_size_t idx,
ase_awk_nde_var_t* var, ase_awk_val_t* val);
/*
static void __add_run (ase_awk_t* awk, ase_awk_run_t* run);
static void __del_run (ase_awk_t* awk, ase_awk_run_t* run);
*/
static int __init_run (
ase_awk_run_t* run, ase_awk_t* awk,
@ -663,7 +665,7 @@ int ase_awk_run (ase_awk_t* awk,
ase_memset (run, 0, ASE_SIZEOF(ase_awk_run_t));
/* add the run object to the awk object */
__add_run (awk, run);
/*__add_run (awk, run);*/
/* initialize the run object */
if (__init_run (run, awk, runios, custom_data, &errnum) == -1)
@ -672,7 +674,7 @@ int ase_awk_run (ase_awk_t* awk,
* the awk object */
ase_awk_seterror (awk, errnum, 0, ASE_NULL);
__del_run (awk, run);
/*__del_run (awk, run);*/
ASE_AWK_FREE (awk, run);
return -1;
}
@ -722,7 +724,7 @@ int ase_awk_run (ase_awk_t* awk,
__deinit_run (run);
/* unregister the run object */
__del_run (awk, run);
/*__del_run (awk, run);*/
ASE_AWK_FREE (awk, run);
return n;
@ -730,8 +732,10 @@ int ase_awk_run (ase_awk_t* awk,
int ase_awk_stop (ase_awk_t* awk, ase_awk_run_t* run)
{
/*
ase_awk_run_t* r;
int n = 0;
*/
if (ase_awk_getrunawk(run) != awk)
{
@ -739,6 +743,11 @@ int ase_awk_stop (ase_awk_t* awk, ase_awk_run_t* run)
return -1;
}
run->exit_level = EXIT_ABORT;
return 0;
#if 0
ASE_AWK_LOCK (awk);
/* check if the run handle given is valid */
@ -763,20 +772,7 @@ int ase_awk_stop (ase_awk_t* awk, ase_awk_run_t* run)
ASE_AWK_UNLOCK (awk);
return n;
}
void ase_awk_stopall (ase_awk_t* awk)
{
ase_awk_run_t* r;
ASE_AWK_LOCK (awk);
for (r = awk->run.ptr; r != ASE_NULL; r = r->next)
{
r->exit_level = EXIT_ABORT;
}
ASE_AWK_UNLOCK (awk);
#endif
}
static void __free_namedval (void* run, void* val)
@ -784,6 +780,7 @@ static void __free_namedval (void* run, void* val)
ase_awk_refdownval ((ase_awk_run_t*)run, val);
}
/*
static void __add_run (ase_awk_t* awk, ase_awk_run_t* run)
{
ASE_AWK_LOCK (awk);
@ -820,6 +817,7 @@ static void __del_run (ase_awk_t* awk, ase_awk_run_t* run)
ASE_AWK_UNLOCK (awk);
}
*/
static int __init_run (
ase_awk_run_t* run, ase_awk_t* awk,