Commit b509f154 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

more work on the automata interfaces and debug of counted choices added a

* xmlregexp.c xmlschemas.c include/libxml/xmlautomata.h: more work
  on the automata interfaces and debug of counted choices
* test/schemas/* result/schemas/*: added a number of tests
Daniel
parent 8651f536
Wed Apr 17 18:26:07 CEST 2002 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c xmlschemas.c include/libxml/xmlautomata.h: more work
on the automata interfaces and debug of counted choices
* test/schemas/* result/schemas/*: added a number of tests
Wed Apr 17 11:03:03 CEST 2002 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c xmlschemastypes.c include/libxml/xmlschemas.h:
......
......@@ -63,7 +63,17 @@ xmlAutomataStatePtr xmlAutomataNewCountTrans(xmlAutomataPtr am,
xmlAutomataStatePtr xmlAutomataNewEpsilon (xmlAutomataPtr am,
xmlAutomataStatePtr from,
xmlAutomataStatePtr to);
int xmlAutomataNewCounter (xmlAutomataPtr am);
xmlAutomataStatePtr xmlAutomataNewCountedTrans(xmlAutomataPtr am,
xmlAutomataStatePtr from,
xmlAutomataStatePtr to,
int counter);
xmlAutomataStatePtr xmlAutomataNewCounterTrans(xmlAutomataPtr am,
xmlAutomataStatePtr from,
xmlAutomataStatePtr to,
int counter);
int xmlAutomataNewCounter (xmlAutomataPtr am,
int min,
int max);
xmlRegexpPtr xmlAutomataCompile (xmlAutomataPtr am);
......
./test/schemas/choice_5.xml fails to validate
Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_0.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_0.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_0.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: 0, 2 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
./test/schemas/choice_6.xml fails to validate
Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_0.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_0.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_0.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: 0, 2 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
./test/schemas/choice_0.xml validates
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check succeeded
./test/schemas/choice_1.xml validates
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: b, b, b
Element doc content check succeeded
./test/schemas/choice_2.xml fails to validate
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
./test/schemas/choice_3.xml fails to validate
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
./test/schemas/choice_4.xml validates
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
Element doc content check succeeded
./test/schemas/choice_5.xml fails to validate
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
./test/schemas/choice_6.xml fails to validate
Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Type of anontype1 : ./test/schemas/choice_1.xsd:4 :elements
Type of sequence 2 : ./test/schemas/choice_1.xsd:5 :elements
Building content model for doc
Content model of doc:
regexp: '(null)'
2 atoms:
00 atom: string once 'a'
01 atom: string once 'b'
4 states:
state: FINAL 0, 3 transitions:
trans: atom 0, to 2
trans: atom 1, to 3
trans: removed
state: FINAL 1, 0 transitions:
state: FINAL 2, 1 transitions:
trans: removed
state: FINAL 3, 1 transitions:
trans: removed
0 counters:
Building content model for a
Building content model for b
xmlSchemaValidateCallback: a, a, a
Element doc content check failed
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment