diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-10-07 11:33:24 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-10-07 11:33:24 +0000 |
| commit | 4c0041471199f283c4e696526c73e2809da54e21 (patch) | |
| tree | 0f92ad687f697410ecd51428389fc5a83c222a6c /result/relaxng | |
| parent | 141310afa1a810af1287cf939e1b7c78219c7461 (diff) | |
| download | android_external_libxml2-4c0041471199f283c4e696526c73e2809da54e21.tar.gz android_external_libxml2-4c0041471199f283c4e696526c73e2809da54e21.tar.bz2 android_external_libxml2-4c0041471199f283c4e696526c73e2809da54e21.zip | |
switched Relax-NG module to teh new error reporting. Better default
* error.c relaxng.c include/libxml/xmlerror.h: switched Relax-NG
module to teh new error reporting. Better default report, adds
the element associated if found, context and node are included
in the xmlError
* python/tests/reader2.py: the error messages changed.
* result/relaxng/*: error message changed too.
Daniel
Diffstat (limited to 'result/relaxng')
31 files changed, 50 insertions, 96 deletions
diff --git a/result/relaxng/tutor10_1_4.err b/result/relaxng/tutor10_1_4.err index 862ed3a7..4555c6b1 100644 --- a/result/relaxng/tutor10_1_4.err +++ b/result/relaxng/tutor10_1_4.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_1_4.xml line 1 element foo -Expecting a namespace for element foo +./test/relaxng/tutor10_1_4.xml:1: element foo: Relax-NG validaty error : Expecting a namespace for element foo diff --git a/result/relaxng/tutor10_1_5.err b/result/relaxng/tutor10_1_5.err index 73a01855..e4cdee51 100644 --- a/result/relaxng/tutor10_1_5.err +++ b/result/relaxng/tutor10_1_5.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_1_5.xml line 1 element foo -Element foo has wrong namespace: expecting http://www.example.com +./test/relaxng/tutor10_1_5.xml:1: element foo: Relax-NG validaty error : Element foo has wrong namespace: expecting http://www.example.com diff --git a/result/relaxng/tutor10_1_6.err b/result/relaxng/tutor10_1_6.err index b072f4bb..b1814e48 100644 --- a/result/relaxng/tutor10_1_6.err +++ b/result/relaxng/tutor10_1_6.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_1_6.xml line 1 element foo -Element foo has wrong namespace: expecting http://www.example.com +./test/relaxng/tutor10_1_6.xml:1: element foo: Relax-NG validaty error : Element foo has wrong namespace: expecting http://www.example.com diff --git a/result/relaxng/tutor10_2_3.err b/result/relaxng/tutor10_2_3.err index ee88e073..31930f74 100644 --- a/result/relaxng/tutor10_2_3.err +++ b/result/relaxng/tutor10_2_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_2_3.xml line 1 element foo -Expecting no namespace for element foo +./test/relaxng/tutor10_2_3.xml:1: element foo: Relax-NG validaty error : Expecting no namespace for element foo diff --git a/result/relaxng/tutor10_2_4.err b/result/relaxng/tutor10_2_4.err index e6314402..bc9c079e 100644 --- a/result/relaxng/tutor10_2_4.err +++ b/result/relaxng/tutor10_2_4.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_2_4.xml line 1 element foo -Expecting no namespace for element foo +./test/relaxng/tutor10_2_4.xml:1: element foo: Relax-NG validaty error : Expecting no namespace for element foo diff --git a/result/relaxng/tutor10_7_3.err b/result/relaxng/tutor10_7_3.err index bc3d6acd..99cb397c 100644 --- a/result/relaxng/tutor10_7_3.err +++ b/result/relaxng/tutor10_7_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_7_3.xml line 2 element card -Element card failed to validate attributes +./test/relaxng/tutor10_7_3.xml:2: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor10_8_3.err b/result/relaxng/tutor10_8_3.err index 06229bf1..cba27cac 100644 --- a/result/relaxng/tutor10_8_3.err +++ b/result/relaxng/tutor10_8_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor10_8_3.xml line 2 element card -Element card failed to validate attributes +./test/relaxng/tutor10_8_3.xml:2: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor11_2_2.err b/result/relaxng/tutor11_2_2.err index 03d2edce..80b64407 100644 --- a/result/relaxng/tutor11_2_2.err +++ b/result/relaxng/tutor11_2_2.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor11_2_2.xml line 3 element card -Invalid attribute foo for element card +./test/relaxng/tutor11_2_2.xml:3: element card: Relax-NG validaty error : Invalid attribute foo for element card diff --git a/result/relaxng/tutor11_2_3.err b/result/relaxng/tutor11_2_3.err index fed4d2dd..59e56336 100644 --- a/result/relaxng/tutor11_2_3.err +++ b/result/relaxng/tutor11_2_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor11_2_3.xml line 3 element card -Invalid attribute b for element card +./test/relaxng/tutor11_2_3.xml:3: element card: Relax-NG validaty error : Invalid attribute b for element card diff --git a/result/relaxng/tutor11_3_1.err b/result/relaxng/tutor11_3_1.err index f3d6d11b..de9db32a 100644 --- a/result/relaxng/tutor11_3_1.err +++ b/result/relaxng/tutor11_3_1.err @@ -1,2 +1,2 @@ -Attributes conflicts in group +./test/relaxng/tutor11_3.rng:1: element element: Relax-NG parser error : Attributes conflicts in group Relax-NG schema ./test/relaxng/tutor11_3.rng failed to compile diff --git a/result/relaxng/tutor3_2_1.err b/result/relaxng/tutor3_2_1.err index 73577fcb..b52e5881 100644 --- a/result/relaxng/tutor3_2_1.err +++ b/result/relaxng/tutor3_2_1.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor3_2_1.xml line 1 element email -Did not expect element email there +./test/relaxng/tutor3_2_1.xml:1: element email: Relax-NG validaty error : Did not expect element email there diff --git a/result/relaxng/tutor3_5_2.err b/result/relaxng/tutor3_5_2.err index 80acb18f..931784a9 100644 --- a/result/relaxng/tutor3_5_2.err +++ b/result/relaxng/tutor3_5_2.err @@ -1,4 +1,2 @@ -RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element email -Expecting element name, got email -RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element email -Element card failed to validate content +./test/relaxng/tutor3_5_2.xml:2: element email: Relax-NG validaty error : Expecting element name, got email +./test/relaxng/tutor3_5_2.xml:2: element email: Relax-NG validaty error : Element card failed to validate content diff --git a/result/relaxng/tutor3_7_1.err b/result/relaxng/tutor3_7_1.err index e36d2bb0..88b21328 100644 --- a/result/relaxng/tutor3_7_1.err +++ b/result/relaxng/tutor3_7_1.err @@ -1,2 +1,2 @@ -xmlRelaxNGParseElement: element has no content +./test/relaxng/tutor3_7.rng:1: element element: Relax-NG parser error : xmlRelaxNGParseElement: element has no content Relax-NG schema ./test/relaxng/tutor3_7.rng failed to compile diff --git a/result/relaxng/tutor3_7_err b/result/relaxng/tutor3_7_err index b30a3c49..90cd7ed9 100644 --- a/result/relaxng/tutor3_7_err +++ b/result/relaxng/tutor3_7_err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element -Expecting an element , got nothing -RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element -Invalid sequence in interleave -RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element -Element element failed to validate content +./test/relaxng/tutor3_7.rng:1: element element: Relax-NG validaty error : Expecting an element , got nothing +./test/relaxng/tutor3_7.rng:1: element element: Relax-NG validaty error : Invalid sequence in interleave +./test/relaxng/tutor3_7.rng:1: element element: Relax-NG validaty error : Element element failed to validate content diff --git a/result/relaxng/tutor4_4_1.err b/result/relaxng/tutor4_4_1.err index 8b404450..595bd6ea 100644 --- a/result/relaxng/tutor4_4_1.err +++ b/result/relaxng/tutor4_4_1.err @@ -1,2 +1,2 @@ -Detected a cycle in inline references +./test/relaxng/tutor4_4.rng:25: element ref: Relax-NG parser error : Detected a cycle in inline references Relax-NG schema ./test/relaxng/tutor4_4.rng failed to compile diff --git a/result/relaxng/tutor5_3_1.err b/result/relaxng/tutor5_3_1.err index 343fa31b..72f43794 100644 --- a/result/relaxng/tutor5_3_1.err +++ b/result/relaxng/tutor5_3_1.err @@ -1,2 +1,2 @@ -Element bad has a content type error +./test/relaxng/tutor5_3.rng:1: element element: Relax-NG parser error : Element bad has a content type error Relax-NG schema ./test/relaxng/tutor5_3.rng failed to compile diff --git a/result/relaxng/tutor6_1_3.err b/result/relaxng/tutor6_1_3.err index 3af31ee0..44493362 100644 --- a/result/relaxng/tutor6_1_3.err +++ b/result/relaxng/tutor6_1_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor6_1_3.xml line 1 element card -Element card failed to validate attributes +./test/relaxng/tutor6_1_3.xml:1: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor6_2_4.err b/result/relaxng/tutor6_2_4.err index 69e34dc6..2310af33 100644 --- a/result/relaxng/tutor6_2_4.err +++ b/result/relaxng/tutor6_2_4.err @@ -1,4 +1,2 @@ -RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text -Error validating value -RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text -Element preferredFormat failed to validate content +./test/relaxng/tutor6_2_4.xml:4: element preferredFormat: Relax-NG validaty error : Error validating value +./test/relaxng/tutor6_2_4.xml:4: element preferredFormat: Relax-NG validaty error : Element preferredFormat failed to validate content diff --git a/result/relaxng/tutor6_3_1.err b/result/relaxng/tutor6_3_1.err index 7957caca..40793fea 100644 --- a/result/relaxng/tutor6_3_1.err +++ b/result/relaxng/tutor6_3_1.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor6_3_1.xml line 1 element card -Element card failed to validate attributes +./test/relaxng/tutor6_3_1.xml:1: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor7_1_2.err b/result/relaxng/tutor7_1_2.err index f5effb6b..3c726025 100644 --- a/result/relaxng/tutor7_1_2.err +++ b/result/relaxng/tutor7_1_2.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text -failed to validate type float -RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text -Error validating list -RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text -Element vector failed to validate content +./test/relaxng/tutor7_1_2.xml:1: element vector: Relax-NG validaty error : failed to validate type float +./test/relaxng/tutor7_1_2.xml:1: element vector: Relax-NG validaty error : Error validating list +./test/relaxng/tutor7_1_2.xml:1: element vector: Relax-NG validaty error : Element vector failed to validate content diff --git a/result/relaxng/tutor7_1_3.err b/result/relaxng/tutor7_1_3.err index 2a048cd2..29f6e830 100644 --- a/result/relaxng/tutor7_1_3.err +++ b/result/relaxng/tutor7_1_3.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text -Extra data in list: 5.6 -RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text -Error validating list -RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text -Element vector failed to validate content +./test/relaxng/tutor7_1_3.xml:1: element vector: Relax-NG validaty error : Extra data in list: 5.6 +./test/relaxng/tutor7_1_3.xml:1: element vector: Relax-NG validaty error : Error validating list +./test/relaxng/tutor7_1_3.xml:1: element vector: Relax-NG validaty error : Element vector failed to validate content diff --git a/result/relaxng/tutor7_2_4.err b/result/relaxng/tutor7_2_4.err index bf3b777a..ee457177 100644 --- a/result/relaxng/tutor7_2_4.err +++ b/result/relaxng/tutor7_2_4.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor7_2_4.xml line 1 element vector -failed to validate type double -RNG validity error: file ./test/relaxng/tutor7_2_4.xml line 1 element vector -Error validating list -RNG validity error: file ./test/relaxng/tutor7_2_4.xml line 1 element vector -Element vector failed to validate content +./test/relaxng/tutor7_2_4.xml:1: element vector: Relax-NG validaty error : failed to validate type double +./test/relaxng/tutor7_2_4.xml:1: element vector: Relax-NG validaty error : Error validating list +./test/relaxng/tutor7_2_4.xml:1: element vector: Relax-NG validaty error : Element vector failed to validate content diff --git a/result/relaxng/tutor7_3_4.err b/result/relaxng/tutor7_3_4.err index 8754d98c..d6651c47 100644 --- a/result/relaxng/tutor7_3_4.err +++ b/result/relaxng/tutor7_3_4.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text -Extra data in list: 5.6 -RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text -Error validating list -RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text -Element path failed to validate content +./test/relaxng/tutor7_3_4.xml:1: element path: Relax-NG validaty error : Extra data in list: 5.6 +./test/relaxng/tutor7_3_4.xml:1: element path: Relax-NG validaty error : Error validating list +./test/relaxng/tutor7_3_4.xml:1: element path: Relax-NG validaty error : Element path failed to validate content diff --git a/result/relaxng/tutor7_3_5.err b/result/relaxng/tutor7_3_5.err index 3d68250e..939cda78 100644 --- a/result/relaxng/tutor7_3_5.err +++ b/result/relaxng/tutor7_3_5.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text -failed to validate type double -RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text -Error validating list -RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text -Element path failed to validate content +./test/relaxng/tutor7_3_5.xml:1: element path: Relax-NG validaty error : failed to validate type double +./test/relaxng/tutor7_3_5.xml:1: element path: Relax-NG validaty error : Error validating list +./test/relaxng/tutor7_3_5.xml:1: element path: Relax-NG validaty error : Element path failed to validate content diff --git a/result/relaxng/tutor8_2_4.err b/result/relaxng/tutor8_2_4.err index 01a9ddb6..ec856475 100644 --- a/result/relaxng/tutor8_2_4.err +++ b/result/relaxng/tutor8_2_4.err @@ -1,4 +1,2 @@ -RNG validity error -Extra element title in interleave -RNG validity error: file ./test/relaxng/tutor8_2_4.xml line 5 element title -Element head failed to validate content +Entity: line 0: Relax-NG validaty error : Extra element title in interleave +./test/relaxng/tutor8_2_4.xml:5: element title: Relax-NG validaty error : Element head failed to validate content diff --git a/result/relaxng/tutor8_2_5.err b/result/relaxng/tutor8_2_5.err index 71d49f83..d2346386 100644 --- a/result/relaxng/tutor8_2_5.err +++ b/result/relaxng/tutor8_2_5.err @@ -1,6 +1,3 @@ -RNG validity error: file ./test/relaxng/tutor8_2_5.xml line 1 element head -Expecting an element title, got nothing -RNG validity error: file ./test/relaxng/tutor8_2_5.xml line 1 element head -Invalid sequence in interleave -RNG validity error: file ./test/relaxng/tutor8_2_5.xml line 1 element head -Element head failed to validate content +./test/relaxng/tutor8_2_5.xml:1: element head: Relax-NG validaty error : Expecting an element title, got nothing +./test/relaxng/tutor8_2_5.xml:1: element head: Relax-NG validaty error : Invalid sequence in interleave +./test/relaxng/tutor8_2_5.xml:1: element head: Relax-NG validaty error : Element head failed to validate content diff --git a/result/relaxng/tutor8_2_6.err b/result/relaxng/tutor8_2_6.err index c1fb4d11..9a40a951 100644 --- a/result/relaxng/tutor8_2_6.err +++ b/result/relaxng/tutor8_2_6.err @@ -1,4 +1,2 @@ -RNG validity error -Extra element base in interleave -RNG validity error: file ./test/relaxng/tutor8_2_6.xml line 4 element base -Element head failed to validate content +Entity: line 0: Relax-NG validaty error : Extra element base in interleave +./test/relaxng/tutor8_2_6.xml:4: element base: Relax-NG validaty error : Element head failed to validate content diff --git a/result/relaxng/tutor9_5_2.err b/result/relaxng/tutor9_5_2.err index ede3b450..5c02b09c 100644 --- a/result/relaxng/tutor9_5_2.err +++ b/result/relaxng/tutor9_5_2.err @@ -1,4 +1,2 @@ -RNG validity error: file ./test/relaxng/tutor9_5_2.xml line 2 element card -Invalid sequence in interleave -RNG validity error: file ./test/relaxng/tutor9_5_2.xml line 2 element card -Element card failed to validate attributes +./test/relaxng/tutor9_5_2.xml:2: element card: Relax-NG validaty error : Invalid sequence in interleave +./test/relaxng/tutor9_5_2.xml:2: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor9_5_3.err b/result/relaxng/tutor9_5_3.err index 4566bccb..3fe9f015 100644 --- a/result/relaxng/tutor9_5_3.err +++ b/result/relaxng/tutor9_5_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor9_5_3.xml line 2 element card -Invalid attribute error for element card +./test/relaxng/tutor9_5_3.xml:2: element card: Relax-NG validaty error : Invalid attribute error for element card diff --git a/result/relaxng/tutor9_6_2.err b/result/relaxng/tutor9_6_2.err index 1a10f1b6..c188a093 100644 --- a/result/relaxng/tutor9_6_2.err +++ b/result/relaxng/tutor9_6_2.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor9_6_2.xml line 2 element card -Element card failed to validate attributes +./test/relaxng/tutor9_6_2.xml:2: element card: Relax-NG validaty error : Element card failed to validate attributes diff --git a/result/relaxng/tutor9_6_3.err b/result/relaxng/tutor9_6_3.err index e92c5f1a..ac0df982 100644 --- a/result/relaxng/tutor9_6_3.err +++ b/result/relaxng/tutor9_6_3.err @@ -1,2 +1 @@ -RNG validity error: file ./test/relaxng/tutor9_6_3.xml line 2 element card -Invalid attribute error for element card +./test/relaxng/tutor9_6_3.xml:2: element card: Relax-NG validaty error : Invalid attribute error for element card |