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

addming a dynamic array

Browse Source
This commit is contained in:
hyung-hwan 2008-10-01 05:14:20 +00:00
parent 5fd42fbb99
commit c2a6db9ec3
7 changed files with 731 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ase/cmd/awk/awk.c
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.c 403 2008-09-29 11:07:47Z baconevi $
* $Id: awk.c 404 2008-09-30 11:14:20Z baconevi $
*/
#include <ase/awk/awk.h>
@ -17,6 +17,8 @@
#include <math.h>
#include <stdlib.h>
#define ABORT(label) goto label
#if defined(_WIN32)
#include <windows.h>
#include <tchar.h>
@ -951,7 +953,13 @@ static void out_of_memory (void)
ase_fprintf (ASE_STDERR, ASE_T("Error: out of memory\n"));
}
static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
struct argout_t
{
ase_sll_t* sf;
ase_map_t* vm;
};
static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod, struct argout_t* ao)
{
static ase_opt_lng_t lng[] =
{
@ -993,7 +1001,7 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (sf == ASE_NULL)
{
out_of_memory ();
return -1;
ABORT (on_error);
}
ase_sll_setscale (sf, ASE_SIZEOF(opt.arg[0]));
ase_sll_setcopier (sf, ASE_SLL_COPIER_INLINE);
@ -1002,7 +1010,7 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (vm == ASE_NULL)
{
out_of_memory ();
return -1;
ABORT (on_error);
}
ase_map_setcopier (vm, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setcopier (vm, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
@ -1029,15 +1037,17 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (ase_sll_pushtail(sf, opt.arg, sz) == ASE_NULL)
{
out_of_memory ();
return -1;
ABORT (on_error);
}
break;
}
case ASE_T('F'):
{
ase_printf (ASE_T("[field separator] = %s\n"), opt.arg);
break;
}
case ASE_T('v'):
{
@ -1045,7 +1055,7 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (eq == ASE_NULL)
{
/* INVALID VALUE... */
return -1;
ABORT (on_error);
}
*eq = ASE_T('\0');
@ -1053,12 +1063,13 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (ase_map_upsert (vm, opt.arg, ase_strlen(opt.arg)+1, eq, ase_strlen(eq)+1) == ASE_NULL)
{
out_of_memory ();
return -1;
ABORT (on_error);
}
break;
}
case ASE_T('?'):
{
if (opt.lngopt)
{
ase_printf (ASE_T("Error: illegal option - %s\n"), opt.lngopt);
@ -1070,8 +1081,10 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (sf != ASE_NULL) ase_sll_close (sf);
return -1;
}
case ASE_T(':'):
{
if (opt.lngopt)
{
ase_printf (ASE_T("Error: bad argument for %s\n"), opt.lngopt);
@ -1081,12 +1094,11 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
ase_printf (ASE_T("Error: bad argument for %c\n"), opt.opt);
}
if (sf != ASE_NULL) ase_sll_close (sf);
return -1;
ABORT (on_error);
}
default:
if (sf != ASE_NULL) ase_sll_close (sf);
return -1;
ABORT (on_error);
}
}
@ -1096,7 +1108,7 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
if (opt.ind >= argc)
{
/* no source code specified */
return -1;
ABORT (on_error);
}
siod->type = SRCIO_STR;
@ -1114,7 +1126,15 @@ static int handle_args (int argc, ase_char_t* argv[], srcio_data_t* siod)
/* remaining args are input(console) file names */
ao->sf = sf;
ao->vm = vm;
return 0;
on_error:
if (sf != ASE_NULL) ase_sll_close (sf);
if (vm != ASE_NULL) ase_map_close (vm);
return -1;
}
typedef struct extension_t
@ -1233,7 +1253,9 @@ static int awk_main (int argc, ase_char_t* argv[])
ase_awk_runarg_t runarg[128];
int deparse = 0;
i = handle_args (argc, argv, &siod);
struct argout_t ao;
i = handle_args (argc, argv, &siod, &ao);
if (i == -1)
{
print_usage (argv[0]);
@ -1250,6 +1272,7 @@ static int awk_main (int argc, ase_char_t* argv[])
app_awk = awk;
#if 0
srcios.in = awk_srcio_in;
srcios.out = deparse? awk_srcio_out: NULL;
srcios.data = &siod;
@ -1264,6 +1287,17 @@ static int awk_main (int argc, ase_char_t* argv[])
close_awk (awk);
return -1;
}
#endif
if (ase_awk_parsefiles (awk, ASE_ARR_PTR(stab), ASE_ARR_LEN(stab)) == -1)
{
ase_printf (
ASE_T("PARSE ERROR: CODE [%d] LINE [%u] %s\n"),
ase_awk_geterrnum(awk),
(unsigned int)ase_awk_geterrlin(awk),
ase_awk_geterrmsg(awk));
close_awk (awk);
return -1;
}
#ifdef _WIN32

72
ase/include/ase/awk/awk.h
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.h 354 2008-08-31 10:57:24Z baconevi $
* $Id: awk.h 404 2008-09-30 11:14:20Z baconevi $
*
* {License}
*/
@ -7,12 +7,20 @@
#ifndef _ASE_AWK_AWK_H_
#define _ASE_AWK_AWK_H_
#include <ase/types.h>
#include <ase/macros.h>
#include <ase/cmn/map.h>
#include <ase/cmn/str.h>
/****o* ase.awk/awk interpreter
* DESCRIPTION
* The library includes an AWK interpreter that can be embedded into other
* applications or can run stand-alone.
*
* #include <ase/awk/awk.h>
******
*/
typedef struct ase_awk_t ase_awk_t;
typedef struct ase_awk_run_t ase_awk_run_t;
typedef struct ase_awk_val_t ase_awk_val_t;
@ -577,50 +585,63 @@ extern ase_awk_val_t* ase_awk_val_zero;
/** represents a numeric value 1 */
extern ase_awk_val_t* ase_awk_val_one;
/*
* NAME: create an ase_awk_t instance
/****f* ase.awk/ase_awk_open
* NAME
* ase_awk_open - create an awk object
*
* DESCRIPTION:
* DESCRIPTION
* The ase_awk_open() function creates a new ase_awk_t instance.
* The instance created can be passed to other ase_awk_xxx() functions and
* is valid until it is successfully destroyed using the ase_ase_close()
* function.
*
* RETURNS:
* the pointer to an ase_awk_t instance on success.
* ASE_NULL on failure.
* RETURN
* The ase_awk_open() function returns the pointer to an ase_awk_t instance
* on success and ASE_NULL on failure.
*
* SYNOPSIS
*/
ase_awk_t* ase_awk_open (
ase_mmgr_t* mmgr /* memory manager */,
ase_mmgr_t* mmgr /* a memory manager */,
ase_size_t ext /* size of extension area in bytes */
);
/******/
/*
* destroy an ase_awk_t instance
/****f* ase.awk/ase_awk_close
* NAME
* ase_awk_close - destroy an awk object
*
* An ase_awk_t instance should be destroyed using the ase_awk_close() function
* when finished being used. The instance passed is not valid any more once
* the function returns success.
*
* RETURNS 0 on success, -1 on failure
* RETURN
* 0 on success, -1 on failure
*
* SYNOPSIS
*/
int ase_awk_close (
/* the pointer to an ase_awk_t instance */
ase_awk_t* awk
ase_awk_t* awk /* an awk object */
);
/******/
/*
* get the pointer to the memory manager in use
* RETURNS the pointer to the memory manager set through ase_awk_open()
/****f* ase.awk/ase_awk_getmmgr
* NAME
* ase_awk_getmmgr - get the memory manager
*
* DESCRIPTION
* The ase_awk_getmmgr() function returns the pointer to the memory manager.
*
* SYNOPSIS
*/
ase_mmgr_t* ase_awk_getmmgr (
/* the pointer to an ase_awk_t instance */
ase_awk_t* awk
ase_awk_t* awk /* an awk object */
);
/******/
/*
/****f* ase.awk/ase_awk_getextension
* NAME
* get the pointer to extension area requested upon a call to ase_awk_open()
* ase_awk_getextension - get the extension
*
* DESCRIPTION
* The extension area is allocated in the ase_awk_open() function when it is
@ -628,12 +649,12 @@ ase_mmgr_t* ase_awk_getmmgr (
* can be acquired using the ase_awk_getextension() function and be utilized
* for various purposes.
*
* RETURNS the pointer to the extension area
* SYNOPSIS
*/
void* ase_awk_getextension (
/* the pointer to an ase_awk_t instance */
ase_awk_t* awk
ase_awk_t* awk /* an awk object */
);
/******/
/*
* set the character classfier
@ -772,6 +793,9 @@ int ase_awk_delglobal (ase_awk_t* awk, const ase_char_t* name, ase_size_t len);
*/
int ase_awk_parse (ase_awk_t* awk, ase_awk_srcios_t* srcios);
int ase_awk_parsefiles (ase_awk_t* awk, const ase_char_t* files[], ase_size_t count);
/**
* Executes a parsed program.
*

152
ase/include/ase/cmn/dar.h Normal file
View File

@ -0,0 +1,152 @@
/*
* $Id: dar.h 363 2008-09-04 10:58:08Z baconevi $
*
* {License}
*/
#ifndef _ASE_CMN_DAR_H_
#define _ASE_CMN_DAR_H_
#include <ase/types.h>
#include <ase/macros.h>
/****o* ase.cmn.dar/dynamic array
* DESCRIPTION
* A dynamic array grows as more items are added.
*
* #include <ase/cmn/dar.h>
******
*/
typedef struct ase_dar_t ase_dar_t;
/****s* ase.cmn.dar/ase_dar_t
* NAME
* ase_dar_t - define a dynamic array
*
* SYNOPSIS
*/
struct ase_dar_t
{
ase_mmgr_t* mmgr; /* memory manager */
ase_sll_copier_t copier; /* data copier */
ase_sll_freeer_t freeer; /* data freeer */
ase_sll_comper_t comper; /* data comparator */
ase_byte_t scale; /* scale factor */
ase_size_t size; /* the number of items */
ase_size_t capa; /* capacity */
struct
{
void* dptr;
ase_size_t dlen;
}* buf;
};
/******/
#ifdef __cplusplus
extern "C" {
#endif
/****f* ase.cmn.dar/ase_dar_open
* NAME
* ase_dar_open - create a dynamic array
*
* SYNOPSIS
*/
ase_dar_t* ase_dar_open (
ase_mmgr_t* dar,
ase_size_t ext,
ase_size_t capa
);
/******/
/****f* ase.cmn.dar/ase_dar_close
* NAME
* ase_dar_close - destroy a dynamic array
*
* SYNOPSIS
*/
void ase_dar_close (
ase_dar_t* dar
);
/******/
/****f* ase.cmn.dar/ase_dar_init
* NAME
* ase_dar_init - initialize a dynamic array
*
* SYNOPSIS
*/
ase_dar_t* ase_dar_init (
ase_dar_t* dar,
ase_mmgr_t* mmgr,
ase_size_t capa
);
/******/
/****f* ase.cmn.dar/ase_dar_fini
* NAME
* ase_dar_fini - deinitialize a dynamic array
*
* SYNOPSIS
*/
void ase_dar_fini (
ase_dar_t* dar
);
/******/
ase_size_t ase_dar_getsize (ase_dar_t* dar);
ase_size_t ase_dar_getcapa (ase_dar_t* dar);
ase_dar_t* ase_dar_setcapa (ase_dar_t* dar, ase_size_t capa);
ase_size_t ase_dar_insert (
ase_dar_t* dar,
ase_size_t index,
const ase_char_t* str,
ase_size_t len
);
ase_size_t ase_dar_delete (
ase_dar_t* dar,
ase_size_t index,
ase_size_t count
);
ase_size_t ase_dar_add (
ase_dar_t* dar, const ase_char_t* str, ase_size_t len);
ase_size_t ase_dar_adduniq (
ase_dar_t* dar, const ase_char_t* str, ase_size_t len);
ase_size_t ase_dar_find (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len);
ase_size_t ase_dar_rfind (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len);
ase_size_t ase_dar_rrfind (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len);
ase_size_t ase_dar_findx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg);
ase_size_t ase_dar_rfindx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg);
ase_size_t ase_dar_rrfindx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg);
void ase_dar_clear (ase_dar_t* dar);
#ifdef __cplusplus
}
#endif
#endif

