diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | result/schemas/poschargrp0_0_0 | 1 | ||||
| -rw-r--r-- | result/schemas/poschargrp0_0_0.err | 0 | ||||
| -rw-r--r-- | test/schemas/poschargrp0_0.xml | 2 | ||||
| -rw-r--r-- | test/schemas/poschargrp0_0.xsd | 14 | ||||
| -rw-r--r-- | xmlregexp.c | 2 |
6 files changed, 25 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Feb 8 11:33:15 CET 2008 Daniel Veillard <daniel@veillard.com> + + * xmlregexp.c: apply patch from Andrew Tosh to fix behaviour + when '.' is used in a posCharGroup + * test/schemas/poschargrp0_0.* result/schemas/poschargrp0_0_0*: + added the test to the regression suite + Fri Feb 8 10:54:09 CET 2008 Daniel Veillard <daniel@veillard.com> * dict.c: applied patch from Florent Guilian to remove an diff --git a/result/schemas/poschargrp0_0_0 b/result/schemas/poschargrp0_0_0 new file mode 100644 index 00000000..de14f4d0 --- /dev/null +++ b/result/schemas/poschargrp0_0_0 @@ -0,0 +1 @@ +./test/schemas/poschargrp0_0.xml validates diff --git a/result/schemas/poschargrp0_0_0.err b/result/schemas/poschargrp0_0_0.err new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/result/schemas/poschargrp0_0_0.err diff --git a/test/schemas/poschargrp0_0.xml b/test/schemas/poschargrp0_0.xml new file mode 100644 index 00000000..0800b1bc --- /dev/null +++ b/test/schemas/poschargrp0_0.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<testElem xmlns="http://obj-sys.com/mySchema">value</testElem>
\ No newline at end of file diff --git a/test/schemas/poschargrp0_0.xsd b/test/schemas/poschargrp0_0.xsd new file mode 100644 index 00000000..3243a2ff --- /dev/null +++ b/test/schemas/poschargrp0_0.xsd @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema targetNamespace="http://obj-sys.com/mySchema"
+ xmlns:elementFormDefault="qualified"
+ xmlns="http://obj-sys.com/mySchema"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="testElem">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[^.:/]+"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+</xs:schema>
diff --git a/xmlregexp.c b/xmlregexp.c index a3e16c57..52e484cb 100644 --- a/xmlregexp.c +++ b/xmlregexp.c @@ -5052,7 +5052,7 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) { static void xmlFAParsePosCharGroup(xmlRegParserCtxtPtr ctxt) { do { - if ((CUR == '\\') || (CUR == '.')) { + if (CUR == '\\') { xmlFAParseCharClassEsc(ctxt); } else { xmlFAParseCharRange(ctxt); |