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

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2006-09-10 15:50:34 +00:00
parent 34d3ce3590
commit 835615cc97
11 changed files with 392 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ase/awk/awk.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.h,v 1.113 2006-09-09 04:52:39 bacon Exp $ * $Id: awk.h,v 1.114 2006-09-10 15:50:34 bacon Exp $
*/ */
#ifndef _XP_AWK_AWK_H_ #ifndef _XP_AWK_AWK_H_
@ -375,6 +375,11 @@ int xp_awk_strxncmp (
const xp_char_t* s1, xp_size_t len1, const xp_char_t* s1, xp_size_t len1,
const xp_char_t* s2, xp_size_t len2); const xp_char_t* s2, xp_size_t len2);
int xp_awk_strxncasecmp (
xp_awk_t* awk,
const xp_char_t* s1, xp_size_t len1,
const xp_char_t* s2, xp_size_t len2);
xp_char_t* xp_awk_strxnstr ( xp_char_t* xp_awk_strxnstr (
const xp_char_t* str, xp_size_t strsz, const xp_char_t* str, xp_size_t strsz,
const xp_char_t* sub, xp_size_t subsz); const xp_char_t* sub, xp_size_t subsz);

3
ase/awk/extio.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: extio.c,v 1.46 2006-09-05 04:10:23 bacon Exp $ * $Id: extio.c,v 1.47 2006-09-10 15:50:34 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -292,6 +292,7 @@ int xp_awk_readextio (
/* TODO: safematchrex */ /* TODO: safematchrex */
n = xp_awk_matchrex ( n = xp_awk_matchrex (
run->awk, run->rex.rs, run->awk, run->rex.rs,
((run->rex.ignorecase)? XP_AWK_REX_IGNORECASE: 0),
XP_AWK_STR_BUF(buf), XP_AWK_STR_LEN(buf), XP_AWK_STR_BUF(buf), XP_AWK_STR_LEN(buf),
&match_ptr, &match_len, &run->errnum); &match_ptr, &match_len, &run->errnum);
if (n == -1) if (n == -1)

30
ase/awk/misc.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: misc.c,v 1.18 2006-09-09 04:52:40 bacon Exp $ * $Id: misc.c,v 1.19 2006-09-10 15:50:34 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -449,6 +449,28 @@ int xp_awk_strxncmp (
return (*s1 > *s2)? 1: -1; return (*s1 > *s2)? 1: -1;
} }
int xp_awk_strxncasecmp (
xp_awk_t* awk,
const xp_char_t* s1, xp_size_t len1,
const xp_char_t* s2, xp_size_t len2)
{
xp_char_t c1, c2;
const xp_char_t* end1 = s1 + len1;
const xp_char_t* end2 = s2 + len2;
c1 = XP_AWK_TOUPPER (awk, *s1);
c2 = XP_AWK_TOUPPER (awk, *s2);
while (s1 < end1 && s2 < end2 && c1 == c2)
{
s1++, s2++;
c1 = XP_AWK_TOUPPER (awk, *s1);
c2 = XP_AWK_TOUPPER (awk, *s2);
}
if (s1 == end1 && s2 == end2) return 0;
if (c1 == c2) return (s1 < end1)? 1: -1;
return (c1 > c2)? 1: -1;
}
xp_char_t* xp_awk_strxnstr ( xp_char_t* xp_awk_strxnstr (
const xp_char_t* str, xp_size_t strsz, const xp_char_t* str, xp_size_t strsz,
const xp_char_t* sub, xp_size_t subsz) const xp_char_t* sub, xp_size_t subsz)
@ -704,12 +726,12 @@ xp_char_t* xp_awk_strxntokbyrex (
const xp_char_t* str_ptr = s; const xp_char_t* str_ptr = s;
xp_size_t str_len = len; xp_size_t str_len = len;
xp_printf (XP_T("ignorecase = %d\n"), run->rex.ignorecase);
while (len > 0) while (len > 0)
{ {
n = xp_awk_matchrex ( n = xp_awk_matchrex (
run->awk, rex, ptr, left, run->awk, rex,
&match_ptr, &match_len, errnum); ((run->rex.ignorecase)? XP_AWK_REX_IGNORECASE: 0),
ptr, left, &match_ptr, &match_len, errnum);
if (n == -1) return XP_NULL; if (n == -1) return XP_NULL;
if (n == 0) if (n == 0)
{ {

58
ase/awk/rex.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: rex.c,v 1.28 2006-09-05 15:18:16 bacon Exp $ * $Id: rex.c,v 1.29 2006-09-10 15:50:34 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -122,6 +122,7 @@ struct __matcher_t
int cur; int cur;
} depth; } depth;
int ignorecase;
int errnum; int errnum;
}; };
@ -193,7 +194,6 @@ static const xp_byte_t* __match_occurrences (
static xp_bool_t __test_charset ( static xp_bool_t __test_charset (
__matcher_t* matcher, const xp_byte_t* p, xp_size_t csc, xp_char_t c); __matcher_t* matcher, const xp_byte_t* p, xp_size_t csc, xp_char_t c);
#ifndef XP_AWK_NTDDK
static xp_bool_t __cc_isalnum (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isalnum (xp_awk_t* awk, xp_char_t c);
static xp_bool_t __cc_isalpha (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isalpha (xp_awk_t* awk, xp_char_t c);
static xp_bool_t __cc_isblank (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isblank (xp_awk_t* awk, xp_char_t c);
@ -206,13 +206,11 @@ static xp_bool_t __cc_ispunct (xp_awk_t* awk, xp_char_t c);
static xp_bool_t __cc_isspace (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isspace (xp_awk_t* awk, xp_char_t c);
static xp_bool_t __cc_isupper (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isupper (xp_awk_t* awk, xp_char_t c);
static xp_bool_t __cc_isxdigit (xp_awk_t* awk, xp_char_t c); static xp_bool_t __cc_isxdigit (xp_awk_t* awk, xp_char_t c);
#endif
static const xp_byte_t* __print_pattern (const xp_byte_t* p); static const xp_byte_t* __print_pattern (const xp_byte_t* p);
static const xp_byte_t* __print_branch (const xp_byte_t* p); static const xp_byte_t* __print_branch (const xp_byte_t* p);
static const xp_byte_t* __print_atom (const xp_byte_t* p); static const xp_byte_t* __print_atom (const xp_byte_t* p);
#ifndef XP_AWK_NTDDK
struct __char_class_t struct __char_class_t
{ {
const xp_char_t* name; const xp_char_t* name;
@ -246,7 +244,6 @@ static struct __char_class_t __char_class[] =
{ XP_NULL, 0, XP_NULL } { XP_NULL, 0, XP_NULL }
}; };
#endif
void* xp_awk_buildrex ( void* xp_awk_buildrex (
xp_awk_t* awk, const xp_char_t* ptn, xp_size_t len, int* errnum) xp_awk_t* awk, const xp_char_t* ptn, xp_size_t len, int* errnum)
@ -301,7 +298,7 @@ void* xp_awk_buildrex (
} }
int xp_awk_matchrex ( int xp_awk_matchrex (
xp_awk_t* awk, void* code, xp_awk_t* awk, void* code, int option,
const xp_char_t* str, xp_size_t len, const xp_char_t* str, xp_size_t len,
const xp_char_t** match_ptr, xp_size_t* match_len, int* errnum) const xp_char_t** match_ptr, xp_size_t* match_len, int* errnum)
{ {
@ -320,6 +317,8 @@ int xp_awk_matchrex (
matcher.depth.max = awk->max_depth; */ matcher.depth.max = awk->max_depth; */
matcher.depth.max = 0; matcher.depth.max = 0;
matcher.depth.cur = 0; matcher.depth.cur = 0;
// TODO: set it to a good value
matcher.ignorecase = (option & XP_AWK_REX_IGNORECASE)? 1: 0;
mat.matched = xp_false; mat.matched = xp_false;
/* TODO: should it allow an offset here??? */ /* TODO: should it allow an offset here??? */
@ -1208,10 +1207,26 @@ static const xp_byte_t* __match_ord_char (
ubound = cp->ubound; ubound = cp->ubound;
cc = *(xp_char_t*)p; p += xp_sizeof(cc); cc = *(xp_char_t*)p; p += xp_sizeof(cc);
if (matcher->ignorecase) cc = XP_AWK_TOUPPER(matcher->awk, cc);
/* merge the same consecutive codes /* merge the same consecutive codes
* for example, a{1,10}a{0,10} is shortened to a{1,20} * for example, a{1,10}a{0,10} is shortened to a{1,20}
*/ */
if (matcher->ignorecase)
{
while (p < mat->branch_end &&
cp->cmd == ((const struct __code_t*)p)->cmd)
{
if (XP_AWK_TOUPPER (matcher->awk, *(xp_char_t*)(p+xp_sizeof(*cp))) != cc) break;
lbound += ((const struct __code_t*)p)->lbound;
ubound += ((const struct __code_t*)p)->ubound;
p += xp_sizeof(*cp) + xp_sizeof(cc);
}
}
else
{
while (p < mat->branch_end && while (p < mat->branch_end &&
cp->cmd == ((const struct __code_t*)p)->cmd) cp->cmd == ((const struct __code_t*)p)->cmd)
{ {
@ -1222,6 +1237,7 @@ static const xp_byte_t* __match_ord_char (
p += xp_sizeof(*cp) + xp_sizeof(cc); p += xp_sizeof(*cp) + xp_sizeof(cc);
} }
}
//xp_printf (XP_T("lbound = %u, ubound = %u\n"), //xp_printf (XP_T("lbound = %u, ubound = %u\n"),
//(unsigned int)lbound, (unsigned int)ubound); //(unsigned int)lbound, (unsigned int)ubound);
@ -1230,12 +1246,24 @@ static const xp_byte_t* __match_ord_char (
mat->match_len = 0; mat->match_len = 0;
/* find the longest match */ /* find the longest match */
if (matcher->ignorecase)
{
while (si < ubound)
{
if (&mat->match_ptr[si] >= matcher->match.str.end) break;
if (cc != XP_AWK_TOUPPER (matcher->awk, mat->match_ptr[si])) break;
si++;
}
}
else
{
while (si < ubound) while (si < ubound)
{ {
if (&mat->match_ptr[si] >= matcher->match.str.end) break; if (&mat->match_ptr[si] >= matcher->match.str.end) break;
if (cc != mat->match_ptr[si]) break; if (cc != mat->match_ptr[si]) break;
si++; si++;
} }
}
//xp_printf (XP_T("max si = %d, lbound = %u, ubound = %u\n"), si, lbound, ubound); //xp_printf (XP_T("max si = %d, lbound = %u, ubound = %u\n"), si, lbound, ubound);
if (si >= lbound && si <= ubound) if (si >= lbound && si <= ubound)
@ -1253,6 +1281,7 @@ static const xp_byte_t* __match_charset (
const struct __code_t* cp; const struct __code_t* cp;
xp_size_t si = 0, lbound, ubound, csc, csl; xp_size_t si = 0, lbound, ubound, csc, csl;
xp_bool_t n; xp_bool_t n;
xp_char_t c;
cp = (const struct __code_t*)p; p += xp_sizeof(*cp); cp = (const struct __code_t*)p; p += xp_sizeof(*cp);
xp_assert (cp->cmd == CMD_CHARSET); xp_assert (cp->cmd == CMD_CHARSET);
@ -1270,7 +1299,10 @@ static const xp_byte_t* __match_charset (
{ {
if (&mat->match_ptr[si] >= matcher->match.str.end) break; if (&mat->match_ptr[si] >= matcher->match.str.end) break;
n = __test_charset (matcher, p, csc, mat->match_ptr[si]); c = mat->match_ptr[si];
if (matcher->ignorecase) c = XP_AWK_TOUPPER(matcher->awk, c);
n = __test_charset (matcher, p, csc, c);
if (cp->negate) n = !n; if (cp->negate) n = !n;
if (!n) break; if (!n) break;
@ -1518,6 +1550,8 @@ xp_bool_t __test_charset (
if (c0 == CHARSET_ONE) if (c0 == CHARSET_ONE)
{ {
c1 = *(xp_char_t*)p; c1 = *(xp_char_t*)p;
if (matcher->ignorecase)
c1 = XP_AWK_TOUPPER(matcher->awk, c1);
if (c == c1) return xp_true; if (c == c1) return xp_true;
} }
else if (c0 == CHARSET_RANGE) else if (c0 == CHARSET_RANGE)
@ -1526,16 +1560,19 @@ xp_bool_t __test_charset (
p += xp_sizeof(c1); p += xp_sizeof(c1);
c2 = *(xp_char_t*)p; c2 = *(xp_char_t*)p;
if (matcher->ignorecase)
{
c1 = XP_AWK_TOUPPER(matcher->awk, c1);
c2 = XP_AWK_TOUPPER(matcher->awk, c2);
}
if (c >= c1 && c <= c2) return xp_true; if (c >= c1 && c <= c2) return xp_true;
} }
#ifndef XP_AWK_NTDDK
else if (c0 == CHARSET_CLASS) else if (c0 == CHARSET_CLASS)
{ {
c1 = *(xp_char_t*)p; c1 = *(xp_char_t*)p;
if (__char_class[c1].func ( if (__char_class[c1].func (
matcher->awk, c)) return xp_true; matcher->awk, c)) return xp_true;
} }
#endif
else else
{ {
xp_assert (!"should never happen - invalid charset code"); xp_assert (!"should never happen - invalid charset code");
@ -1548,8 +1585,6 @@ xp_bool_t __test_charset (
return xp_false; return xp_false;
} }
#ifndef XP_AWK_NTDDK
static xp_bool_t __cc_isalnum (xp_awk_t* awk, xp_char_t c) static xp_bool_t __cc_isalnum (xp_awk_t* awk, xp_char_t c)
{ {
return XP_AWK_ISALNUM (awk, c); return XP_AWK_ISALNUM (awk, c);
@ -1746,4 +1781,3 @@ static const xp_byte_t* __print_atom (const xp_byte_t* p)
return p; return p;
} }
#endif

9
ase/awk/rex.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: rex.h,v 1.15 2006-09-01 03:44:16 bacon Exp $ * $Id: rex.h,v 1.16 2006-09-10 15:50:34 bacon Exp $
**/ **/
#ifndef _XP_AWK_REX_H_ #ifndef _XP_AWK_REX_H_
@ -42,6 +42,11 @@
#define XP_AWK_REX_LEN(code) \ #define XP_AWK_REX_LEN(code) \
(*(xp_size_t*)((xp_byte_t*)(code)+xp_sizeof(xp_size_t))) (*(xp_size_t*)((xp_byte_t*)(code)+xp_sizeof(xp_size_t)))
enum xp_awk_rex_option_t
{
XP_AWK_REX_IGNORECASE = (1 << 0)
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -51,7 +56,7 @@ void* xp_awk_buildrex (
xp_size_t len, int* errnum); xp_size_t len, int* errnum);
int xp_awk_matchrex ( int xp_awk_matchrex (
xp_awk_t* awk, void* code, xp_awk_t* awk, void* code, int option,
const xp_char_t* str, xp_size_t len, const xp_char_t* str, xp_size_t len,
const xp_char_t** match_ptr, xp_size_t* match_len, int* errnum); const xp_char_t** match_ptr, xp_size_t* match_len, int* errnum);

233
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.198 2006-09-08 15:26:49 bacon Exp $ * $Id: run.c,v 1.199 2006-09-10 15:50:34 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -181,6 +181,7 @@ static int __split_record (xp_awk_run_t* run);
static int __clear_record (xp_awk_run_t* run, xp_bool_t noline); static int __clear_record (xp_awk_run_t* run, xp_bool_t noline);
static int __recomp_record_fields ( static int __recomp_record_fields (
xp_awk_run_t* run, xp_size_t lv, xp_char_t* str, xp_size_t len); xp_awk_run_t* run, xp_size_t lv, xp_char_t* str, xp_size_t len);
static int __shorten_record (xp_awk_run_t* run, xp_size_t nflds);
static xp_char_t* __idxnde_to_str ( static xp_char_t* __idxnde_to_str (
xp_awk_run_t* run, xp_awk_nde_t* nde, xp_size_t* len); xp_awk_run_t* run, xp_awk_nde_t* nde, xp_size_t* len);
@ -348,8 +349,22 @@ int xp_awk_setglobal (void* run, xp_size_t idx, xp_awk_val_t* val)
((xp_awk_run_t*)run)->rex.ignorecase = 1; ((xp_awk_run_t*)run)->rex.ignorecase = 1;
} }
} }
else if (idx == XP_AWK_GLOBAL_NF)
{
int n;
xp_long_t lv;
xp_real_t rv;
/* TODO: if idx == XP_AWK_GLOBAL_NF recompute $0, etc */ /* TODO: need to recompute $0, etc */
n = xp_awk_valtonum (run, val, &lv, &rv);
if (n == -1) return -1;
if (n == 1) lv = (xp_long_t)rv;
if (lv < r->inrec.nflds)
{
if (__shorten_record (r, (xp_size_t)lv) == -1) return -1;
}
}
xp_awk_refdownval (run, old); xp_awk_refdownval (run, old);
STACK_GLOBAL((xp_awk_run_t*)run,idx) = val; STACK_GLOBAL((xp_awk_run_t*)run,idx) = val;
@ -1932,6 +1947,7 @@ static xp_awk_val_t* __eval_expression (xp_awk_run_t* run, xp_awk_nde_t* nde)
n = xp_awk_matchrex ( n = xp_awk_matchrex (
((xp_awk_run_t*)run)->awk, ((xp_awk_run_t*)run)->awk,
((xp_awk_val_rex_t*)v)->code, ((xp_awk_val_rex_t*)v)->code,
((((xp_awk_run_t*)run)->rex.ignorecase)? XP_AWK_REX_IGNORECASE: 0),
((xp_awk_val_str_t*)run->inrec.d0)->buf, ((xp_awk_val_str_t*)run->inrec.d0)->buf,
((xp_awk_val_str_t*)run->inrec.d0)->len, ((xp_awk_val_str_t*)run->inrec.d0)->len,
XP_NULL, XP_NULL, &errnum); XP_NULL, XP_NULL, &errnum);
@ -2761,6 +2777,17 @@ static xp_awk_val_t* __eval_binop_eq (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) == 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -2768,6 +2795,7 @@ static xp_awk_val_t* __eval_binop_eq (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) == 0; ((xp_awk_val_str_t*)right)->len) == 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -2816,6 +2844,17 @@ static xp_awk_val_t* __eval_binop_ne (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) != 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -2823,6 +2862,7 @@ static xp_awk_val_t* __eval_binop_ne (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) != 0; ((xp_awk_val_str_t*)right)->len) != 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -2865,6 +2905,17 @@ static xp_awk_val_t* __eval_binop_gt (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) > 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -2872,6 +2923,7 @@ static xp_awk_val_t* __eval_binop_gt (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) > 0; ((xp_awk_val_str_t*)right)->len) > 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -2914,6 +2966,17 @@ static xp_awk_val_t* __eval_binop_ge (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) >= 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -2921,6 +2984,7 @@ static xp_awk_val_t* __eval_binop_ge (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) >= 0; ((xp_awk_val_str_t*)right)->len) >= 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -2963,6 +3027,17 @@ static xp_awk_val_t* __eval_binop_lt (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) < 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -2970,6 +3045,7 @@ static xp_awk_val_t* __eval_binop_lt (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) < 0; ((xp_awk_val_str_t*)right)->len) < 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -3012,6 +3088,17 @@ static xp_awk_val_t* __eval_binop_le (
} }
else if (left->type == XP_AWK_VAL_STR && else if (left->type == XP_AWK_VAL_STR &&
right->type == XP_AWK_VAL_STR) right->type == XP_AWK_VAL_STR)
{
if (run->rex.ignorecase)
{
r = xp_awk_strxncasecmp (
run->awk,
((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len,
((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) <= 0;
}
else
{ {
r = xp_awk_strxncmp ( r = xp_awk_strxncmp (
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
@ -3019,6 +3106,7 @@ static xp_awk_val_t* __eval_binop_le (
((xp_awk_val_str_t*)right)->buf, ((xp_awk_val_str_t*)right)->buf,
((xp_awk_val_str_t*)right)->len) <= 0; ((xp_awk_val_str_t*)right)->len) <= 0;
} }
}
else else
{ {
PANIC (run, XP_AWK_EOPERAND); PANIC (run, XP_AWK_EOPERAND);
@ -3398,6 +3486,7 @@ static xp_awk_val_t* __eval_binop_match0 (
{ {
n = xp_awk_matchrex ( n = xp_awk_matchrex (
run->awk, rex_code, run->awk, rex_code,
((run->rex.ignorecase)? XP_AWK_REX_IGNORECASE: 0),
((xp_awk_val_str_t*)left)->buf, ((xp_awk_val_str_t*)left)->buf,
((xp_awk_val_str_t*)left)->len, ((xp_awk_val_str_t*)left)->len,
XP_NULL, XP_NULL, &errnum); XP_NULL, XP_NULL, &errnum);
@ -3428,6 +3517,7 @@ static xp_awk_val_t* __eval_binop_match0 (
n = xp_awk_matchrex ( n = xp_awk_matchrex (
run->awk, rex_code, run->awk, rex_code,
((run->rex.ignorecase)? XP_AWK_REX_IGNORECASE: 0),
str, len, XP_NULL, XP_NULL, &errnum); str, len, XP_NULL, XP_NULL, &errnum);
if (n == -1) if (n == -1)
{ {
@ -4930,7 +5020,7 @@ static int __recomp_record_fields (
xp_awk_run_t* run, xp_size_t lv, xp_char_t* str, xp_size_t len) xp_awk_run_t* run, xp_size_t lv, xp_char_t* str, xp_size_t len)
{ {
xp_awk_val_t* v; xp_awk_val_t* v;
xp_char_t* ofsp = XP_NULL, * ofs; xp_char_t* ofs_free = XP_NULL, * ofs;
xp_size_t ofs_len; xp_size_t ofs_len;
xp_size_t max, i, nflds; xp_size_t max, i, nflds;
@ -4981,21 +5071,27 @@ static int __recomp_record_fields (
if (max > 1) if (max > 1)
{ {
v = STACK_GLOBAL(run, XP_AWK_GLOBAL_OFS); v = STACK_GLOBAL(run, XP_AWK_GLOBAL_OFS);
if (v != xp_awk_val_nil) xp_awk_refupval (v);
{
ofsp = xp_awk_valtostr (
run, v, xp_true, XP_NULL, &ofs_len);
if (ofsp == XP_NULL) return -1;
ofs = ofsp; if (v == xp_awk_val_nil)
}
else
{ {
/* OFS not set */ /* OFS not set */
ofs = XP_T(" "); ofs = XP_T(" ");
ofs_len = 1; ofs_len = 1;
} }
else if (v->type == XP_AWK_VAL_STR)
{
ofs = ((xp_awk_val_str_t*)v)->buf;
ofs_len = ((xp_awk_val_str_t*)v)->len;
}
else
{
ofs = xp_awk_valtostr (
run, v, xp_true, XP_NULL, &ofs_len);
if (ofs == XP_NULL) return -1;
ofs_free = ofs;
}
} }
for (i = 0; i < max; i++) for (i = 0; i < max; i++)
@ -5006,7 +5102,9 @@ static int __recomp_record_fields (
&run->inrec.line, &run->inrec.line,
ofs, ofs_len) == (xp_size_t)-1) ofs, ofs_len) == (xp_size_t)-1)
{ {
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM; run->errnum = XP_AWK_ENOMEM;
return -1; return -1;
} }
@ -5024,7 +5122,9 @@ static int __recomp_record_fields (
if (xp_awk_str_ncat ( if (xp_awk_str_ncat (
&run->inrec.line, str, len) == (xp_size_t)-1) &run->inrec.line, str, len) == (xp_size_t)-1)
{ {
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM; run->errnum = XP_AWK_ENOMEM;
return -1; return -1;
} }
@ -5032,7 +5132,9 @@ static int __recomp_record_fields (
tmp = xp_awk_makestrval (run, str,len); tmp = xp_awk_makestrval (run, str,len);
if (tmp == XP_NULL) if (tmp == XP_NULL)
{ {
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM; run->errnum = XP_AWK_ENOMEM;
return -1; return -1;
} }
@ -5053,7 +5155,9 @@ static int __recomp_record_fields (
if (xp_awk_str_cat ( if (xp_awk_str_cat (
&run->inrec.line, XP_T("")) == (xp_size_t)-1) &run->inrec.line, XP_T("")) == (xp_size_t)-1)
{ {
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM; run->errnum = XP_AWK_ENOMEM;
return -1; return -1;
} }
@ -5080,14 +5184,17 @@ static int __recomp_record_fields (
if (xp_awk_str_ncat (&run->inrec.line, if (xp_awk_str_ncat (&run->inrec.line,
tmp->buf, tmp->len) == (xp_size_t)-1) tmp->buf, tmp->len) == (xp_size_t)-1)
{ {
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM; run->errnum = XP_AWK_ENOMEM;
return -1; return -1;
} }
} }
} }
if (ofsp != XP_NULL) XP_AWK_FREE (run->awk, ofsp); if (ofs_free != XP_NULL) XP_AWK_FREE (run->awk, ofs_free);
if (max > 1) xp_awk_refdownval (run, v);
v = STACK_GLOBAL(run, XP_AWK_GLOBAL_NF); v = STACK_GLOBAL(run, XP_AWK_GLOBAL_NF);
xp_assert (v->type == XP_AWK_VAL_INT); xp_assert (v->type == XP_AWK_VAL_INT);
@ -5107,6 +5214,98 @@ static int __recomp_record_fields (
return 0; return 0;
} }
static int __shorten_record (xp_awk_run_t* run, xp_size_t nflds)
{
xp_awk_val_t* v;
xp_char_t* ofs_free = XP_NULL, * ofs;
xp_size_t ofs_len, i;
xp_awk_str_t tmp;
xp_assert (nflds <= run->inrec.nflds);
if (nflds > 1)
{
v = STACK_GLOBAL(run, XP_AWK_GLOBAL_OFS);
xp_awk_refupval (v);
if (v == xp_awk_val_nil)
{
/* OFS not set */
ofs = XP_T(" ");
ofs_len = 1;
}
else if (v->type == XP_AWK_VAL_STR)
{
ofs = ((xp_awk_val_str_t*)v)->buf;
ofs_len = ((xp_awk_val_str_t*)v)->len;
}
else
{
ofs = xp_awk_valtostr (
run, v, xp_true, XP_NULL, &ofs_len);
if (ofs == XP_NULL) return -1;
ofs_free = ofs;
}
}
if (xp_awk_str_open (&tmp,
XP_AWK_STR_LEN(&run->inrec.line), run->awk) == XP_NULL)
{
run->errnum = XP_AWK_ENOMEM;
return -1;
}
for (i = 0; i < nflds; i++)
{
if (i > 0 && xp_awk_str_ncat (&tmp, ofs, ofs_len) == (xp_size_t)-1)
{
if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (nflds > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM;
return -1;
}
if (xp_awk_str_ncat (&tmp,
run->inrec.flds[i].ptr,
run->inrec.flds[i].len) == (xp_size_t)-1)
{
if (ofs_free != XP_NULL)
XP_AWK_FREE (run->awk, ofs_free);
if (nflds > 1) xp_awk_refdownval (run, v);
run->errnum = XP_AWK_ENOMEM;
return -1;
}
}
if (ofs_free != XP_NULL) XP_AWK_FREE (run->awk, ofs_free);
if (nflds > 1) xp_awk_refdownval (run, v);
v = (xp_awk_val_t*) xp_awk_makestrval (
run, XP_AWK_STR_BUF(&tmp), XP_AWK_STR_LEN(&tmp));
if (v == XP_NULL)
{
run->errnum = XP_AWK_ENOMEM;
return -1;
}
xp_awk_refdownval (run, run->inrec.d0);
run->inrec.d0 = v;
xp_awk_refupval (run->inrec.d0);
xp_awk_str_swap (&tmp, &run->inrec.line);
xp_awk_str_close (&tmp);
for (i = nflds; i < run->inrec.nflds; i++)
{
xp_awk_refdownval (run, run->inrec.flds[i].val);
}
run->inrec.nflds = nflds;
return 0;
}
static xp_char_t* __idxnde_to_str ( static xp_char_t* __idxnde_to_str (
xp_awk_run_t* run, xp_awk_nde_t* nde, xp_size_t* len) xp_awk_run_t* run, xp_awk_nde_t* nde, xp_size_t* len)
{ {

22
ase/awk/str.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: str.c,v 1.3 2006-09-01 07:18:40 bacon Exp $ * $Id: str.c,v 1.4 2006-09-10 15:50:34 bacon Exp $
*/ */
#include <xp/awk/awk_i.h> #include <xp/awk/awk_i.h>
@ -47,6 +47,26 @@ void xp_awk_str_forfeit (xp_awk_str_t* str)
if (str->__dynamic) XP_AWK_FREE (str->awk, str); if (str->__dynamic) XP_AWK_FREE (str->awk, str);
} }
void xp_awk_str_swap (xp_awk_str_t* str, xp_awk_str_t* str1)
{
xp_awk_str_t tmp;
tmp.buf = str->buf;
tmp.size = str->size;
tmp.capa = str->capa;
tmp.awk = str->awk;
str->buf = str1->buf;
str->size = str1->size;
str->capa = str1->capa;
str->awk = str1->awk;
str1->buf = tmp.buf;
str1->size = tmp.size;
str1->capa = tmp.capa;
str1->awk = tmp.awk;
}
xp_size_t xp_awk_str_cpy (xp_awk_str_t* str, const xp_char_t* s) xp_size_t xp_awk_str_cpy (xp_awk_str_t* str, const xp_char_t* s)
{ {
/* TODO: improve it */ /* TODO: improve it */

3
ase/awk/str.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: str.h,v 1.1 2006-08-31 16:00:20 bacon Exp $ * $Id: str.h,v 1.2 2006-09-10 15:50:34 bacon Exp $
*/ */
#ifndef _XP_AWK_STR_H_ #ifndef _XP_AWK_STR_H_
@ -36,6 +36,7 @@ xp_awk_str_t* xp_awk_str_open (
void xp_awk_str_close (xp_awk_str_t* str); void xp_awk_str_close (xp_awk_str_t* str);
void xp_awk_str_forfeit (xp_awk_str_t* str); void xp_awk_str_forfeit (xp_awk_str_t* str);
void xp_awk_str_swap (xp_awk_str_t* str, xp_awk_str_t* str2);
xp_size_t xp_awk_str_cpy (xp_awk_str_t* str, const xp_char_t* s); xp_size_t xp_awk_str_cpy (xp_awk_str_t* str, const xp_char_t* s);

9
ase/test/awk/t40.awk Normal file
View File

@ -0,0 +1,9 @@
BEGIN {
FS="[a-c]+";
IGNORECASE=0.1;
}
{
print "NF=" NF;
for (i = 0; i < NF; i++) print i " [" $(i+1) "]";
}

4
ase/test/awk/t41.awk Normal file
View File

@ -0,0 +1,4 @@
BEGIN { IGNORECASE=1; }
$0 == "abc" {
print "[" $0 "]";
}

13
ase/test/awk/t42.awk Normal file
View File

@ -0,0 +1,13 @@
BEGIN {
FS=":";
OFS="::";
}
{
$2=1.23;
NF=4;
print "NF=" NF;
print "[" $10 "]";
print "$0=[" $0 "]";
}