enhanced macros to avoid breaking ABI from previous versions. modified to
* genChRanges.py, chvalid.c, include/libxml/chvalid.h,
include/libxml/parserInternals.h: enhanced macros to avoid
breaking ABI from previous versions.
* catalog.c, parser.c, tree.c: modified to use IS_* macros
defined in parserInternals.h. Makes maintenance much easier.
* testHTML.c, testSAX.c, python/libxml.c: minor fixes to avoid
compilation warnings
* configuration.in: fixed pushHTML test error; enhanced for
better devel (me) testing
diff --git a/tree.c b/tree.c
index bea5dfe..0eccfbd 100644
--- a/tree.c
+++ b/tree.c
@@ -377,13 +377,13 @@
c = CUR_SCHAR(cur, l);
}
}
- if ((!xmlIsLetter(c)) && (c != '_'))
+ if ((!IS_LETTER(c)) && (c != '_'))
return(1);
cur += l;
c = CUR_SCHAR(cur, l);
- while (xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) ||
- xmlIsExtender(c)) {
+ while (IS_LETTER(c) || IS_DIGIT(c) || (c == '.') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) ||
+ IS_EXTENDER(c)) {
cur += l;
c = CUR_SCHAR(cur, l);
}
@@ -460,26 +460,26 @@
c = CUR_SCHAR(cur, l);
}
}
- if ((!xmlIsLetter(c)) && (c != '_'))
+ if ((!IS_LETTER(c)) && (c != '_'))
return(1);
cur += l;
c = CUR_SCHAR(cur, l);
- while (xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) ||
- xmlIsExtender(c)) {
+ while (IS_LETTER(c) || IS_DIGIT(c) || (c == '.') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) ||
+ IS_EXTENDER(c)) {
cur += l;
c = CUR_SCHAR(cur, l);
}
if (c == ':') {
cur += l;
c = CUR_SCHAR(cur, l);
- if ((!xmlIsLetter(c)) && (c != '_'))
+ if ((!IS_LETTER(c)) && (c != '_'))
return(1);
cur += l;
c = CUR_SCHAR(cur, l);
- while (xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) ||
- xmlIsExtender(c)) {
+ while (IS_LETTER(c) || IS_DIGIT(c) || (c == '.') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) ||
+ IS_EXTENDER(c)) {
cur += l;
c = CUR_SCHAR(cur, l);
}
@@ -542,12 +542,12 @@
c = CUR_SCHAR(cur, l);
}
}
- if ((!xmlIsLetter(c)) && (c != '_') && (c != ':'))
+ if ((!IS_LETTER(c)) && (c != '_') && (c != ':'))
return(1);
cur += l;
c = CUR_SCHAR(cur, l);
- while (xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') || (c == ':') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) || xmlIsExtender(c)) {
+ while (IS_LETTER(c) || IS_DIGIT(c) || (c == '.') || (c == ':') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) || IS_EXTENDER(c)) {
cur += l;
c = CUR_SCHAR(cur, l);
}
@@ -611,13 +611,13 @@
c = CUR_SCHAR(cur, l);
}
}
- if (!(xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') || (c == ':') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) || xmlIsExtender(c)))
+ if (!(IS_LETTER(c) || IS_DIGIT(c) || (c == '.') || (c == ':') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) || IS_EXTENDER(c)))
return(1);
cur += l;
c = CUR_SCHAR(cur, l);
- while (xmlIsLetter(c) || xmlIsDigit(c) || (c == '.') || (c == ':') ||
- (c == '-') || (c == '_') || xmlIsCombining(c) || xmlIsExtender(c)) {
+ while (IS_LETTER(c) || IS_DIGIT(c) || (c == '.') || (c == ':') ||
+ (c == '-') || (c == '_') || IS_COMBINING(c) || IS_EXTENDER(c)) {
cur += l;
c = CUR_SCHAR(cur, l);
}