139
ase/lib/awk/std.c
View File

@ -62,3 +62,142 @@ ase_awk_t* ase_awk_openstd (void)
return awk;
}
typedef struct sf_t sf_t;
struct sf_t
{
struct
{
const ase_char_t** files;
ase_size_t count; /* the number of files */
ase_size_t index; /* current file index */
ASE_FILE* handle; /* the handle to an open file */
} in;
};
static ase_ssize_t sf_in (int cmd, void* arg, ase_char_t* data, ase_size_t size)
{
sf_t* sf = (sf_t*)arg;
ase_cint_t c;
if (cmd == ASE_AWK_IO_OPEN)
{
if (sf->in.index >= sf->in.count) return 0;
sf->in.handle = ase_fopen (sf->in.files[sf->in.index], ASE_T("r"));
if (sf->in.handle == ASE_NULL) return -1;
/*
ase_awk_setsinname ();
*/
return 1;
}
else if (cmd == ASE_AWK_IO_CLOSE)
{
if (sf->in.index >= sf->in.count) return 0;
fclose (sf->in.handle);
return 0;
}
else if (cmd == ASE_AWK_IO_READ)
{
ase_ssize_t n = 0;
ASE_FILE* fp;
retry:
fp = sf->in.handle;
while (!ase_feof(fp) && n < size)
{
ase_cint_t c = ase_fgetc (fp);
if (c == ASE_CHAR_EOF)
{
if (ase_ferror(fp)) n = -1;
break;
}
data[n++] = c;
}
if (n == 0)
{
sf->in.index++;
if (sf->in.index < sf->in.count)
{
ase_fclose (fp);
sf->in.handle = ase_fopen (sf->in.files[sf->in.index], ASE_T("r"));
if (sf->in.handle == ASE_NULL) return -1;
/* TODO: reset internal line counters...
ase_awk_setsinname ();
*/
goto retry;
}
}
return n;
}
return -1;
}
#if 0
static ase_ssize_t sf_out (
int cmd, void* arg, ase_char_t* data, ase_size_t size)
{
/*struct srcio_data_t* srcio = (struct srcio_data_t*)arg;*/
if (cmd == ASE_AWK_IO_OPEN) return 1;
else if (cmd == ASE_AWK_IO_CLOSE)
{
ase_fflush (stdout);
return 0;
}
else if (cmd == ASE_AWK_IO_WRITE)
{
ase_size_t left = size;
while (left > 0)
{
if (*data == ASE_T('\0'))
{
if (ase_fputc (*data, stdout) == ASE_CHAR_EOF) return -1;
left -= 1; data += 1;
}
else
{
int chunk = (left > ASE_TYPE_MAX(int))? ASE_TYPE_MAX(int): (int)left;
int n = ase_fprintf (stdout, ASE_T("%.*s"), chunk, data);
if (n < 0) return -1;
left -= n; data += n;
}
}
return size;
}
return -1;
}
#endif
int ase_awk_parsefiles (ase_awk_t* awk, const ase_char_t* files[], ase_size_t count)
{
sf_t sf;
ase_awk_srcios_t sio;
sf.in.files = files;
sf.in.count = count;
sf.in.index = 0;
sf.in.handle = ASE_NULL;
sio.in = sf_in;
//sio.out = deparse? sf_out: NULL;
sio.out = ASE_NULL;
sio.data = &sf;
return ase_awk_parse (awk, &sio);
}
#if 0
int ase_awk_parsestring (ase_awk_t* awk, const ase_char_t* str, ase_size_t len)
{
return -1;
}
#endif

