mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-12-23 17:33:50 +03:00
regexp: Stop using LIBXML_AUTOMATA_ENABLED
This macro always equals LIBXML_REGEXP_ENABLED.
This commit is contained in:
Nick Wellnhofer
parent
11c3f84b6c
commit
10d60d15d6
@ -8203,25 +8203,25 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='string' type='const xmlChar *' info='the text content'/>
|
||||
</function>
|
||||
<function name='xmlAutomataCompile' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Compile the automata into a Reg Exp ready for being executed. The automata should be free after this point.</info>
|
||||
<return type='xmlRegexpPtr' info='the compiled regexp or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
</function>
|
||||
<function name='xmlAutomataGetInitState' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Initial state lookup</info>
|
||||
<return type='xmlAutomataStatePtr' info='the initial state of the automata'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
</function>
|
||||
<function name='xmlAutomataIsDeterminist' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Checks if an automata is determinist.</info>
|
||||
<return type='int' info='1 if true, 0 if not, and -1 in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewAllTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a an ALL transition from the @from state to the target state. That transition is an epsilon transition allowed only when all transitions from the @from node have been activated.</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8230,7 +8230,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='lax' type='int' info='allow to transition if not all all transitions have been activated'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewCountTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and whose number is between @min and @max</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8242,7 +8242,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data associated to the transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewCountTrans2' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and @token2 and whose number is between @min and @max</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8255,7 +8255,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data associated to the transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewCountedTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state which will increment the counter provided</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8264,7 +8264,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='counter' type='int' info='the counter associated to that transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewCounter' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Create a new counter</info>
|
||||
<return type='int' info='the counter number or -1 in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8272,7 +8272,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='max' type='int' info='the maximal value on the counter'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewCounterTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state which will be allowed only if the counter is within the right range.</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8281,7 +8281,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='counter' type='int' info='the counter associated to that transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewEpsilon' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds an epsilon transition from the @from state to the target state</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8289,7 +8289,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='to' type='xmlAutomataStatePtr' info='the target point of the transition or NULL'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewNegTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by any value except (@token,@token2) Note that if @token2 is not NULL, then (X, NULL) won't match to follow # the semantic of XSD ##other</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8300,7 +8300,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data passed to the callback function if the transition is activated'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewOnceTrans' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and whose number is between @min and @max, moreover that transition can only be crossed once.</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8312,7 +8312,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data associated to the transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewOnceTrans2' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by a succession of input of value @token and @token2 and whose number is between @min and @max, moreover that transition can only be crossed once.</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8325,13 +8325,13 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data associated to the transition'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewState' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Create a new disconnected state in the automata</info>
|
||||
<return type='xmlAutomataStatePtr' info='the new state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewTransition' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by the value of @token</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8341,7 +8341,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data passed to the callback function if the transition is activated'/>
|
||||
</function>
|
||||
<function name='xmlAutomataNewTransition2' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>If @to is NULL, this creates first a new target state in the automata and then adds a transition from the @from state to the target state activated by the value of @token</info>
|
||||
<return type='xmlAutomataStatePtr' info='the target state or NULL in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -8352,7 +8352,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='data' type='void *' info='data passed to the callback function if the transition is activated'/>
|
||||
</function>
|
||||
<function name='xmlAutomataSetFinalState' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Makes that state a final state</info>
|
||||
<return type='int' info='0 or -1 in case of error'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -9765,7 +9765,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='table' type='xmlAttributeTablePtr' info='An attribute table'/>
|
||||
</function>
|
||||
<function name='xmlFreeAutomata' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Free an automata</info>
|
||||
<return type='void'/>
|
||||
<arg name='am' type='xmlAutomataPtr' info='an automata'/>
|
||||
@ -11160,7 +11160,7 @@ Could we use @subtypes for this?'/>
|
||||
<arg name='URL' type='const char *' info='The proxy URL used to initialize the proxy context'/>
|
||||
</function>
|
||||
<function name='xmlNewAutomata' file='xmlautomata' module='xmlregexp'>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)</cond>
|
||||
<cond>defined(LIBXML_REGEXP_ENABLED)</cond>
|
||||
<info>Create a new automata</info>
|
||||
<return type='xmlAutomataPtr' info='the new object or NULL in case of failure'/>
|
||||
</function>
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
#include <libxml/xmlversion.h>
|
||||
|
||||
#ifdef LIBXML_REGEXP_ENABLED
|
||||
#ifdef LIBXML_AUTOMATA_ENABLED
|
||||
|
||||
#include <libxml/xmlstring.h>
|
||||
|
||||
@ -140,7 +139,6 @@ XMLPUBFUN int
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LIBXML_AUTOMATA_ENABLED */
|
||||
#endif /* LIBXML_REGEXP_ENABLED */
|
||||
|
||||
#endif /* __XML_AUTOMATA_H__ */
|
||||
|
||||
2
parser.c
2
parser.c
@ -639,7 +639,7 @@ xmlHasFeature(xmlFeature feature)
|
||||
return(0);
|
||||
#endif
|
||||
case XML_WITH_AUTOMATA:
|
||||
#ifdef LIBXML_AUTOMATA_ENABLED
|
||||
#ifdef LIBXML_REGEXP_ENABLED
|
||||
return(1);
|
||||
#else
|
||||
return(0);
|
||||
|
||||
@ -4452,9 +4452,6 @@ done:
|
||||
return(res);
|
||||
}
|
||||
|
||||
#endif /* LIBXML_REGEXPS_ENABLED */
|
||||
|
||||
#ifdef LIBXML_AUTOMATA_ENABLED
|
||||
/************************************************************************
|
||||
* *
|
||||
* Automata tests *
|
||||
@ -4691,7 +4688,7 @@ automataTest(const char *filename, const char *result,
|
||||
return(res);
|
||||
}
|
||||
|
||||
#endif /* LIBXML_AUTOMATA_ENABLED */
|
||||
#endif /* LIBXML_REGEXP_ENABLED */
|
||||
|
||||
/************************************************************************
|
||||
* *
|
||||
@ -4899,8 +4896,6 @@ testDesc testDescriptions[] = {
|
||||
{ "Regexp regression tests" ,
|
||||
regexpTest, "./test/regexp/*", "result/regexp/", "", ".err",
|
||||
0 },
|
||||
#endif
|
||||
#if defined(LIBXML_AUTOMATA_ENABLED)
|
||||
{ "Automata regression tests" ,
|
||||
automataTest, "./test/automata/*", "result/automata/", "", NULL,
|
||||
0 },
|
||||
|
||||
@ -29872,7 +29872,7 @@ static int
|
||||
test_xmlAutomataIsDeterminist(void) {
|
||||
int test_ret = 0;
|
||||
|
||||
#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
|
||||
#if defined(LIBXML_REGEXP_ENABLED)
|
||||
int mem_base;
|
||||
int ret_val;
|
||||
xmlAutomataPtr am; /* an automata */
|
||||
@ -29946,7 +29946,7 @@ static int
|
||||
test_xmlAutomataNewCounter(void) {
|
||||
int test_ret = 0;
|
||||
|
||||
#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
|
||||
#if defined(LIBXML_REGEXP_ENABLED)
|
||||
int mem_base;
|
||||
int ret_val;
|
||||
xmlAutomataPtr am; /* an automata */
|
||||
@ -30081,7 +30081,7 @@ static int
|
||||
test_xmlAutomataSetFinalState(void) {
|
||||
int test_ret = 0;
|
||||
|
||||
#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_AUTOMATA_ENABLED)
|
||||
#if defined(LIBXML_REGEXP_ENABLED)
|
||||
int mem_base;
|
||||
int ret_val;
|
||||
xmlAutomataPtr am; /* an automata */
|
||||
|
||||
@ -5550,7 +5550,6 @@ xmlRegFreeRegexp(xmlRegexpPtr regexp) {
|
||||
xmlFree(regexp);
|
||||
}
|
||||
|
||||
#ifdef LIBXML_AUTOMATA_ENABLED
|
||||
/************************************************************************
|
||||
* *
|
||||
* The Automata interface *
|
||||
@ -6315,7 +6314,6 @@ xmlAutomataIsDeterminist(xmlAutomataPtr am) {
|
||||
ret = xmlFAComputesDeterminism(am);
|
||||
return(ret);
|
||||
}
|
||||
#endif /* LIBXML_AUTOMATA_ENABLED */
|
||||
|
||||
#ifdef LIBXML_EXPR_ENABLED
|
||||
/************************************************************************
|
||||
|
||||
Loading…
Reference in New Issue
Block a user