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

Recovered from cvs revision 2007-11-06 07:40:00

Browse Source
This commit is contained in:
hyung-hwan 2007-11-06 18:47:00 +00:00
parent aff4713d31
commit c2fb396c2e
5 changed files with 147 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ase/awk/awk.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.c,v 1.13 2007/10/24 14:17:32 bacon Exp $ * $Id: awk.c,v 1.14 2007/11/05 14:20:47 bacon Exp $
* *
* {License} * {License}
*/ */
@ -11,7 +11,7 @@
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
static void free_kw (void* awk, void* ptr); static void free_word (void* awk, void* ptr);
static void free_afn (void* awk, void* afn); static void free_afn (void* awk, void* afn);
static void free_bfn (void* awk, void* afn); static void free_bfn (void* awk, void* afn);
@ -59,19 +59,29 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
return ASE_NULL; return ASE_NULL;
} }
awk->kwtab = ase_awk_map_open (awk, 512, 70, free_kw, awk); awk->wtab = ase_awk_map_open (awk, 512, 70, free_word, awk);
if (awk->kwtab == ASE_NULL) if (awk->wtab == ASE_NULL)
{ {
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
} }
awk->rwtab = ase_awk_map_open (awk, 512, 70, free_word, awk);
if (awk->rwtab == ASE_NULL)
{
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk);
return ASE_NULL;
}
/* TODO: initial map size?? */ /* TODO: initial map size?? */
awk->tree.afns = ase_awk_map_open (awk, 512, 70, free_afn, awk); awk->tree.afns = ase_awk_map_open (awk, 512, 70, free_afn, awk);
if (awk->tree.afns == ASE_NULL) if (awk->tree.afns == ASE_NULL)
{ {
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -80,7 +90,8 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
if (ase_awk_tab_open (&awk->parse.globals, awk) == ASE_NULL) if (ase_awk_tab_open (&awk->parse.globals, awk) == ASE_NULL)
{ {
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -90,7 +101,8 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
{ {
ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.globals);
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -101,7 +113,8 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
ase_awk_tab_close (&awk->parse.locals); ase_awk_tab_close (&awk->parse.locals);
ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.globals);
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -145,7 +158,8 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
ase_awk_tab_close (&awk->parse.locals); ase_awk_tab_close (&awk->parse.locals);
ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.globals);
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -171,7 +185,8 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
ase_awk_tab_close (&awk->parse.locals); ase_awk_tab_close (&awk->parse.locals);
ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.globals);
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
ASE_AWK_FREE (awk, awk); ASE_AWK_FREE (awk, awk);
return ASE_NULL; return ASE_NULL;
@ -180,7 +195,7 @@ ase_awk_t* ase_awk_open (const ase_awk_prmfns_t* prmfns, void* custom_data)
return awk; return awk;
} }
static void free_kw (void* owner, void* ptr) static void free_word (void* owner, void* ptr)
{ {
ASE_AWK_FREE ((ase_awk_t*)owner, ptr); ASE_AWK_FREE ((ase_awk_t*)owner, ptr);
} }
@ -214,7 +229,8 @@ int ase_awk_close (ase_awk_t* awk)
ase_awk_tab_close (&awk->parse.locals); ase_awk_tab_close (&awk->parse.locals);
ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.globals);
ase_awk_map_close (awk->tree.afns); ase_awk_map_close (awk->tree.afns);
ase_awk_map_close (awk->kwtab); ase_awk_map_close (awk->rwtab);
ase_awk_map_close (awk->wtab);
ase_str_close (&awk->token.name); ase_str_close (&awk->token.name);
for (i = 0; i < ASE_COUNTOF(awk->errstr); i++) for (i = 0; i < ASE_COUNTOF(awk->errstr); i++)

8
ase/awk/awk_i.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk_i.h,v 1.10 2007/10/28 06:12:37 bacon Exp $ * $Id: awk_i.h,v 1.11 2007/11/05 14:20:47 bacon Exp $
* *
* {License} * {License}
*/ */
@ -74,8 +74,10 @@ struct ase_awk_t
/* options */ /* options */
int option; int option;
/* keyword table */ /* word table */
ase_awk_map_t* kwtab; ase_awk_map_t* wtab;
/* reverse word table */
ase_awk_map_t* rwtab;
/* parse tree */ /* parse tree */
ase_awk_tree_t tree; ase_awk_tree_t tree;

