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

fixed minor bugs

Browse Source
This commit is contained in:
hyung-hwan
2008-12-16 03:56:48 +00:00
parent f675b072d6
commit 44717bbb4f
21 changed files with 171 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ase/lib/awk/Awk.cpp
View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.cpp 469 2008-12-11 10:05:28Z baconevi $
* $Id: Awk.cpp 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -1178,7 +1178,7 @@ int Awk::open ()
return -1;
}
*(Awk**)ase_map_getextension(functionMap) = this;
*(Awk**)ASE_MAP_XTN(functionMap) = this;
ase_map_setcopier (functionMap, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setfreeer (functionMap, ASE_MAP_VAL, freeFunctionMapValue);
ase_map_setscale (functionMap, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
@ -1681,7 +1681,7 @@ int Awk::functionHandler (
void Awk::freeFunctionMapValue (map_t* map, void* dptr, size_t dlen)
{
//Awk* awk = (Awk*)owner;
Awk* awk = *(Awk**)ase_map_getextension(map);
Awk* awk = *(Awk**)ASE_MAP_XTN(map);
ase_awk_free (awk->awk, dptr);
}

26
ase/lib/awk/awk.c
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.c 455 2008-11-26 09:05:00Z baconevi $
* $Id: awk.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -23,7 +23,7 @@
static void free_afn (ase_map_t* map, void* vptr, ase_size_t vlen)
{
ase_awk_t* awk = *(ase_awk_t**)ASE_MAP_EXTENSION(map);
ase_awk_t* awk = *(ase_awk_t**)ASE_MAP_XTN(map);
ase_awk_afn_t* f = (ase_awk_afn_t*)vptr;
/* f->name doesn't have to be freed */
@ -35,7 +35,7 @@ static void free_afn (ase_map_t* map, void* vptr, ase_size_t vlen)
static void free_bfn (ase_map_t* map, void* vptr, ase_size_t vlen)
{
ase_awk_t* awk = *(ase_awk_t**)ASE_MAP_EXTENSION(map);
ase_awk_t* awk = *(ase_awk_t**)ASE_MAP_XTN(map);
ase_awk_bfn_t* f = (ase_awk_bfn_t*)vptr;
ASE_AWK_FREE (awk, f);
@ -66,7 +66,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
awk->wtab = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
if (awk->wtab == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->wtab) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->wtab) = awk;
ase_map_setcopier (awk->wtab, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setcopier (awk->wtab, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
ase_map_setscale (awk->wtab, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
@ -74,7 +74,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
awk->rwtab = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
if (awk->rwtab == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->rwtab) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->rwtab) = awk;
ase_map_setcopier (awk->rwtab, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setcopier (awk->rwtab, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
ase_map_setscale (awk->rwtab, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
@ -83,21 +83,21 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
/* TODO: initial map size?? */
awk->tree.afns = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
if (awk->tree.afns == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->tree.afns) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->tree.afns) = awk;
ase_map_setcopier (awk->tree.afns, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setfreeer (awk->tree.afns, ASE_MAP_VAL, free_afn);
ase_map_setscale (awk->tree.afns, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
awk->parse.afns = ase_map_open (mmgr, ASE_SIZEOF(awk), 256, 70);
if (awk->parse.afns == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->parse.afns) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->parse.afns) = awk;
ase_map_setcopier (awk->parse.afns, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setcopier (awk->parse.afns, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
ase_map_setscale (awk->parse.afns, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
awk->parse.named = ase_map_open (mmgr, ASE_SIZEOF(awk), 256, 70);
if (awk->parse.named == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->parse.named) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->parse.named) = awk;
ase_map_setcopier (awk->parse.named, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setcopier (awk->parse.named, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
ase_map_setscale (awk->parse.named, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
@ -110,15 +110,15 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
awk->parse.locals == ASE_NULL ||
awk->parse.params == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_LDA_EXTENSION(awk->parse.globals) = awk;
*(ase_awk_t**)ASE_LDA_XTN(awk->parse.globals) = awk;
ase_lda_setcopier (awk->parse.globals, ASE_LDA_COPIER_INLINE);
ase_lda_setscale (awk->parse.globals, ASE_SIZEOF(ase_char_t));
*(ase_awk_t**)ASE_LDA_EXTENSION(awk->parse.locals) = awk;
*(ase_awk_t**)ASE_LDA_XTN(awk->parse.locals) = awk;
ase_lda_setcopier (awk->parse.locals, ASE_LDA_COPIER_INLINE);
ase_lda_setscale (awk->parse.locals, ASE_SIZEOF(ase_char_t));
*(ase_awk_t**)ASE_LDA_EXTENSION(awk->parse.params) = awk;
*(ase_awk_t**)ASE_LDA_XTN(awk->parse.params) = awk;
ase_lda_setcopier (awk->parse.params, ASE_LDA_COPIER_INLINE);
ase_lda_setscale (awk->parse.params, ASE_SIZEOF(ase_char_t));
@ -156,7 +156,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
awk->bfn.sys = ASE_NULL;
awk->bfn.user = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
if (awk->bfn.user == ASE_NULL) goto oops;
*(ase_awk_t**)ASE_MAP_EXTENSION(awk->bfn.user) = awk;
*(ase_awk_t**)ASE_MAP_XTN(awk->bfn.user) = awk;
ase_map_setcopier (awk->bfn.user, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setfreeer (awk->bfn.user, ASE_MAP_VAL, free_bfn);
ase_map_setscale (awk->bfn.user, ASE_MAP_KEY, ASE_SIZEOF(ase_char_t));
@ -304,7 +304,7 @@ int ase_awk_clear (ase_awk_t* awk)
return 0;
}
void* ase_awk_getextension (ase_awk_t* awk)
void* ase_awk_getxtn (ase_awk_t* awk)
{
return (void*)(awk + 1);
}

4
ase/lib/awk/parse.c
View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c 416 2008-10-11 14:10:25Z baconevi $
* $Id: parse.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -1433,7 +1433,7 @@ struct check_global_t
static ase_lda_walk_t check_global (ase_lda_t* lda, ase_size_t index, void* arg)
{
ase_cstr_t tmp;
ase_awk_t* awk = *(ase_awk_t**)ASE_LDA_EXTENSION(lda);
ase_awk_t* awk = *(ase_awk_t**)ASE_LDA_XTN(lda);
check_global_t* cg = (check_global_t*)arg;
tmp.ptr = ASE_LDA_DPTR(lda,index);

8
ase/lib/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c 469 2008-12-11 10:05:28Z baconevi $
* $Id: run.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -734,13 +734,13 @@ ase_bool_t ase_awk_isstop (ase_awk_run_t* run)
static void free_namedval (ase_map_t* map, void* dptr, ase_size_t dlen)
{
ase_awk_refdownval (
*(ase_awk_run_t**)ASE_MAP_EXTENSION(map), dptr);
*(ase_awk_run_t**)ASE_MAP_XTN(map), dptr);
}
static void same_namedval (ase_map_t* map, void* dptr, ase_size_t dlen)
{
ase_awk_refdownval_nofree (
*(ase_awk_run_t**)ASE_MAP_EXTENSION(map), dptr);
*(ase_awk_run_t**)ASE_MAP_XTN(map), dptr);
}
static int init_run (
@ -807,7 +807,7 @@ static int init_run (
ase_awk_seterror (awk, ASE_AWK_ENOMEM, 0, ASE_NULL, 0);
return -1;
}
*(ase_awk_run_t**)ASE_MAP_EXTENSION(run->named) = run;
*(ase_awk_run_t**)ASE_MAP_XTN(run->named) = run;
ase_map_setcopier (run->named, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
ase_map_setfreeer (run->named, ASE_MAP_VAL, free_namedval);
ase_map_setkeeper (run->named, same_namedval);

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

@ -9,11 +9,10 @@
#include <stdarg.h>
#include <ase/utl/stdio.h>
typedef struct ext_t
typedef struct xtn_t
{
ase_awk_prmfns_t prmfns;
}
ext_t;
} xtn_t;
static ase_real_t custom_awk_pow (void* custom, ase_real_t x, ase_real_t y)
{
@ -34,26 +33,25 @@ static int custom_awk_sprintf (
return n;
}
ase_awk_t* ase_awk_opensimple (void)
ase_awk_t* ase_awk_opensimple (ase_size_t xtnsize)
{
ase_awk_t* awk;
ext_t* ext;
xtn_t* xtn;
awk = ase_awk_open (ASE_MMGR_GETDFL(), ASE_SIZEOF(ext_t));
awk = ase_awk_open (ASE_MMGR_GETDFL(), xtnsize + ASE_SIZEOF(xtn_t));
ase_awk_setccls (awk, ASE_CCLS_GETDFL());
ext = (ext_t*)ase_awk_getextension(awk);
ext->prmfns.pow = custom_awk_pow;
ext->prmfns.sprintf = custom_awk_sprintf;
ext->prmfns.data = ASE_NULL;
ase_awk_setprmfns (awk, &ext->prmfns);
xtn = (xtn_t*)((ase_byte_t*)ase_awk_getxtn(awk) + xtnsize);
xtn->prmfns.pow = custom_awk_pow;
xtn->prmfns.sprintf = custom_awk_sprintf;
xtn->prmfns.data = ASE_NULL;
ase_awk_setprmfns (awk, &xtn->prmfns);
ase_awk_setoption (awk,
ASE_AWK_IMPLICIT | ASE_AWK_EXTIO | ASE_AWK_NEWLINE |
ASE_AWK_BASEONE | ASE_AWK_PABLOCK);
/*ase_awk_addfunction ();*/
return awk;
}
@ -393,8 +391,7 @@ static ase_ssize_t awk_extio_file (
else if (epa->mode == ASE_AWK_EXTIO_FILE_APPEND)
{
mode = ASE_SIO_APPEND |
ASE_SIO_CREATE |
ASE_SIO_TRUNCATE;
ASE_SIO_CREATE;
}
else return -1; /* TODO: any way to set the error number? */
@ -682,34 +679,66 @@ static ase_ssize_t awk_extio_console (
return -1;
}
int ase_awk_runsimple (ase_awk_t* awk, ase_char_t** icf)
int ase_awk_runsimple (ase_awk_t* awk, ase_char_t** icf, ase_awk_runcbs_t* cbs)
{
ase_awk_runcbs_t runcbs;
ase_awk_runios_t runios;
ase_awk_runios_t ios;
runio_data_t rd;
rd.ic.files = icf;
rd.ic.index = 0;
runios.pipe = awk_extio_pipe;
runios.file = awk_extio_file;
runios.console = awk_extio_console;
runios.data = &rd;
/*
runcbs.on_start = on_run_start;
runcbs.on_statement = on_run_statement;
runcbs.on_return = on_run_return;
runcbs.on_end = on_run_end;
runcbs.data = ASE_NULL;
*/
ios.pipe = awk_extio_pipe;
ios.file = awk_extio_file;
ios.console = awk_extio_console;
ios.data = &rd;
return ase_awk_run (
awk,
ASE_NULL/*mfn*/,
&runios,
ASE_NULL/*&runcbs*/,
&ios,
cbs,
ASE_NULL/*runarg*/,
ASE_NULL
);
}
/*** EXTRA BUILTIN FUNCTIONS ***/
#if 0
int aes_awk_func_sleep (
ase_awk_run_t* run, const ase_char_t* fnm, ase_size_t fnl)
{
ase_size_t nargs;
ase_awk_val_t* a0;
ase_long_t lv;
ase_real_t rv;
ase_awk_val_t* r;
int n;
nargs = ase_awk_getnargs (run);
ASE_ASSERT (nargs == 1);
a0 = ase_awk_getarg (run, 0);
n = ase_awk_valtonum (run, a0, &lv, &rv);
if (n == -1) return -1;
if (n == 1) lv = (ase_long_t)rv;
#ifdef _WIN32
Sleep ((DWORD)(lv * 1000));
n = 0;
#else
n = sleep (lv);
#endif
r = ase_awk_makeintval (run, n);
if (r == ASE_NULL)
{
ase_awk_setrunerrnum (run, ASE_AWK_ENOMEM);
return -1;
}
ase_awk_setretval (run, r);
return 0;
}
#endif

10
ase/lib/awk/val.c
View File

@ -1,5 +1,5 @@
/*
* $Id: val.c 468 2008-12-10 10:19:59Z baconevi $
* $Id: val.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -430,7 +430,7 @@ static void same_mapval (void* run, void* v)
*/
static void free_mapval (ase_map_t* map, void* dptr, ase_size_t dlen)
{
ase_awk_run_t* run = *(ase_awk_run_t**)ASE_MAP_EXTENSION(map);
ase_awk_run_t* run = *(ase_awk_run_t**)ASE_MAP_XTN(map);
#ifdef DEBUG_VAL
ase_dprintf (ASE_T("refdown in map free..."));
@ -443,7 +443,7 @@ static void free_mapval (ase_map_t* map, void* dptr, ase_size_t dlen)
static void same_mapval (ase_map_t* map, void* dptr, ase_size_t dlen)
{
ase_awk_run_t* run = *(ase_awk_run_t**)ASE_MAP_EXTENSION(map);
ase_awk_run_t* run = *(ase_awk_run_t**)ASE_MAP_XTN(map);
#ifdef DEBUG_VAL
ase_dprintf (ASE_T("refdown nofree in map free..."));
ase_awk_dprintval (run, dptr);
@ -501,7 +501,7 @@ ase_awk_val_t* ase_awk_makemapval (ase_awk_run_t* run)
ase_awk_setrunerrnum (run, ASE_AWK_ENOMEM);
return ASE_NULL;
}
*(ase_awk_run_t**)ASE_MAP_EXTENSION(val->map) = run;
*(ase_awk_run_t**)ASE_MAP_XTN(val->map) = run;
/* the key is copied inline into a pair and is freed when the pair
* is destroyed */
@ -1141,7 +1141,7 @@ static ase_map_walk_t print_pair (
{
ase_awk_run_t* run = (ase_awk_run_t*)arg;
ASE_ASSERT (run == *(ase_awk_run_t**)ASE_MAP_EXTENSION(map));
ASE_ASSERT (run == *(ase_awk_run_t**)ASE_MAP_XTN(map));
DPRINTF (DCUSTOM, ASE_T(" %.*s=>"),
(int)ASE_MAP_KLEN(pair), ASE_MAP_KPTR(pair));

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

@ -43,7 +43,7 @@ void ase_dll_clear (ase_dll_t* dll)
ASE_ASSERT (dll->tail == ASE_NULL);
}
void* ase_dll_getextension (ase_dll_t* dll)
void* ase_dll_getxtn (ase_dll_t* dll)
{
return dll + 1;
}

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

@ -139,7 +139,7 @@ void ase_lda_fini (lda_t* lda)
}
}
void* ase_lda_getextension (lda_t* lda)
void* ase_lda_getxtn (lda_t* lda)
{
return lda + 1;
}

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

@ -1,5 +1,5 @@
/*
* $Id: map.c 483 2008-12-14 13:25:42Z baconevi $
* $Id: map.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -274,7 +274,7 @@ void ase_map_fini (map_t* map)
ASE_MMGR_FREE (map->mmgr, map->bucket);
}
void* ase_map_getextension (map_t* map)
void* ase_map_getxtn (map_t* map)
{
return map + 1;
}

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

@ -125,7 +125,7 @@ void ase_sll_fini (sll_t* sll)
ase_sll_clear (sll);
}
void* ase_sll_getextension (sll_t* sll)
void* ase_sll_getxtn (sll_t* sll)
{
return sll + 1;
}

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

@ -1,5 +1,5 @@
/*
* $Id: str_dyn.c 379 2008-09-24 08:06:56Z baconevi $
* $Id: str_dyn.c 496 2008-12-15 09:56:48Z baconevi $
*
* {License}
*/
@ -92,7 +92,7 @@ int ase_str_yield (ase_str_t* str, ase_xstr_t* buf, int new_capa)
return 0;
}
void* ase_str_getextension (ase_str_t* str)
void* ase_str_getxtn (ase_str_t* str)
{
return str + 1;
}

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

@ -69,7 +69,7 @@ int ase_tio_fini (ase_tio_t* tio)
return 0;
}
void* ase_tio_getextension (ase_tio_t* tio)
void* ase_tio_getxtn (ase_tio_t* tio)
{
return tio + 1;
}