diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index f751f308..055a23a8 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -2952,42 +2952,10 @@
regular expressions handling
basic API for libxml regular expressions handling used for XML Schemas and validation.
Daniel Veillard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4870,12 +4838,6 @@ and not by parsing an instance'/>
-
-
-
-
-
-
@@ -6118,11 +6080,6 @@ set at the end of parsing'/>
-
-
-
-
-
@@ -6855,8 +6812,6 @@ Could we use @subtypes for this?'/>
-
-
DEPRECATED: This handler is unused and will be removed from future versions. Default old SAX v1 handler for HTML, builds the DOM tree
@@ -9573,146 +9528,6 @@ Could we use @subtypes for this?'/>
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Debugging facility provides the number of allocated nodes over lifetime
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Debugging facility provides the number of allocated nodes at a that point
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Serialize the expression as compiled to the buffer
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Evaluates the expression resulting from @exp consuming a sub expression @sub Based on algebraic derivation and sometimes direct Brzozowski derivation it usually takes less than linear time and can handle expressions generating infinite languages.
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Dereference the expression
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Free an expression context
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Find all the strings used in @exp and store them in @list
-
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Find all the strings that appears at the start of the languages accepted by @exp and store them in @list. E.g. for (a, b) | c it will return the list [a, c]
-
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Finds if the expression is nillable, i.e. if it accepts the empty sequence
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Indicate the maximum number of input a expression can accept
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Get the atom associated to this name from that context
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Creates a new context for manipulating expressions
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Get the atom associated to the choice @left | @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Get the atom associated to the range (@subset){@min, @max} Note that @subset is consumed in the operation, to keep an handle on it use xmlExpRef() and use xmlExpFree() to release it, this is true even in case of failure (unless ctxt == NULL).
-
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Get the atom associated to the sequence @left , @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Minimal parser for regexps, it understand the following constructs - string terminals - choice operator | - sequence operator , - subexpressions (...) - usual cardinality operators + * and ? - finite sequences { min, max } - infinite sequences { min, * } There is minimal checkings made especially no checking on strings values
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Increase the reference count of the expression
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Do one step of Brzozowski derivation of the expression @exp with respect to the input string
-
-
-
-
-
-
-
- defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- Check whether @exp accepts all the languages accepted by @sub the input being a subexpression.
-
-
-
-
-
External entity loaders types.
diff --git a/include/libxml/xmlregexp.h b/include/libxml/xmlregexp.h
index 2d66437a..210f99b3 100644
--- a/include/libxml/xmlregexp.h
+++ b/include/libxml/xmlregexp.h
@@ -99,113 +99,7 @@ XMLPUBFUN int
int *nbneg,
xmlChar **values,
int *terminal);
-#ifdef LIBXML_EXPR_ENABLED
-/*
- * Formal regular expression handling
- * Its goal is to do some formal work on content models
- */
-/* expressions are used within a context */
-typedef struct _xmlExpCtxt xmlExpCtxt;
-typedef xmlExpCtxt *xmlExpCtxtPtr;
-
-XMLPUBFUN void
- xmlExpFreeCtxt (xmlExpCtxtPtr ctxt);
-XMLPUBFUN xmlExpCtxtPtr
- xmlExpNewCtxt (int maxNodes,
- xmlDictPtr dict);
-
-XMLPUBFUN int
- xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt);
-XMLPUBFUN int
- xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt);
-
-/* Expressions are trees but the tree is opaque */
-typedef struct _xmlExpNode xmlExpNode;
-typedef xmlExpNode *xmlExpNodePtr;
-
-typedef enum {
- XML_EXP_EMPTY = 0,
- XML_EXP_FORBID = 1,
- XML_EXP_ATOM = 2,
- XML_EXP_SEQ = 3,
- XML_EXP_OR = 4,
- XML_EXP_COUNT = 5
-} xmlExpNodeType;
-
-/*
- * 2 core expressions shared by all for the empty language set
- * and for the set with just the empty token
- */
-XMLPUBVAR xmlExpNodePtr forbiddenExp;
-XMLPUBVAR xmlExpNodePtr emptyExp;
-
-/*
- * Expressions are reference counted internally
- */
-XMLPUBFUN void
- xmlExpFree (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr);
-XMLPUBFUN void
- xmlExpRef (xmlExpNodePtr expr);
-
-/*
- * constructors can be either manual or from a string
- */
-XMLPUBFUN xmlExpNodePtr
- xmlExpParse (xmlExpCtxtPtr ctxt,
- const char *expr);
-XMLPUBFUN xmlExpNodePtr
- xmlExpNewAtom (xmlExpCtxtPtr ctxt,
- const xmlChar *name,
- int len);
-XMLPUBFUN xmlExpNodePtr
- xmlExpNewOr (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr left,
- xmlExpNodePtr right);
-XMLPUBFUN xmlExpNodePtr
- xmlExpNewSeq (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr left,
- xmlExpNodePtr right);
-XMLPUBFUN xmlExpNodePtr
- xmlExpNewRange (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr subset,
- int min,
- int max);
-/*
- * The really interesting APIs
- */
-XMLPUBFUN int
- xmlExpIsNillable(xmlExpNodePtr expr);
-XMLPUBFUN int
- xmlExpMaxToken (xmlExpNodePtr expr);
-XMLPUBFUN int
- xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr,
- const xmlChar**langList,
- int len);
-XMLPUBFUN int
- xmlExpGetStart (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr,
- const xmlChar**tokList,
- int len);
-XMLPUBFUN xmlExpNodePtr
- xmlExpStringDerive(xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr,
- const xmlChar *str,
- int len);
-XMLPUBFUN xmlExpNodePtr
- xmlExpExpDerive (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr,
- xmlExpNodePtr sub);
-XMLPUBFUN int
- xmlExpSubsume (xmlExpCtxtPtr ctxt,
- xmlExpNodePtr expr,
- xmlExpNodePtr sub);
-XMLPUBFUN void
- xmlExpDump (xmlBufferPtr buf,
- xmlExpNodePtr expr);
-#endif /* LIBXML_EXPR_ENABLED */
#ifdef __cplusplus
}
#endif
diff --git a/testapi.c b/testapi.c
index b98d6e9e..205bd185 100644
--- a/testapi.c
+++ b/testapi.c
@@ -33719,451 +33719,6 @@ test_xmlreader(void) {
printf("Module xmlreader: %d errors\n", test_ret);
return(test_ret);
}
-
-static int
-test_xmlExpCtxtNbCons(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpCtxtPtr ctxt; /* an expression context */
- int n_ctxt;
-
- for (n_ctxt = 0;n_ctxt < gen_nb_xmlExpCtxtPtr;n_ctxt++) {
- mem_base = xmlMemBlocks();
- ctxt = gen_xmlExpCtxtPtr(n_ctxt, 0);
-
- ret_val = xmlExpCtxtNbCons(ctxt);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpCtxtPtr(n_ctxt, ctxt, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpCtxtNbCons",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_ctxt);
- printf("\n");
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpCtxtNbNodes(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpCtxtPtr ctxt; /* an expression context */
- int n_ctxt;
-
- for (n_ctxt = 0;n_ctxt < gen_nb_xmlExpCtxtPtr;n_ctxt++) {
- mem_base = xmlMemBlocks();
- ctxt = gen_xmlExpCtxtPtr(n_ctxt, 0);
-
- ret_val = xmlExpCtxtNbNodes(ctxt);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpCtxtPtr(n_ctxt, ctxt, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpCtxtNbNodes",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_ctxt);
- printf("\n");
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpDump(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- xmlBufferPtr buf; /* a buffer to receive the output */
- int n_buf;
- xmlExpNodePtr expr; /* the compiled expression */
- int n_expr;
-
- for (n_buf = 0;n_buf < gen_nb_xmlBufferPtr;n_buf++) {
- for (n_expr = 0;n_expr < gen_nb_xmlExpNodePtr;n_expr++) {
- mem_base = xmlMemBlocks();
- buf = gen_xmlBufferPtr(n_buf, 0);
- expr = gen_xmlExpNodePtr(n_expr, 1);
-
- xmlExpDump(buf, expr);
- call_tests++;
- des_xmlBufferPtr(n_buf, buf, 0);
- des_xmlExpNodePtr(n_expr, expr, 1);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpDump",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_buf);
- printf(" %d", n_expr);
- printf("\n");
- }
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpExpDerive(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpGetLanguage(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpCtxtPtr ctxt; /* the expression context */
- int n_ctxt;
- xmlExpNodePtr exp; /* the expression */
- int n_exp;
- const xmlChar ** langList; /* where to store the tokens */
- int n_langList;
- int len; /* the allocated length of @list */
- int n_len;
-
- for (n_ctxt = 0;n_ctxt < gen_nb_xmlExpCtxtPtr;n_ctxt++) {
- for (n_exp = 0;n_exp < gen_nb_xmlExpNodePtr;n_exp++) {
- for (n_langList = 0;n_langList < gen_nb_const_xmlChar_ptr_ptr;n_langList++) {
- for (n_len = 0;n_len < gen_nb_int;n_len++) {
- mem_base = xmlMemBlocks();
- ctxt = gen_xmlExpCtxtPtr(n_ctxt, 0);
- exp = gen_xmlExpNodePtr(n_exp, 1);
- langList = gen_const_xmlChar_ptr_ptr(n_langList, 2);
- len = gen_int(n_len, 3);
-
- ret_val = xmlExpGetLanguage(ctxt, exp, langList, len);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpCtxtPtr(n_ctxt, ctxt, 0);
- des_xmlExpNodePtr(n_exp, exp, 1);
- des_const_xmlChar_ptr_ptr(n_langList, langList, 2);
- des_int(n_len, len, 3);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpGetLanguage",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_ctxt);
- printf(" %d", n_exp);
- printf(" %d", n_langList);
- printf(" %d", n_len);
- printf("\n");
- }
- }
- }
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpGetStart(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpCtxtPtr ctxt; /* the expression context */
- int n_ctxt;
- xmlExpNodePtr exp; /* the expression */
- int n_exp;
- const xmlChar ** tokList; /* where to store the tokens */
- int n_tokList;
- int len; /* the allocated length of @list */
- int n_len;
-
- for (n_ctxt = 0;n_ctxt < gen_nb_xmlExpCtxtPtr;n_ctxt++) {
- for (n_exp = 0;n_exp < gen_nb_xmlExpNodePtr;n_exp++) {
- for (n_tokList = 0;n_tokList < gen_nb_const_xmlChar_ptr_ptr;n_tokList++) {
- for (n_len = 0;n_len < gen_nb_int;n_len++) {
- mem_base = xmlMemBlocks();
- ctxt = gen_xmlExpCtxtPtr(n_ctxt, 0);
- exp = gen_xmlExpNodePtr(n_exp, 1);
- tokList = gen_const_xmlChar_ptr_ptr(n_tokList, 2);
- len = gen_int(n_len, 3);
-
- ret_val = xmlExpGetStart(ctxt, exp, tokList, len);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpCtxtPtr(n_ctxt, ctxt, 0);
- des_xmlExpNodePtr(n_exp, exp, 1);
- des_const_xmlChar_ptr_ptr(n_tokList, tokList, 2);
- des_int(n_len, len, 3);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpGetStart",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_ctxt);
- printf(" %d", n_exp);
- printf(" %d", n_tokList);
- printf(" %d", n_len);
- printf("\n");
- }
- }
- }
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpIsNillable(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpNodePtr exp; /* the expression */
- int n_exp;
-
- for (n_exp = 0;n_exp < gen_nb_xmlExpNodePtr;n_exp++) {
- mem_base = xmlMemBlocks();
- exp = gen_xmlExpNodePtr(n_exp, 0);
-
- ret_val = xmlExpIsNillable(exp);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpNodePtr(n_exp, exp, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpIsNillable",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_exp);
- printf("\n");
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpMaxToken(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpNodePtr expr; /* a compiled expression */
- int n_expr;
-
- for (n_expr = 0;n_expr < gen_nb_xmlExpNodePtr;n_expr++) {
- mem_base = xmlMemBlocks();
- expr = gen_xmlExpNodePtr(n_expr, 0);
-
- ret_val = xmlExpMaxToken(expr);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpNodePtr(n_expr, expr, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpMaxToken",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_expr);
- printf("\n");
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpNewAtom(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpNewCtxt(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpNewOr(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpNewRange(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpNewSeq(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpParse(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpRef(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- xmlExpNodePtr exp; /* the expression */
- int n_exp;
-
- for (n_exp = 0;n_exp < gen_nb_xmlExpNodePtr;n_exp++) {
- mem_base = xmlMemBlocks();
- exp = gen_xmlExpNodePtr(n_exp, 0);
-
- xmlExpRef(exp);
- call_tests++;
- des_xmlExpNodePtr(n_exp, exp, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpRef",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_exp);
- printf("\n");
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
-
-static int
-test_xmlExpStringDerive(void) {
- int test_ret = 0;
-
-
- /* missing type support */
- return(test_ret);
-}
-
-
-static int
-test_xmlExpSubsume(void) {
- int test_ret = 0;
-
-#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
- int mem_base;
- int ret_val;
- xmlExpCtxtPtr ctxt; /* the expressions context */
- int n_ctxt;
- xmlExpNodePtr exp; /* the englobing expression */
- int n_exp;
- xmlExpNodePtr sub; /* the subexpression */
- int n_sub;
-
- for (n_ctxt = 0;n_ctxt < gen_nb_xmlExpCtxtPtr;n_ctxt++) {
- for (n_exp = 0;n_exp < gen_nb_xmlExpNodePtr;n_exp++) {
- for (n_sub = 0;n_sub < gen_nb_xmlExpNodePtr;n_sub++) {
- mem_base = xmlMemBlocks();
- ctxt = gen_xmlExpCtxtPtr(n_ctxt, 0);
- exp = gen_xmlExpNodePtr(n_exp, 1);
- sub = gen_xmlExpNodePtr(n_sub, 2);
-
- ret_val = xmlExpSubsume(ctxt, exp, sub);
- desret_int(ret_val);
- call_tests++;
- des_xmlExpCtxtPtr(n_ctxt, ctxt, 0);
- des_xmlExpNodePtr(n_exp, exp, 1);
- des_xmlExpNodePtr(n_sub, sub, 2);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlExpSubsume",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_ctxt);
- printf(" %d", n_exp);
- printf(" %d", n_sub);
- printf("\n");
- }
- }
- }
- }
- function_tests++;
-#endif
-
- return(test_ret);
-}
-
#ifdef LIBXML_REGEXP_ENABLED
#define gen_nb_xmlRegExecCtxtPtr 1
@@ -34550,24 +34105,7 @@ static int
test_xmlregexp(void) {
int test_ret = 0;
- if (quiet == 0) printf("Testing xmlregexp : 16 of 30 functions ...\n");
- test_ret += test_xmlExpCtxtNbCons();
- test_ret += test_xmlExpCtxtNbNodes();
- test_ret += test_xmlExpDump();
- test_ret += test_xmlExpExpDerive();
- test_ret += test_xmlExpGetLanguage();
- test_ret += test_xmlExpGetStart();
- test_ret += test_xmlExpIsNillable();
- test_ret += test_xmlExpMaxToken();
- test_ret += test_xmlExpNewAtom();
- test_ret += test_xmlExpNewCtxt();
- test_ret += test_xmlExpNewOr();
- test_ret += test_xmlExpNewRange();
- test_ret += test_xmlExpNewSeq();
- test_ret += test_xmlExpParse();
- test_ret += test_xmlExpRef();
- test_ret += test_xmlExpStringDerive();
- test_ret += test_xmlExpSubsume();
+ if (quiet == 0) printf("Testing xmlregexp : 7 of 11 functions ...\n");
test_ret += test_xmlRegExecErrInfo();
test_ret += test_xmlRegExecNextValues();
test_ret += test_xmlRegExecPushString();
diff --git a/xmlregexp.c b/xmlregexp.c
index f39de960..aa13c953 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -6316,11 +6316,119 @@ xmlAutomataIsDeterminist(xmlAutomataPtr am) {
}
#ifdef LIBXML_EXPR_ENABLED
+/** DOC_DISABLE */
/************************************************************************
* *
* Formal Expression handling code *
* *
************************************************************************/
+
+/*
+ * Formal regular expression handling
+ * Its goal is to do some formal work on content models
+ */
+
+/* expressions are used within a context */
+typedef struct _xmlExpCtxt xmlExpCtxt;
+typedef xmlExpCtxt *xmlExpCtxtPtr;
+
+XMLPUBFUN void
+ xmlExpFreeCtxt (xmlExpCtxtPtr ctxt);
+XMLPUBFUN xmlExpCtxtPtr
+ xmlExpNewCtxt (int maxNodes,
+ xmlDictPtr dict);
+
+XMLPUBFUN int
+ xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt);
+XMLPUBFUN int
+ xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt);
+
+/* Expressions are trees but the tree is opaque */
+typedef struct _xmlExpNode xmlExpNode;
+typedef xmlExpNode *xmlExpNodePtr;
+
+typedef enum {
+ XML_EXP_EMPTY = 0,
+ XML_EXP_FORBID = 1,
+ XML_EXP_ATOM = 2,
+ XML_EXP_SEQ = 3,
+ XML_EXP_OR = 4,
+ XML_EXP_COUNT = 5
+} xmlExpNodeType;
+
+/*
+ * 2 core expressions shared by all for the empty language set
+ * and for the set with just the empty token
+ */
+XMLPUBVAR xmlExpNodePtr forbiddenExp;
+XMLPUBVAR xmlExpNodePtr emptyExp;
+
+/*
+ * Expressions are reference counted internally
+ */
+XMLPUBFUN void
+ xmlExpFree (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr);
+XMLPUBFUN void
+ xmlExpRef (xmlExpNodePtr expr);
+
+/*
+ * constructors can be either manual or from a string
+ */
+XMLPUBFUN xmlExpNodePtr
+ xmlExpParse (xmlExpCtxtPtr ctxt,
+ const char *expr);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpNewAtom (xmlExpCtxtPtr ctxt,
+ const xmlChar *name,
+ int len);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpNewOr (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr left,
+ xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpNewSeq (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr left,
+ xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpNewRange (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr subset,
+ int min,
+ int max);
+/*
+ * The really interesting APIs
+ */
+XMLPUBFUN int
+ xmlExpIsNillable(xmlExpNodePtr expr);
+XMLPUBFUN int
+ xmlExpMaxToken (xmlExpNodePtr expr);
+XMLPUBFUN int
+ xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr,
+ const xmlChar**langList,
+ int len);
+XMLPUBFUN int
+ xmlExpGetStart (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr,
+ const xmlChar**tokList,
+ int len);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpStringDerive(xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr,
+ const xmlChar *str,
+ int len);
+XMLPUBFUN xmlExpNodePtr
+ xmlExpExpDerive (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr,
+ xmlExpNodePtr sub);
+XMLPUBFUN int
+ xmlExpSubsume (xmlExpCtxtPtr ctxt,
+ xmlExpNodePtr expr,
+ xmlExpNodePtr sub);
+XMLPUBFUN void
+ xmlExpDump (xmlBufferPtr buf,
+ xmlExpNodePtr expr);
+
/************************************************************************
* *
* Expression handling context *
@@ -8008,6 +8116,7 @@ xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt) {
return(ctxt->nb_cons);
}
+/** DOC_ENABLE */
#endif /* LIBXML_EXPR_ENABLED */
#endif /* LIBXML_REGEXP_ENABLED */