19
ase/awk/func.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: func.c,v 1.15 2007/11/02 13:16:48 bacon Exp $ * $Id: func.c,v 1.17 2007/11/05 14:59:23 bacon Exp $
* *
* {License} * {License}
*/ */
@ -145,7 +145,7 @@ ase_awk_bfn_t* ase_awk_getbfn (
(awk->option & bfn->valid) != bfn->valid) continue; (awk->option & bfn->valid) != bfn->valid) continue;
pair = ase_awk_map_get ( pair = ase_awk_map_get (
awk->kwtab, bfn->name.ptr, bfn->name.len); awk->wtab, bfn->name.ptr, bfn->name.len);
if (pair != ASE_NULL) if (pair != ASE_NULL)
{ {
/* found in the customized word table */ /* found in the customized word table */
@ -161,10 +161,19 @@ ase_awk_bfn_t* ase_awk_getbfn (
if (ase_strxncmp (k, l, name, len) == 0) return bfn; if (ase_strxncmp (k, l, name, len) == 0) return bfn;
} }
/* no setword related operation for user-defined instrinc function pair = ase_awk_map_get (awk->rwtab, name, len);
* as the name can be decided by the user upon addition. */ if (pair != ASE_NULL)
{
k = ((ase_cstr_t*)(pair->val))->ptr;
l = ((ase_cstr_t*)(pair->val))->len;
}
else
{
k = bfn->name.ptr;
l = bfn->name.len;
}
pair = ase_awk_map_get (awk->bfn.user, name, len); pair = ase_awk_map_get (awk->bfn.user, k, l);
if (pair == ASE_NULL) return ASE_NULL; if (pair == ASE_NULL) return ASE_NULL;
bfn = (ase_awk_bfn_t*)pair->val; bfn = (ase_awk_bfn_t*)pair->val;

140
ase/awk/parse.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: parse.c,v 1.24 2007/10/26 12:49:24 bacon Exp $ * $Id: parse.c,v 1.26 2007/11/05 14:59:23 bacon Exp $
* *
* {License} * {License}
*/ */
@ -437,38 +437,72 @@ int ase_awk_setword (ase_awk_t* awk,
const ase_char_t* okw, ase_size_t olen, const ase_char_t* okw, ase_size_t olen,
const ase_char_t* nkw, ase_size_t nlen) const ase_char_t* nkw, ase_size_t nlen)
{ {
ase_cstr_t* v; ase_cstr_t* vn, * vo;
if (nkw == ASE_NULL || nlen == 0) if (nkw == ASE_NULL || nlen == 0)
{ {
ase_awk_pair_t* p;
if (okw == ASE_NULL || olen == 0) if (okw == ASE_NULL || olen == 0)
{ {
/* clear the entire table */ /* clear the entire table */
ase_awk_map_clear (awk->kwtab); ase_awk_map_clear (awk->wtab);
ase_awk_map_clear (awk->rwtab);
return 0; return 0;
} }
/* delete the word */ /* delete the word */
return ase_awk_map_remove (awk->kwtab, okw, olen); p = ase_awk_map_get (awk->wtab, okw, olen);
if (p != ASE_NULL)
{
ase_cstr_t* s = (ase_cstr_t*)p->val;
ase_awk_map_remove (awk->rwtab, s->ptr, s->len);
ase_awk_map_remove (awk->wtab, okw, olen);
return 0;
}
else
{
SETERRARG (awk, ASE_AWK_ENOENT, 0, okw, olen);
return -1;
}
} }
/* set the word */ /* set the word */
v = (ase_cstr_t*) ASE_AWK_MALLOC ( vn = (ase_cstr_t*) ASE_AWK_MALLOC (
awk, ASE_SIZEOF(ase_cstr_t)+((nlen+1)*ASE_SIZEOF(*nkw))); awk, ASE_SIZEOF(ase_cstr_t)+((nlen+1)*ASE_SIZEOF(*nkw)));
if (v == ASE_NULL) if (vn == ASE_NULL)
{ {
SETERR (awk, ASE_AWK_ENOMEM); SETERR (awk, ASE_AWK_ENOMEM);
return -1; return -1;
} }
vn->len = nlen;
vn->ptr = (const ase_char_t*)(vn + 1);
ase_strncpy ((ase_char_t*)vn->ptr, nkw, nlen);
v->len = nlen; vo = (ase_cstr_t*)ASE_AWK_MALLOC (
v->ptr = (const ase_char_t*)(v + 1); awk, ASE_SIZEOF(ase_cstr_t)+((olen+1)*ASE_SIZEOF(*okw)));
if (vo == ASE_NULL)
ase_strxncpy ((ase_char_t*)v->ptr, v->len+1, nkw, nlen);
if (ase_awk_map_put (awk->kwtab, okw, olen, v) == ASE_NULL)
{ {
ASE_AWK_FREE (awk, v); ASE_AWK_FREE (awk, vn);
SETERR (awk, ASE_AWK_ENOMEM);
return -1;
}
vo->len = olen;
vo->ptr = (const ase_char_t*)(vo + 1);
ase_strncpy ((ase_char_t*)vo->ptr, okw, olen);
if (ase_awk_map_put (awk->wtab, okw, olen, vn) == ASE_NULL)
{
ASE_AWK_FREE (awk, vo);
ASE_AWK_FREE (awk, vn);
SETERR (awk, ASE_AWK_ENOMEM);
return -1;
}
if (ase_awk_map_put (awk->rwtab, nkw, nlen, vo) == ASE_NULL)
{
ase_awk_map_remove (awk->wtab, okw, olen);
ASE_AWK_FREE (awk, vo);
SETERR (awk, ASE_AWK_ENOMEM); SETERR (awk, ASE_AWK_ENOMEM);
return -1; return -1;
} }
@ -844,6 +878,7 @@ static ase_awk_nde_t* parse_function (ase_awk_t* awk)
/* check if it coincides to be a global variable name */ /* check if it coincides to be a global variable name */
ase_size_t g; ase_size_t g;
// TODO: setword
g = ase_awk_tab_find (&awk->parse.globals, 0, name, name_len); g = ase_awk_tab_find (&awk->parse.globals, 0, name, name_len);
if (g != (ase_size_t)-1) if (g != (ase_size_t)-1)
{ {
@ -1048,13 +1083,12 @@ static ase_awk_nde_t* parse_function (ase_awk_t* awk)
} }
/* TODO: study furthur if the parameter names should be saved /* TODO: study furthur if the parameter names should be saved
* for some reasons - might be need for deparsing output */ * for some reasons - might be needed for deparsing output */
nargs = ase_awk_tab_getsize (&awk->parse.params); nargs = ase_awk_tab_getsize (&awk->parse.params);
/* parameter names are not required anymore. clear them */ /* parameter names are not required anymore. clear them */
ase_awk_tab_clear (&awk->parse.params); ase_awk_tab_clear (&awk->parse.params);
afn = (ase_awk_afn_t*) afn = (ase_awk_afn_t*) ASE_AWK_MALLOC (awk, ASE_SIZEOF(ase_awk_afn_t));
ASE_AWK_MALLOC (awk, ASE_SIZEOF(ase_awk_afn_t));
if (afn == ASE_NULL) if (afn == ASE_NULL)
{ {
ASE_AWK_FREE (awk, name_dup); ASE_AWK_FREE (awk, name_dup);
@ -2950,6 +2984,7 @@ static ase_awk_nde_t* parse_primary (ase_awk_t* awk, ase_size_t line)
return ASE_NULL; return ASE_NULL;
} }
#include <windows.h>
static ase_awk_nde_t* parse_primary_ident (ase_awk_t* awk, ase_size_t line) static ase_awk_nde_t* parse_primary_ident (ase_awk_t* awk, ase_size_t line)
{ {
ase_char_t* name_dup; ase_char_t* name_dup;
@ -3017,6 +3052,9 @@ static ase_awk_nde_t* parse_primary_ident (ase_awk_t* awk, ase_size_t line)
/* normal variable */ /* normal variable */
ase_awk_nde_var_t* nde; ase_awk_nde_var_t* nde;
ase_size_t idxa; ase_size_t idxa;
ase_awk_pair_t* pair;
const ase_char_t* k;
ase_size_t l;
nde = (ase_awk_nde_var_t*) ASE_AWK_MALLOC ( nde = (ase_awk_nde_var_t*) ASE_AWK_MALLOC (
awk, ASE_SIZEOF(ase_awk_nde_var_t)); awk, ASE_SIZEOF(ase_awk_nde_var_t));
@ -3061,29 +3099,33 @@ static ase_awk_nde_t* parse_primary_ident (ase_awk_t* awk, ase_size_t line)
return (ase_awk_nde_t*)nde; return (ase_awk_nde_t*)nde;
} }
/* search the global variable list */ /* check if the word given should be replaced */
// TODO soemthing for setword pair = ase_awk_map_get (awk->rwtab, name_dup, name_len);
//ase_awk_pair_t* pair; if (pair != ASE_NULL)
//const ase_char_t* k; {
//ase_size_t l;
//check if name_dup and name_len is part of gtab....
//if it is so...
//pair = ase_awk_map_get (awk->kwtab, name_dup, name_len);
//if (pair != ASE_NULL)
//{
/* found in the customized word table */ /* found in the customized word table */
// k = ((ase_cstr_t*)(pair->val))->ptr; k = ((ase_cstr_t*)(pair->val))->ptr;
// l = ((ase_cstr_t*)(pair->val))->len; l = ((ase_cstr_t*)(pair->val))->len;
//} }
//else else
//{ {
// k = name_dup; pair = ase_awk_map_get (awk->wtab, name_dup, name_len);
// l = name_len; if (pair != ASE_NULL)
//} {
/* found in the customized word table */
k = ((ase_cstr_t*)(pair->val))->ptr;
l = ((ase_cstr_t*)(pair->val))->len;
}
else
{
k = name_dup;
l = name_len;
}
}
idxa = ase_awk_tab_rrfind (
&awk->parse.globals, 0, name_dup, name_len); /* search the global variable list */
idxa = ase_awk_tab_rrfind (&awk->parse.globals, 0, k, l);
if (idxa != (ase_size_t)-1) if (idxa != (ase_size_t)-1)
{ {
nde->type = ASE_AWK_NDE_GLOBAL; nde->type = ASE_AWK_NDE_GLOBAL;
@ -3127,6 +3169,9 @@ static ase_awk_nde_t* parse_hashidx (
ase_awk_nde_t* idx, * tmp, * last; ase_awk_nde_t* idx, * tmp, * last;
ase_awk_nde_var_t* nde; ase_awk_nde_var_t* nde;
ase_size_t idxa; ase_size_t idxa;
ase_awk_pair_t* pair;
const ase_char_t* k;
ase_size_t l;
idx = ASE_NULL; idx = ASE_NULL;
last = ASE_NULL; last = ASE_NULL;
@ -3216,9 +3261,22 @@ static ase_awk_nde_t* parse_hashidx (
return (ase_awk_nde_t*)nde; return (ase_awk_nde_t*)nde;
} }
/* check if the word given should be replaced */
pair = ase_awk_map_get (awk->rwtab, name, name_len);
if (pair != ASE_NULL)
{
/* found in the customized word table */
k = ((ase_cstr_t*)(pair->val))->ptr;
l = ((ase_cstr_t*)(pair->val))->len;
}
else
{
k = name;
l = name_len;
}
/* search the global variable list */ /* search the global variable list */
idxa = ase_awk_tab_rrfind(&awk->parse.globals, 0, name, name_len); idxa = ase_awk_tab_rrfind(&awk->parse.globals, 0, k, l);
// TODO soemthing for setword
if (idxa != (ase_size_t)-1) if (idxa != (ase_size_t)-1)
{ {
nde->type = ASE_AWK_NDE_GLOBALIDX; nde->type = ASE_AWK_NDE_GLOBALIDX;
@ -5066,7 +5124,7 @@ static int classify_ident (
if (kwp->valid != 0 && if (kwp->valid != 0 &&
(awk->option & kwp->valid) != kwp->valid) continue; (awk->option & kwp->valid) != kwp->valid) continue;
pair = ase_awk_map_get (awk->kwtab, kwp->name, kwp->name_len); pair = ase_awk_map_get (awk->wtab, kwp->name, kwp->name_len);
if (pair != ASE_NULL) if (pair != ASE_NULL)
{ {
k = ((ase_cstr_t*)(pair->val))->ptr; k = ((ase_cstr_t*)(pair->val))->ptr;
@ -5346,7 +5404,7 @@ static int deparse_func (ase_awk_pair_t* pair, void* arg)
ASE_ASSERT (ase_strxncmp (ASE_AWK_PAIR_KEYPTR(pair), ASE_AWK_PAIR_KEYLEN(pair), afn->name, afn->name_len) == 0); ASE_ASSERT (ase_strxncmp (ASE_AWK_PAIR_KEYPTR(pair), ASE_AWK_PAIR_KEYLEN(pair), afn->name, afn->name_len) == 0);
if (ase_awk_putsrcstr (df->awk, ASE_T("function ")) == -1) return -1; if (ase_awk_putsrcstr (df->awk, ASE_T("func ")) == -1) return -1;
if (ase_awk_putsrcstr (df->awk, afn->name) == -1) return -1; if (ase_awk_putsrcstr (df->awk, afn->name) == -1) return -1;
if (ase_awk_putsrcstr (df->awk, ASE_T(" (")) == -1) return -1; if (ase_awk_putsrcstr (df->awk, ASE_T(" (")) == -1) return -1;

4
ase/test/awk/AseAwkPanel.java
View File

@ -1,5 +1,5 @@
/* /*
* $Id: AseAwkPanel.java,v 1.22 2007/11/04 05:01:41 bacon Exp $ * $Id: AseAwkPanel.java,v 1.23 2007/11/05 14:59:23 bacon Exp $
*/ */
import java.awt.*; import java.awt.*;
@ -104,11 +104,9 @@ public class AseAwkPanel extends Panel implements DropTargetListener
this.awkPanel = awkPanel; this.awkPanel = awkPanel;
addFunction ("sleep", 1, 1); addFunction ("sleep", 1, 1);
/*
setWord ("sin", "cain"); setWord ("sin", "cain");
setWord ("length", "len"); setWord ("length", "len");
setWord ("OFMT", "ofmt"); setWord ("OFMT", "ofmt");
*/
} }
public void sleep (Context ctx, String name, Return ret, Argument[] args) throws ase.awk.Exception public void sleep (Context ctx, String name, Return ret, Argument[] args) throws ase.awk.Exception