summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2013-09-24 10:45:10 +0200
committerYorhel <git@yorhel.nl>2013-09-24 10:45:10 +0200
commit0a372a897bdd2124472f9ba09a3bc9e6562bf774 (patch)
treea740a643029c7f5dfa44bc6da12487f5beb69a88
parentd297de22845fd2fd090d7dba88412941c7b5dbb8 (diff)
Consistent naming: s/setdata/dataset/ and s/setattrval/attrvalset/
-rw-r--r--yxml-states14
-rw-r--r--yxml.c26
-rw-r--r--yxml.c.in8
3 files changed, 24 insertions, 24 deletions
diff --git a/yxml-states b/yxml-states
index d0c3863..36b7343 100644
--- a/yxml-states
+++ b/yxml-states
@@ -64,7 +64,7 @@ init '\xef' "\xbb\xbf" misc0; SP misc0; '<' le0
# closed, yxml_selfclose() does this.
misc0 SP misc0; '<' le0
misc1 SP misc1; '<' le1
-misc2 '<' le2; '&' refstart misc2a; Char setdata misc2
+misc2 '<' le2; '&' refstart misc2a; Char dataset misc2
misc2a Ref ref misc2a; '\x3b' refend misc2
misc3 SP misc3; '<' le3
@@ -120,8 +120,8 @@ comment4 '>' @
# PI, starting from '<?', returns to @
pi0 NameStart pistart pi1
pi1 Name piname pi1; '?' pinameend pi4; SP pinameend pi2
-pi2 '?' setdata pi3; Char setdata pi2
-pi3 '>' pivalend @; Char setdata pi2
+pi2 '?' dataset pi3; Char dataset pi2
+pi3 '>' pivalend @; Char dataset pi2
pi4 '>' pivalend @
@@ -129,9 +129,9 @@ pi4 '>' pivalend @
# TODO: "<![CDATA[ ] ]]>" is parsed correctly, but the ']' is not sent to
# the application as a DATA token. No idea how to easily fix that. Currently,
# "<![CDATA[ ]]]]>" does work correctly.
-cd0 ']' cd1; Char setdata cd0
-cd1 ']' cd2; Char setdata cd0
-cd2 ']' setdata cd2; '>' misc2; Char setdata cd0
+cd0 ']' cd1; Char dataset cd0
+cd1 ']' cd2; Char dataset cd0
+cd2 ']' dataset cd2; '>' misc2; Char dataset cd0
# Doctype, starting from '<!DOCTYPE', returns to misc1
@@ -173,6 +173,6 @@ elem3 '>' selfclose misc2
attr0 Name attrname attr0; SP attrnameend attr1; '=' attrnameend attr2
attr1 SP attr1; '=' attr2
attr2 SP attr2; '\''|'"' $quote attr3
-attr3 AttValue setattrval attr3; '&' refstart attr4; $quote attrvalend elem2
+attr3 AttValue attrvalset attr3; '&' refstart attr4; $quote attrvalend elem2
attr4 Ref ref attr4; '\x3b' refend attr3
diff --git a/yxml.c b/yxml.c
index 213b7d1..4f9b5f4 100644
--- a/yxml.c
+++ b/yxml.c
@@ -121,16 +121,16 @@ static inline void yxml_setchar(char *dest, unsigned ch) {
}
-static inline int yxml_setdata(yxml_t *x, unsigned ch) {
+static inline int yxml_dataset(yxml_t *x, unsigned ch) {
yxml_setchar(x->data, ch);
x->data[1] = 0;
return YXML_DATA;
}
-static inline int yxml_setattrval(yxml_t *x, unsigned ch) {
+static inline int yxml_attrvalset(yxml_t *x, unsigned ch) {
/* Normalize attribute values according to the XML spec section 3.3.3. */
- return yxml_setdata(x, ch == 0x9 || ch == 0xa ? 0x20 : ch);
+ return yxml_dataset(x, ch == 0x9 || ch == 0xa ? 0x20 : ch);
}
@@ -261,7 +261,7 @@ static int yxml_refend(yxml_t *x, unsigned ch) {
* CharRefs only work for ASCII at the moment. This is kind of stupid. */
if(!ch || ch > 127)
return YXML_EREF;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}
@@ -340,7 +340,7 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
break;
case YXMLS_attr3:
if(yxml_isAttValue(ch))
- return yxml_setattrval(x, ch);
+ return yxml_attrvalset(x, ch);
if(ch == (unsigned char)'&') {
x->state = YXMLS_attr4;
return yxml_refstart(x, ch);
@@ -364,7 +364,7 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
return YXML_OK;
}
if(yxml_isChar(ch))
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
break;
case YXMLS_cd1:
if(ch == (unsigned char)']') {
@@ -373,19 +373,19 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
}
if(yxml_isChar(ch)) {
x->state = YXMLS_cd0;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}
break;
case YXMLS_cd2:
if(ch == (unsigned char)']')
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
if(ch == (unsigned char)'>') {
x->state = YXMLS_misc2;
return YXML_OK;
}
if(yxml_isChar(ch)) {
x->state = YXMLS_cd0;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}
break;
case YXMLS_comment0:
@@ -736,7 +736,7 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
return yxml_refstart(x, ch);
}
if(yxml_isChar(ch))
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
break;
case YXMLS_misc2a:
if(yxml_isRef(ch))
@@ -775,10 +775,10 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
case YXMLS_pi2:
if(ch == (unsigned char)'?') {
x->state = YXMLS_pi3;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}
if(yxml_isChar(ch))
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
break;
case YXMLS_pi3:
if(ch == (unsigned char)'>') {
@@ -787,7 +787,7 @@ yxml_ret_t yxml_parse(yxml_t *x, int _ch) {
}
if(yxml_isChar(ch)) {
x->state = YXMLS_pi2;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}
break;
case YXMLS_pi4:
diff --git a/yxml.c.in b/yxml.c.in
index c6c1a4a..1406ecd 100644
--- a/yxml.c.in
+++ b/yxml.c.in
@@ -57,16 +57,16 @@ static inline void yxml_setchar(char *dest, unsigned ch) {
}
-static inline int yxml_setdata(yxml_t *x, unsigned ch) {
+static inline int yxml_dataset(yxml_t *x, unsigned ch) {
yxml_setchar(x->data, ch);
x->data[1] = 0;
return YXML_DATA;
}
-static inline int yxml_setattrval(yxml_t *x, unsigned ch) {
+static inline int yxml_attrvalset(yxml_t *x, unsigned ch) {
/* Normalize attribute values according to the XML spec section 3.3.3. */
- return yxml_setdata(x, ch == 0x9 || ch == 0xa ? 0x20 : ch);
+ return yxml_dataset(x, ch == 0x9 || ch == 0xa ? 0x20 : ch);
}
@@ -197,7 +197,7 @@ static int yxml_refend(yxml_t *x, unsigned ch) {
* CharRefs only work for ASCII at the moment. This is kind of stupid. */
if(!ch || ch > 127)
return YXML_EREF;
- return yxml_setdata(x, ch);
+ return yxml_dataset(x, ch);
}