341
ase/lib/cmn/dar.c Normal file
View File

@ -0,0 +1,341 @@
/*
* $Id: dar.c 337 2008-08-20 09:17:25Z baconevi $
*
* {License}
*/
#include <ase/cmn/dar.h>
#include "mem.h"
ase_dar_t* ase_dar_open (ase_mmgr_t* dar, ase_size_t ext, ase_size_t capa)
{
ase_dar_t* dar;
if (mmgr == ASE_NULL)
{
mmgr = ASE_MMGR_GETDFL();
ASE_ASSERTX (mmgr != ASE_NULL,
"Set the memory manager with ASE_MMGR_SETDFL()");
if (mmgr == ASE_NULL) return ASE_NULL;
}
dar = ASE_MMGR_ALLOC (mmgr, ASE_SIZEOF(ase_dar_t) + ext);
if (dar == ASE_NULL) return ASE_NULL;
return ase_dar_init (dar, mmgr, capa);
}
void ase_dar_close (ase_dar_t* dar)
{
ase_dar_fini (dar);
ASE_MMGR_FREE (dar->mmgr, dar);
}
ase_dar_t* ase_dar_init (ase_dar_t* dar, ase_mmgr_t* mmgr, ase_size_t capa)
{
ASE_MEMSET (dar, 0, ASE_SIZEOF(*dar));
dar->mmgr = mmgr;
dar->size = 0;
dar->capa = capa;
if (capa == 0) dar->buf = ASE_NULL;
else
{
dar->buf = ASE_MMGR_ALLOC (....);
if (dar->buf == ASE_NULL) return ASE_NULL;
}
return dar;
}
void ase_dar_fini (ase_dar_t* dar)
{
ase_dar_clear (dar);
if (dar->buf != ASE_NULL)
{
ASE_MMGR_FREE (dar->mmgr, dar->buf);
dar->buf = ASE_NULL;
dar->capa = 0;
}
}
ase_size_t ase_dar_getsize (ase_dar_t* dar)
{
return dar->size;
}
ase_size_t ase_dar_getcapa (ase_dar_t* dar)
{
return dar->capa;
}
ase_dar_t* ase_dar_setcapa (ase_dar_t* dar, ase_size_t capa)
{
void* tmp;
if (dar->size > capa)
{
ase_dar_delete (dar, capa, dar->size - capa);
ASE_ASSERT (dar->size <= capa);
}
if (capa > 0)
{
if (dar->awk->mmgr->realloc != ASE_NULL)
{
tmp = ASE_AWK_REALLOC (dar->awk,
dar->buf, ASE_SIZEOF(*dar->buf) * capa);
if (tmp == ASE_NULL) return ASE_NULL;
}
else
{
tmp = ASE_AWK_ALLOC (
dar->awk, ASE_SIZEOF(*dar->buf) * capa);
if (tmp == ASE_NULL) return ASE_NULL;
if (dar->buf != ASE_NULL)
{
ase_size_t x;
x = (capa > dar->capa)? dar->capa: capa;
ASE_MEMCPY (
tmp, dar->buf,
ASE_SIZEOF(*dar->buf) * x);
ASE_AWK_FREE (dar->awk, dar->buf);
}
}
}
else
{
if (dar->buf != ASE_NULL) ASE_AWK_FREE (dar->awk, dar->buf);
tmp = ASE_NULL;
}
dar->buf = tmp;
dar->capa = capa;
return dar;
}
void ase_dar_clear (ase_dar_t* dar)
{
ase_size_t i;
for (i = 0; i < dar->size; i++)
{
ASE_AWK_FREE (dar->awk, dar->buf[i].name.ptr);
dar->buf[i].name.ptr = ASE_NULL;
dar->buf[i].name.len = 0;
}
dar->size = 0;
}
ase_size_t ase_dar_insert (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len)
{
ase_size_t i;
ase_char_t* dup;
dup = ASE_AWK_STRXDUP (dar->awk, str, len);
if (dup == ASE_NULL) return (ase_size_t)-1;
if (index >= dar->capa)
{
ase_size_t capa;
if (dar->capa <= 0) capa = (index + 1);
else
{
do { capa = dar->capa * 2; } while (index >= capa);
}
if (ase_dar_setcapa(dar,capa) == ASE_NULL)
{
ASE_AWK_FREE (dar->awk, dup);
return (ase_size_t)-1;
}
}
for (i = dar->size; i > index; i--) dar->buf[i] = dar->buf[i-1];
dar->buf[index].name.ptr = dup;
dar->buf[index].name.len = len;
if (index > dar->size) dar->size = index + 1;
else dar->size++;
return index;
}
ase_size_t ase_dar_delete (
ase_dar_t* dar, ase_size_t index, ase_size_t count)
{
ase_size_t i, j, k;
if (index >= dar->size) return 0;
if (count > dar->size - index) count = dar->size - index;
i = index;
j = index + count;
k = index + count;
while (i < k)
{
ASE_AWK_FREE (dar->awk, dar->buf[i].name.ptr);
if (j >= dar->size)
{
dar->buf[i].name.ptr = ASE_NULL;
dar->buf[i].name.len = 0;
i++;
}
else
{
dar->buf[i].name.ptr = dar->buf[j].name.ptr;
dar->buf[i].name.len = dar->buf[j].name.len;
i++; j++;
}
}
dar->size -= count;
return count;
}
ase_size_t ase_dar_add (
ase_dar_t* dar, const ase_char_t* str, ase_size_t len)
{
return ase_dar_insert (dar, dar->size, str, len);
}
ase_size_t ase_dar_adduniq (
ase_dar_t* dar, const ase_char_t* str, ase_size_t len)
{
ase_size_t i;
i = ase_dar_find (dar, 0, str, len);
if (i != (ase_size_t)-1) return i; /* found. return the current index */
/* insert a new entry */
return ase_dar_insert (dar, dar->size, str, len);
}
ase_size_t ase_dar_find (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len)
{
ase_size_t i;
for (i = index; i < dar->size; i++)
{
if (ase_strxncmp (
dar->buf[i].name.ptr, dar->buf[i].name.len,
str, len) == 0) return i;
}
return (ase_size_t)-1;
}
ase_size_t ase_dar_rfind (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len)
{
ase_size_t i;
if (index >= dar->size) return (ase_size_t)-1;
for (i = index + 1; i-- > 0; )
{
if (ase_strxncmp (
dar->buf[i].name.ptr, dar->buf[i].name.len,
str, len) == 0) return i;
}
return (ase_size_t)-1;
}
ase_size_t ase_dar_rrfind (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len)
{
ase_size_t i;
if (index >= dar->size) return (ase_size_t)-1;
for (i = dar->size - index; i-- > 0; )
{
if (ase_strxncmp (
dar->buf[i].name.ptr, dar->buf[i].name.len,
str, len) == 0) return i;
}
return (ase_size_t)-1;
}
ase_size_t ase_dar_findx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg)
{
ase_size_t i;
for (i = index; i < dar->size; i++)
{
ase_cstr_t x;
x.ptr = dar->buf[i].name.ptr;
x.len = dar->buf[i].name.len;
transform (i, &x, arg);
if (ase_strxncmp (x.ptr, x.len, str, len) == 0) return i;
}
return (ase_size_t)-1;
}
ase_size_t ase_dar_rfindx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg)
{
ase_size_t i;
if (index >= dar->size) return (ase_size_t)-1;
for (i = index + 1; i-- > 0; )
{
ase_cstr_t x;
x.ptr = dar->buf[i].name.ptr;
x.len = dar->buf[i].name.len;
transform (i, &x, arg);
if (ase_strxncmp (x.ptr, x.len, str, len) == 0) return i;
}
return (ase_size_t)-1;
}
ase_size_t ase_dar_rrfindx (
ase_dar_t* dar, ase_size_t index,
const ase_char_t* str, ase_size_t len,
void(*transform)(ase_size_t, ase_cstr_t*,void*), void* arg)
{
ase_size_t i;
if (index >= dar->size) return (ase_size_t)-1;
for (i = dar->size - index; i-- > 0; )
{
ase_cstr_t x;
x.ptr = dar->buf[i].name.ptr;
x.len = dar->buf[i].name.len;
transform (i, &x, arg);
if (ase_strxncmp (x.ptr, x.len, str, len) == 0) return i;
}
return (ase_size_t)-1;
}

4
ase/lib/cmn/map.c
View File

@ -1,5 +1,5 @@
/*
* $Id: map.c 397 2008-09-29 07:11:08Z baconevi $
* $Id: map.c 404 2008-09-30 11:14:20Z baconevi $
*
* {License}
*/
@ -235,7 +235,7 @@ map_t* ase_map_init (map_t* map, mmgr_t* mmgr, size_t capa, int factor)
if (factor > 100) factor = 100;
/* do not zero out the extension */
ASE_MEMSET (map, 0, SIZEOF(map_t));
ASE_MEMSET (map, 0, SIZEOF(*map));
map->mmgr = mmgr;
map->bucket = ASE_MMGR_ALLOC (mmgr, capa*SIZEOF(pair_t*));

2
ase/lib/cmn/sll.c
View File

@ -65,7 +65,7 @@ void ase_sll_close (sll_t* sll)
sll_t* ase_sll_init (sll_t* sll, mmgr_t* mmgr)
{
/* do not zero out the extension */
ASE_MEMSET (sll, 0, ASE_SIZEOF(sll_t));
ASE_MEMSET (sll, 0, ASE_SIZEOF(*sll));
sll->mmgr = mmgr;
sll->size = 0;