From b75630a8bb73e733ae7d176e9afbd8bc63c1c2a0 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 27 May 2014 14:26:04 +0000 Subject: [PATCH] exposed str::split() --- qse/lib/awk/fnc.c | 8 ++------ qse/lib/awk/fnc.h | 1 + qse/lib/awk/mod-str.c | 47 ++++++++++++++++++++++--------------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/qse/lib/awk/fnc.c b/qse/lib/awk/fnc.c index 139f3d2b..0538ac1d 100644 --- a/qse/lib/awk/fnc.c +++ b/qse/lib/awk/fnc.c @@ -23,10 +23,6 @@ static int fnc_close (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_fflush (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_index (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -static int fnc_length (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -static int fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -static int fnc_tolower (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -static int fnc_toupper (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_gsub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_sub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); static int fnc_match (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); @@ -68,7 +64,7 @@ static qse_awk_fnc_t sysfnctab[] = { {QSE_T("index"), 5}, 0, { {2, 3, QSE_NULL}, fnc_index, 0 }, QSE_NULL}, { {QSE_T("substr"), 6}, 0, { {2, 3, QSE_NULL}, qse_awk_fnc_substr, 0 }, QSE_NULL}, { {QSE_T("length"), 6}, 1, { {0, 1, QSE_NULL}, qse_awk_fnc_length, 0 }, QSE_NULL}, - { {QSE_T("split"), 5}, 0, { {2, 3, QSE_T("vrx")}, fnc_split, 0 }, QSE_NULL}, + { {QSE_T("split"), 5}, 0, { {2, 3, QSE_T("vrx")}, qse_awk_fnc_split, 0 }, QSE_NULL}, { {QSE_T("tolower"), 7}, 0, { {1, 1, QSE_NULL}, qse_awk_fnc_tolower, 0 }, QSE_NULL}, { {QSE_T("toupper"), 7}, 0, { {1, 1, QSE_NULL}, qse_awk_fnc_toupper, 0 }, QSE_NULL}, { {QSE_T("gsub"), 4}, 0, { {2, 3, QSE_T("xvr")}, fnc_gsub, 0 }, QSE_NULL}, @@ -570,7 +566,7 @@ int qse_awk_fnc_substr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi) return 0; } -static int fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi) +int qse_awk_fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi) { qse_size_t nargs; qse_awk_val_t* a0, * a1, * a2, * t1, * t2; diff --git a/qse/lib/awk/fnc.h b/qse/lib/awk/fnc.h index 122f91a9..22fcf0f0 100644 --- a/qse/lib/awk/fnc.h +++ b/qse/lib/awk/fnc.h @@ -44,6 +44,7 @@ qse_awk_fnc_t* qse_awk_findfnc (qse_awk_t* awk, const qse_cstr_t* name); int qse_awk_fnc_length (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); int qse_awk_fnc_substr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +int qse_awk_fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); int qse_awk_fnc_tolower (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); int qse_awk_fnc_toupper (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); diff --git a/qse/lib/awk/mod-str.c b/qse/lib/awk/mod-str.c index c01e4c7d..2ab19f16 100644 --- a/qse/lib/awk/mod-str.c +++ b/qse/lib/awk/mod-str.c @@ -297,29 +297,30 @@ struct fnctab_t static fnctab_t fnctab[] = { /* keep this table sorted for binary search in query(). */ - { QSE_T("index"), { { 2, 3, QSE_NULL }, fnc_index, 0 } }, - { QSE_T("isalnum"), { { 1, 1, QSE_NULL }, fnc_isalnum, 0 } }, - { QSE_T("isalpha"), { { 1, 1, QSE_NULL }, fnc_isalpha, 0 } }, - { QSE_T("isblank"), { { 1, 1, QSE_NULL }, fnc_isblank, 0 } }, - { QSE_T("iscntrl"), { { 1, 1, QSE_NULL }, fnc_iscntrl, 0 } }, - { QSE_T("isdigit"), { { 1, 1, QSE_NULL }, fnc_isdigit, 0 } }, - { QSE_T("isgraph"), { { 1, 1, QSE_NULL }, fnc_isgraph, 0 } }, - { QSE_T("islower"), { { 1, 1, QSE_NULL }, fnc_islower, 0 } }, - { QSE_T("isprint"), { { 1, 1, QSE_NULL }, fnc_isprint, 0 } }, - { QSE_T("ispunct"), { { 1, 1, QSE_NULL }, fnc_ispunct, 0 } }, - { QSE_T("isspace"), { { 1, 1, QSE_NULL }, fnc_isspace, 0 } }, - { QSE_T("isupper"), { { 1, 1, QSE_NULL }, fnc_isupper, 0 } }, - { QSE_T("isxdigit"), { { 1, 1, QSE_NULL }, fnc_isxdigit, 0 } }, - { QSE_T("length"), { { 1, 1, QSE_NULL }, qse_awk_fnc_length, 0 } }, - { QSE_T("ltrim"), { { 1, 1, QSE_NULL }, fnc_ltrim, 0 } }, - { QSE_T("normspace"), { { 1, 1, QSE_NULL }, fnc_normspace, 0 } }, - { QSE_T("rindex"), { { 2, 3, QSE_NULL }, fnc_rindex, 0 } }, - { QSE_T("rtrim"), { { 1, 1, QSE_NULL }, fnc_rtrim, 0 } }, - { QSE_T("substr"), { { 2, 3, QSE_NULL }, qse_awk_fnc_substr, 0 } }, - { QSE_T("tolower"), { { 1, 1, QSE_NULL }, qse_awk_fnc_tolower, 0 } }, - { QSE_T("toupper"), { { 1, 1, QSE_NULL }, qse_awk_fnc_toupper, 0 } }, - { QSE_T("trim"), { { 1, 1, QSE_NULL }, fnc_trim, 0 } }, - { QSE_T("value"), { { 1, 1, QSE_NULL }, fnc_value, 0 } } + { QSE_T("index"), { { 2, 3, QSE_NULL }, fnc_index, 0 } }, + { QSE_T("isalnum"), { { 1, 1, QSE_NULL }, fnc_isalnum, 0 } }, + { QSE_T("isalpha"), { { 1, 1, QSE_NULL }, fnc_isalpha, 0 } }, + { QSE_T("isblank"), { { 1, 1, QSE_NULL }, fnc_isblank, 0 } }, + { QSE_T("iscntrl"), { { 1, 1, QSE_NULL }, fnc_iscntrl, 0 } }, + { QSE_T("isdigit"), { { 1, 1, QSE_NULL }, fnc_isdigit, 0 } }, + { QSE_T("isgraph"), { { 1, 1, QSE_NULL }, fnc_isgraph, 0 } }, + { QSE_T("islower"), { { 1, 1, QSE_NULL }, fnc_islower, 0 } }, + { QSE_T("isprint"), { { 1, 1, QSE_NULL }, fnc_isprint, 0 } }, + { QSE_T("ispunct"), { { 1, 1, QSE_NULL }, fnc_ispunct, 0 } }, + { QSE_T("isspace"), { { 1, 1, QSE_NULL }, fnc_isspace, 0 } }, + { QSE_T("isupper"), { { 1, 1, QSE_NULL }, fnc_isupper, 0 } }, + { QSE_T("isxdigit"), { { 1, 1, QSE_NULL }, fnc_isxdigit, 0 } }, + { QSE_T("length"), { { 1, 1, QSE_NULL }, qse_awk_fnc_length, 0 } }, + { QSE_T("ltrim"), { { 1, 1, QSE_NULL }, fnc_ltrim, 0 } }, + { QSE_T("normspace"), { { 1, 1, QSE_NULL }, fnc_normspace, 0 } }, + { QSE_T("rindex"), { { 2, 3, QSE_NULL }, fnc_rindex, 0 } }, + { QSE_T("rtrim"), { { 1, 1, QSE_NULL }, fnc_rtrim, 0 } }, + { QSE_T("split"), { { 2, 3, QSE_T("vrx") }, qse_awk_fnc_split, 0 } }, + { QSE_T("substr"), { { 2, 3, QSE_NULL }, qse_awk_fnc_substr, 0 } }, + { QSE_T("tolower"), { { 1, 1, QSE_NULL }, qse_awk_fnc_tolower, 0 } }, + { QSE_T("toupper"), { { 1, 1, QSE_NULL }, qse_awk_fnc_toupper, 0 } }, + { QSE_T("trim"), { { 1, 1, QSE_NULL }, fnc_trim, 0 } }, + { QSE_T("value"), { { 1, 1, QSE_NULL }, fnc_value, 0 } } }; static int query (qse_awk_mod_t* mod, qse_awk_t* awk, const qse_char_t* name, qse_awk_mod_sym_t* sym)