From 1ba2aca3ebc3b47653a86849746b168a4e0bd8c6 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 31 Aug 2009 16:47:39 +0200 Subject: 492317 Fix Relax-NG validation problems * relaxng.c xmlregexp.c: a subtle problem when checking for compileable content model, if using the same elements in cases of choices. Handled by adding a special flag to the regexp compilation to detect transitions with different atoms using same strings. * test/relaxng/492317* result/relaxng/492317*: add the test to the regression suite --- result/relaxng/492317_0 | 0 result/relaxng/492317_0.err | 1 + result/relaxng/492317_1 | 0 result/relaxng/492317_1.err | 1 + result/relaxng/492317_2 | 0 result/relaxng/492317_2.err | 3 +++ result/relaxng/492317_err | 1 + result/relaxng/492317_valid | 0 8 files changed, 6 insertions(+) create mode 100644 result/relaxng/492317_0 create mode 100644 result/relaxng/492317_0.err create mode 100644 result/relaxng/492317_1 create mode 100644 result/relaxng/492317_1.err create mode 100644 result/relaxng/492317_2 create mode 100644 result/relaxng/492317_2.err create mode 100644 result/relaxng/492317_err create mode 100644 result/relaxng/492317_valid (limited to 'result') diff --git a/result/relaxng/492317_0 b/result/relaxng/492317_0 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/492317_0.err b/result/relaxng/492317_0.err new file mode 100644 index 00000000..9b8db15c --- /dev/null +++ b/result/relaxng/492317_0.err @@ -0,0 +1 @@ +./test/relaxng/492317_0.xml validates diff --git a/result/relaxng/492317_1 b/result/relaxng/492317_1 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/492317_1.err b/result/relaxng/492317_1.err new file mode 100644 index 00000000..177ee7b1 --- /dev/null +++ b/result/relaxng/492317_1.err @@ -0,0 +1 @@ +./test/relaxng/492317_1.xml validates diff --git a/result/relaxng/492317_2 b/result/relaxng/492317_2 new file mode 100644 index 00000000..e69de29b diff --git a/result/relaxng/492317_2.err b/result/relaxng/492317_2.err new file mode 100644 index 00000000..e8b22e7a --- /dev/null +++ b/result/relaxng/492317_2.err @@ -0,0 +1,3 @@ +./test/relaxng/492317_2.xml:2: element child: Relax-NG validity error : Element child failed to validate attributes +./test/relaxng/492317_2.xml:1: element root: Relax-NG validity error : Element root failed to validate content +./test/relaxng/492317_2.xml fails to validate diff --git a/result/relaxng/492317_err b/result/relaxng/492317_err new file mode 100644 index 00000000..1f075391 --- /dev/null +++ b/result/relaxng/492317_err @@ -0,0 +1 @@ +./test/relaxng/492317.rng validates diff --git a/result/relaxng/492317_valid b/result/relaxng/492317_valid new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3