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

added QSE_XLI_KEYSPLITTER

Browse Source
This commit is contained in:
hyung-hwan 2015-03-19 07:26:06 +00:00
parent bfee646924
commit e0d36803cc
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qse/include/qse/xli/xli.h
View File

@ -108,7 +108,9 @@ enum qse_xli_opt_t
* you can get the pointer to the extension with qse_getxlirootxtn(). * you can get the pointer to the extension with qse_getxlirootxtn().
* the new size set takes effect after the call to qse_xli_yieldroot(). * the new size set takes effect after the call to qse_xli_yieldroot().
*/ */
QSE_XLI_ROOTXTNSIZE QSE_XLI_ROOTXTNSIZE,
QSE_XLI_KEYSPLITTER
}; };
typedef enum qse_xli_opt_t qse_xli_opt_t; typedef enum qse_xli_opt_t qse_xli_opt_t;

21
qse/lib/xli/xli.c
View File

@ -67,6 +67,7 @@ int qse_xli_init (qse_xli_t* xli, qse_mmgr_t* mmgr, qse_size_t rootxtnsize)
xli->mmgr = mmgr; xli->mmgr = mmgr;
xli->errstr = qse_xli_dflerrstr; xli->errstr = qse_xli_dflerrstr;
xli->opt.root_xtnsize = rootxtnsize; xli->opt.root_xtnsize = rootxtnsize;
xli->opt.key_splitter = QSE_T('.');
xli->dotted_curkey = qse_str_open (mmgr, 0, 128); xli->dotted_curkey = qse_str_open (mmgr, 0, 128);
if (xli->dotted_curkey == QSE_NULL) goto oops; if (xli->dotted_curkey == QSE_NULL) goto oops;
@ -127,6 +128,10 @@ int qse_xli_setopt (qse_xli_t* xli, qse_xli_opt_t id, const void* value)
case QSE_XLI_ROOTXTNSIZE: case QSE_XLI_ROOTXTNSIZE:
xli->opt.root_xtnsize = *(const qse_size_t*)value; xli->opt.root_xtnsize = *(const qse_size_t*)value;
return 0; return 0;
case QSE_XLI_KEYSPLITTER:
xli->opt.key_splitter = *(const qse_char_t*)value;
return 0;
} }
qse_xli_seterrnum (xli, QSE_XLI_EINVAL, QSE_NULL); qse_xli_seterrnum (xli, QSE_XLI_EINVAL, QSE_NULL);
@ -148,6 +153,10 @@ int qse_xli_getopt (qse_xli_t* xli, qse_xli_opt_t id, void* value)
case QSE_XLI_ROOTXTNSIZE: case QSE_XLI_ROOTXTNSIZE:
*(qse_size_t*)value = xli->opt.root_xtnsize; *(qse_size_t*)value = xli->opt.root_xtnsize;
return 0; return 0;
case QSE_XLI_KEYSPLITTER:
*(qse_char_t*)value = xli->opt.key_splitter;
return 0;
}; };
qse_xli_seterrnum (xli, QSE_XLI_EINVAL, QSE_NULL); qse_xli_seterrnum (xli, QSE_XLI_EINVAL, QSE_NULL);
@ -640,7 +649,7 @@ const qse_char_t* get_next_fqpn_segment (qse_xli_t* xli, const qse_char_t* fqpn,
const qse_char_t* ptr; const qse_char_t* ptr;
seg->key.ptr = ptr = fqpn; seg->key.ptr = ptr = fqpn;
while (*ptr != QSE_T('\0') && *ptr != QSE_T('.') && *ptr != QSE_T('[') && *ptr != QSE_T('{')) ptr++; while (*ptr != QSE_T('\0') && *ptr != xli->opt.key_splitter && *ptr != QSE_T('[') && *ptr != QSE_T('{')) ptr++;
if (ptr == seg->key.ptr) goto inval; /* no key part */ if (ptr == seg->key.ptr) goto inval; /* no key part */
seg->key.len = ptr - seg->key.ptr; seg->key.len = ptr - seg->key.ptr;
@ -671,7 +680,7 @@ const qse_char_t* get_next_fqpn_segment (qse_xli_t* xli, const qse_char_t* fqpn,
else goto inval; else goto inval;
ptr++; /* skip ] */ ptr++; /* skip ] */
if (*ptr != QSE_T('\0') && *ptr != QSE_T('.')) goto inval; if (*ptr != QSE_T('\0') && *ptr != xli->opt.key_splitter) goto inval;
} }
else if (*ptr == QSE_T('{')) else if (*ptr == QSE_T('{'))
{ {
@ -692,7 +701,7 @@ const qse_char_t* get_next_fqpn_segment (qse_xli_t* xli, const qse_char_t* fqpn,
if (*ptr != QSE_T('}') || seg->idx.alias.len == 0) goto inval; if (*ptr != QSE_T('}') || seg->idx.alias.len == 0) goto inval;
ptr++; /* skip } */ ptr++; /* skip } */
if (*ptr != QSE_T('\0') && *ptr != QSE_T('.')) goto inval; if (*ptr != QSE_T('\0') && *ptr != xli->opt.key_splitter) goto inval;
} }
else else
{ {
@ -751,7 +760,7 @@ qse_xli_pair_t* qse_xli_findpair (qse_xli_t* xli, const qse_xli_list_t* list, co
if (*ptr == QSE_T('\0')) return pair; /* no more segments */ if (*ptr == QSE_T('\0')) return pair; /* no more segments */
/* more segments to handle */ /* more segments to handle */
QSE_ASSERT (*ptr == QSE_T('.')); QSE_ASSERT (*ptr == xli->opt.key_splitter);
ptr++; /* skip . */ ptr++; /* skip . */
/* switch to the value regardless of its type. /* switch to the value regardless of its type.
@ -822,7 +831,7 @@ qse_size_t qse_xli_countpairs (qse_xli_t* xli, const qse_xli_list_t* list, const
} }
/* more segments to handle */ /* more segments to handle */
QSE_ASSERT (*ptr == QSE_T('.')); QSE_ASSERT (*ptr == xli->opt.key_splitter);
ptr++; /* skip . */ ptr++; /* skip . */
/* switch to the value regardless of its type. /* switch to the value regardless of its type.
@ -1010,7 +1019,7 @@ qse_xli_pair_t* qse_xli_setpair (qse_xli_t* xli, const qse_char_t* fqpn, const q
} }
/* more segments to handle */ /* more segments to handle */
QSE_ASSERT (*ptr == QSE_T('.')); QSE_ASSERT (*ptr == xli->opt.key_splitter);
ptr++; /* skip . */ ptr++; /* skip . */
/* switch to the value regardless of its type. /* switch to the value regardless of its type.

1
qse/lib/xli/xli.h
View File

@ -72,6 +72,7 @@ struct qse_xli_t
int trait; int trait;
qse_size_t pair_xtnsize; qse_size_t pair_xtnsize;
qse_size_t root_xtnsize; qse_size_t root_xtnsize;
qse_char_t key_splitter; /**< character to use to split a key in the fqpn format */
} opt; } opt;
qse_xli_ecb_t* ecb; qse_xli_ecb_t* ecb;