diff --git a/ChangeLog b/ChangeLog
index c68cab41..e857fe82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 18 09:58:48 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* hash.c: applied a patch from Peter Jacobi to solve a problem
+	  when compiling with the Watcom C on Win32 
+	* result/schemas/*.err: the change of hashing algo generated
+	  permutations in the output
+
 Mon Jun 17 19:02:49 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* hash.c: applied patch from Sander Vesik improving the quality of
diff --git a/hash.c b/hash.c
index 4000f8d3..f1bfb926 100644
--- a/hash.c
+++ b/hash.c
@@ -507,9 +507,25 @@ xmlHashLookup3(xmlHashTablePtr table, const xmlChar *name,
  *
  * Scan the hash @table and applied @f to each value.
  */
+typedef struct {
+    xmlHashScanner hashscanner;
+    void *data;
+} stubData;
+
+static void 
+stubHashScannerFull (void *payload, void *data, const xmlChar *name, 
+    const xmlChar *name2, const xmlChar *name3
+) {
+    stubData *stubdata = (stubData *) data;
+    stubdata->hashscanner (payload, stubdata->data, (xmlChar *) name);
+}                                  
+ 
 void
 xmlHashScan(xmlHashTablePtr table, xmlHashScanner f, void *data) {
-    xmlHashScanFull (table, (xmlHashScannerFull) f, data);
+    stubData stubdata;
+    stubdata.data = data;
+    stubdata.hashscanner = f; 
+    xmlHashScanFull (table, stubHashScannerFull, &stubdata);
 }
 
 /**
diff --git a/result/schemas/all_0_0.err b/result/schemas/all_0_0.err
index edb1293f..2ab18858 100644
--- a/result/schemas/all_0_0.err
+++ b/result/schemas/all_0_0.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_0_1.err b/result/schemas/all_0_1.err
index 7f651e0a..6a0b9413 100644
--- a/result/schemas/all_0_1.err
+++ b/result/schemas/all_0_1.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_0_2.err b/result/schemas/all_0_2.err
index ac70924f..12fb41a6 100644
--- a/result/schemas/all_0_2.err
+++ b/result/schemas/all_0_2.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_0_3.err b/result/schemas/all_0_3.err
index 4e46e54f..d89fba38 100644
--- a/result/schemas/all_0_3.err
+++ b/result/schemas/all_0_3.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_0_4.err b/result/schemas/all_0_4.err
index 919a1d8e..32c13be0 100644
--- a/result/schemas/all_0_4.err
+++ b/result/schemas/all_0_4.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_0_5.err b/result/schemas/all_0_5.err
index 4e46e54f..d89fba38 100644
--- a/result/schemas/all_0_5.err
+++ b/result/schemas/all_0_5.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_0.xsd:5 :elements
-Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_0.xsd:4 :elements
+Type of all2 : ./test/schemas/all_0.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_0.err b/result/schemas/all_1_0.err
index a4ac03a4..08abd1e7 100644
--- a/result/schemas/all_1_0.err
+++ b/result/schemas/all_1_0.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_1.err b/result/schemas/all_1_1.err
index 588e4c36..c27bfeb9 100644
--- a/result/schemas/all_1_1.err
+++ b/result/schemas/all_1_1.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_2.err b/result/schemas/all_1_2.err
index 93933748..c0aacff2 100644
--- a/result/schemas/all_1_2.err
+++ b/result/schemas/all_1_2.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_3.err b/result/schemas/all_1_3.err
index fa53f9bf..9efeb99d 100644
--- a/result/schemas/all_1_3.err
+++ b/result/schemas/all_1_3.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_4.err b/result/schemas/all_1_4.err
index f4d5f0f7..ab7b3de7 100644
--- a/result/schemas/all_1_4.err
+++ b/result/schemas/all_1_4.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/all_1_5.err b/result/schemas/all_1_5.err
index a985e07e..6c950fca 100644
--- a/result/schemas/all_1_5.err
+++ b/result/schemas/all_1_5.err
@@ -1,6 +1,6 @@
 Type of all2 : ./test/schemas/all_1.xsd:5 :elements
-Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Type of anontype1 : ./test/schemas/all_1.xsd:4 :elements
+Type of all2 : ./test/schemas/all_1.xsd:5 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_0.err b/result/schemas/choice_0_0.err
index 75e6efff..8523ba7b 100644
--- a/result/schemas/choice_0_0.err
+++ b/result/schemas/choice_0_0.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_1.err b/result/schemas/choice_0_1.err
index 815464eb..0ee55bea 100644
--- a/result/schemas/choice_0_1.err
+++ b/result/schemas/choice_0_1.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_2.err b/result/schemas/choice_0_2.err
index 4f46528e..d6adfd73 100644
--- a/result/schemas/choice_0_2.err
+++ b/result/schemas/choice_0_2.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_3.err b/result/schemas/choice_0_3.err
index 4f46528e..d6adfd73 100644
--- a/result/schemas/choice_0_3.err
+++ b/result/schemas/choice_0_3.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_4.err b/result/schemas/choice_0_4.err
index 822ffd9f..03ad8b01 100644
--- a/result/schemas/choice_0_4.err
+++ b/result/schemas/choice_0_4.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_5.err b/result/schemas/choice_0_5.err
index 4f46528e..d6adfd73 100644
--- a/result/schemas/choice_0_5.err
+++ b/result/schemas/choice_0_5.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_0_6.err b/result/schemas/choice_0_6.err
index 4f46528e..d6adfd73 100644
--- a/result/schemas/choice_0_6.err
+++ b/result/schemas/choice_0_6.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_0.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_0.err b/result/schemas/choice_1_0.err
index a7828a70..4fa615d7 100644
--- a/result/schemas/choice_1_0.err
+++ b/result/schemas/choice_1_0.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_1.err b/result/schemas/choice_1_1.err
index 2e8e23be..1308b577 100644
--- a/result/schemas/choice_1_1.err
+++ b/result/schemas/choice_1_1.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_2.err b/result/schemas/choice_1_2.err
index 9446fe16..ffaba040 100644
--- a/result/schemas/choice_1_2.err
+++ b/result/schemas/choice_1_2.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_3.err b/result/schemas/choice_1_3.err
index 9446fe16..ffaba040 100644
--- a/result/schemas/choice_1_3.err
+++ b/result/schemas/choice_1_3.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_4.err b/result/schemas/choice_1_4.err
index 1c763d14..a35d8df5 100644
--- a/result/schemas/choice_1_4.err
+++ b/result/schemas/choice_1_4.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_5.err b/result/schemas/choice_1_5.err
index 9446fe16..ffaba040 100644
--- a/result/schemas/choice_1_5.err
+++ b/result/schemas/choice_1_5.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_1_6.err b/result/schemas/choice_1_6.err
index 9446fe16..ffaba040 100644
--- a/result/schemas/choice_1_6.err
+++ b/result/schemas/choice_1_6.err
@@ -1,7 +1,7 @@
-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
+Type of choice 3 : ./test/schemas/choice_1.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_0.err b/result/schemas/choice_2_0.err
index 2a782955..5b3ad9c9 100644
--- a/result/schemas/choice_2_0.err
+++ b/result/schemas/choice_2_0.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_1.err b/result/schemas/choice_2_1.err
index d349147e..9580fe65 100644
--- a/result/schemas/choice_2_1.err
+++ b/result/schemas/choice_2_1.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_2.err b/result/schemas/choice_2_2.err
index 8935b611..09267470 100644
--- a/result/schemas/choice_2_2.err
+++ b/result/schemas/choice_2_2.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_3.err b/result/schemas/choice_2_3.err
index 1f11884c..3bb98fe8 100644
--- a/result/schemas/choice_2_3.err
+++ b/result/schemas/choice_2_3.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_4.err b/result/schemas/choice_2_4.err
index 7a461a24..7a0d189b 100644
--- a/result/schemas/choice_2_4.err
+++ b/result/schemas/choice_2_4.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_5.err b/result/schemas/choice_2_5.err
index 7c1fa63c..c47f842c 100644
--- a/result/schemas/choice_2_5.err
+++ b/result/schemas/choice_2_5.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/choice_2_6.err b/result/schemas/choice_2_6.err
index b3c5b53e..ed38bb68 100644
--- a/result/schemas/choice_2_6.err
+++ b/result/schemas/choice_2_6.err
@@ -1,7 +1,7 @@
-Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
 Type of anontype1 : ./test/schemas/choice_2.xsd:4 :elements
 Type of sequence 2 : ./test/schemas/choice_2.xsd:5 :elements
+Type of choice 3 : ./test/schemas/choice_2.xsd:6 :elements
 Building content model for doc
 Content model of doc:
  regexp: '(null)' 
diff --git a/result/schemas/date_0_0.err b/result/schemas/date_0_0.err
index 7cd39e87..90e66882 100644
--- a/result/schemas/date_0_0.err
+++ b/result/schemas/date_0_0.err
@@ -1,29 +1,29 @@
+Type of restriction 7 : ./test/schemas/date_0.xsd:23 :empty
+Type of restriction 9 : ./test/schemas/date_0.xsd:31 :empty
+Type of simpletype14 : ./test/schemas/date_0.xsd:54 :simple
 Type of restriction 15 : ./test/schemas/date_0.xsd:55 :empty
 Type of simpletype22 : ./test/schemas/date_0.xsd:87 :simple
-Type of restriction 24 : ./test/schemas/date_0.xsd:102 :empty
-Type of restriction 5 : ./test/schemas/date_0.xsd:15 :empty
-Type of simpletype14 : ./test/schemas/date_0.xsd:54 :simple
-Type of holidays : ./test/schemas/date_0.xsd:98 :simple
-Type of choice 3 : ./test/schemas/date_0.xsd:11 :elements
 Type of simpletype4 : ./test/schemas/date_0.xsd:14 :simple
-Type of restriction 17 : ./test/schemas/date_0.xsd:64 :empty
-Type of restriction 7 : ./test/schemas/date_0.xsd:23 :empty
-Type of simpletype16 : ./test/schemas/date_0.xsd:63 :simple
-Type of simpletype6 : ./test/schemas/date_0.xsd:22 :simple
-Type of restriction 19 : ./test/schemas/date_0.xsd:72 :empty
-Type of restriction 9 : ./test/schemas/date_0.xsd:31 :empty
-Type of simpletype18 : ./test/schemas/date_0.xsd:71 :simple
-Type of simpletype8 : ./test/schemas/date_0.xsd:30 :simple
-Type of restriction 11 : ./test/schemas/date_0.xsd:39 :empty
+Type of restriction 5 : ./test/schemas/date_0.xsd:15 :empty
+Type of simpletype12 : ./test/schemas/date_0.xsd:46 :simple
+Type of restriction 23 : ./test/schemas/date_0.xsd:88 :empty
+Type of simpletype20 : ./test/schemas/date_0.xsd:79 :simple
 Type of sequence 2 : ./test/schemas/date_0.xsd:10 :elements
 Type of anontype1 : ./test/schemas/date_0.xsd:9 :elements
+Type of simpletype6 : ./test/schemas/date_0.xsd:22 :simple
 Type of simpletype10 : ./test/schemas/date_0.xsd:38 :simple
 Type of restriction 21 : ./test/schemas/date_0.xsd:80 :empty
 Type of restriction 13 : ./test/schemas/date_0.xsd:47 :empty
-Type of simpletype20 : ./test/schemas/date_0.xsd:79 :simple
+Type of restriction 19 : ./test/schemas/date_0.xsd:72 :empty
+Type of simpletype8 : ./test/schemas/date_0.xsd:30 :simple
+Type of simpletype18 : ./test/schemas/date_0.xsd:71 :simple
+Type of holidays : ./test/schemas/date_0.xsd:98 :simple
+Type of restriction 11 : ./test/schemas/date_0.xsd:39 :empty
+Type of simpletype16 : ./test/schemas/date_0.xsd:63 :simple
 Type of sequence 2 : ./test/schemas/date_0.xsd:10 :elements
-Type of simpletype12 : ./test/schemas/date_0.xsd:46 :simple
-Type of restriction 23 : ./test/schemas/date_0.xsd:88 :empty
+Type of choice 3 : ./test/schemas/date_0.xsd:11 :elements
+Type of restriction 17 : ./test/schemas/date_0.xsd:64 :empty
+Type of restriction 24 : ./test/schemas/date_0.xsd:102 :empty
 Building content model for date
 Content model of date:
  regexp: '(null)' 
diff --git a/result/schemas/dur_0_0.err b/result/schemas/dur_0_0.err
index d9064402..168f3b18 100644
--- a/result/schemas/dur_0_0.err
+++ b/result/schemas/dur_0_0.err
@@ -1,35 +1,35 @@
 compilation error: file ./test/schemas/dur_0.xsd line 67 element minOccurs
 Restriction restriction 16 has unexpected content
 compilation error
-Schemas: element year2 have both type and subtype
-compilation error
-Schemas: element second1 have both type and subtype
+Schemas: element year1 have both type and subtype
 compilation error
 Schemas: element second2 have both type and subtype
 compilation error
 Schemas: element month1 have both type and subtype
 compilation error
-Schemas: element month2 have both type and subtype
+Schemas: element year2 have both type and subtype
 compilation error
-Schemas: element year1 have both type and subtype
-Type of restriction 15 : ./test/schemas/dur_0.xsd:55 :empty
-Type of restriction 5 : ./test/schemas/dur_0.xsd:14 :empty
-Type of simpletype14 : ./test/schemas/dur_0.xsd:54 :simple
-Type of restriction 16 : ./test/schemas/dur_0.xsd:66 :empty
-Type of choice 3 : ./test/schemas/dur_0.xsd:11 :elements
-Type of simpletype4 : ./test/schemas/dur_0.xsd:13 :simple
+Schemas: element second1 have both type and subtype
+compilation error
+Schemas: element month2 have both type and subtype
 Type of restriction 7 : ./test/schemas/dur_0.xsd:22 :empty
-Type of simpletype6 : ./test/schemas/dur_0.xsd:21 :simple
 Type of restriction 9 : ./test/schemas/dur_0.xsd:30 :empty
-Type of simpletype8 : ./test/schemas/dur_0.xsd:29 :simple
-Type of restriction 11 : ./test/schemas/dur_0.xsd:38 :empty
-Type of sequence 2 : ./test/schemas/dur_0.xsd:10 :elements
-Type of anontype1 : ./test/schemas/dur_0.xsd:9 :elements
-Type of simpletype10 : ./test/schemas/dur_0.xsd:37 :simple
-Type of restriction 13 : ./test/schemas/dur_0.xsd:47 :empty
+Type of simpletype14 : ./test/schemas/dur_0.xsd:54 :simple
+Type of restriction 15 : ./test/schemas/dur_0.xsd:55 :empty
+Type of simpletype4 : ./test/schemas/dur_0.xsd:13 :simple
+Type of restriction 5 : ./test/schemas/dur_0.xsd:14 :empty
+Type of simpletype12 : ./test/schemas/dur_0.xsd:46 :simple
 Type of MSD : ./test/schemas/dur_0.xsd:65 :simple
 Type of sequence 2 : ./test/schemas/dur_0.xsd:10 :elements
-Type of simpletype12 : ./test/schemas/dur_0.xsd:46 :simple
+Type of anontype1 : ./test/schemas/dur_0.xsd:9 :elements
+Type of simpletype6 : ./test/schemas/dur_0.xsd:21 :simple
+Type of simpletype10 : ./test/schemas/dur_0.xsd:37 :simple
+Type of restriction 13 : ./test/schemas/dur_0.xsd:47 :empty
+Type of simpletype8 : ./test/schemas/dur_0.xsd:29 :simple
+Type of restriction 11 : ./test/schemas/dur_0.xsd:38 :empty
+Type of restriction 16 : ./test/schemas/dur_0.xsd:66 :empty
+Type of sequence 2 : ./test/schemas/dur_0.xsd:10 :elements
+Type of choice 3 : ./test/schemas/dur_0.xsd:11 :elements
 Building content model for duration
 Content model of duration:
  regexp: '(null)' 
@@ -190,7 +190,6 @@ xmlSchemaValidateCallback: month1, month1, month1
 xmlSchemaValidateCallback: month2, month2, month2
 xmlSchemaValidateCallback: year1, year1, year1
 xmlSchemaValidateCallback: year1, year1, year1
-Unimplemented block at xmlschemastypes.c:1253
 xmlSchemaValidateCallback: year2, year2, year2
 xmlSchemaValidateCallback: month3, month3, month3
 Element duration content check succeeded
diff --git a/result/schemas/empty_0_0.err b/result/schemas/empty_0_0.err
index 0f00d905..237ab4c5 100644
--- a/result/schemas/empty_0_0.err
+++ b/result/schemas/empty_0_0.err
@@ -1,7 +1,7 @@
 Type of restriction 3 : ./test/schemas/empty_0.xsd:6 :empty
 Type of complexContent 2 : ./test/schemas/empty_0.xsd:5 :empty
-Type of complexContent 2 : ./test/schemas/empty_0.xsd:5 :empty
 Type of anontype1 : ./test/schemas/empty_0.xsd:4 :empty
+Type of complexContent 2 : ./test/schemas/empty_0.xsd:5 :empty
 Type of restriction 3 : ./test/schemas/empty_0.xsd:6 :empty
 Building content model for internationalPrice
 Content model of internationalPrice:
diff --git a/result/schemas/extension0_0_0.err b/result/schemas/extension0_0_0.err
index 583ecb5d..2888b090 100644
--- a/result/schemas/extension0_0_0.err
+++ b/result/schemas/extension0_0_0.err
@@ -1,13 +1,13 @@
 Type of sequence 4 : ./test/schemas/extension0_0.xsd:13 :elements
-Type of sequence 4 : ./test/schemas/extension0_0.xsd:13 :elements
 Type of sequence 1 : ./test/schemas/extension0_0.xsd:4 :elements
 Type of personName : ./test/schemas/extension0_0.xsd:3 :elements
 Type of extension 3 : ./test/schemas/extension0_0.xsd:12 :elements
-Type of extension 3 : ./test/schemas/extension0_0.xsd:12 :elements
-Type of complexContent 2 : ./test/schemas/extension0_0.xsd:11 :elements
 Type of complexContent 2 : ./test/schemas/extension0_0.xsd:11 :elements
 Type of extendedName : ./test/schemas/extension0_0.xsd:10 :elements
 Type of personName : ./test/schemas/extension0_0.xsd:3 :elements
+Type of complexContent 2 : ./test/schemas/extension0_0.xsd:11 :elements
+Type of extension 3 : ./test/schemas/extension0_0.xsd:12 :elements
+Type of sequence 4 : ./test/schemas/extension0_0.xsd:13 :elements
 Type of sequence 1 : ./test/schemas/extension0_0.xsd:4 :elements
 Building content model for addressee
 Content model of addressee:
diff --git a/result/schemas/item_0_0.err b/result/schemas/item_0_0.err
index 93590117..37b42eb6 100644
--- a/result/schemas/item_0_0.err
+++ b/result/schemas/item_0_0.err
@@ -1,12 +1,12 @@
-Type of sequence 3 : ./test/schemas/item_0.xsd:12 :elements
-Type of restriction 5 : ./test/schemas/item_0.xsd:16 :empty
-Type of simpletype4 : ./test/schemas/item_0.xsd:15 :simple
-Type of SKU : ./test/schemas/item_0.xsd:5 :simple
 Type of restriction 8 : ./test/schemas/item_0.xsd:30 :empty
-Type of simpletype7 : ./test/schemas/item_0.xsd:29 :simple
-Type of restriction 1 : ./test/schemas/item_0.xsd:6 :empty
+Type of simpletype4 : ./test/schemas/item_0.xsd:15 :simple
+Type of restriction 5 : ./test/schemas/item_0.xsd:16 :empty
 Type of sequence 3 : ./test/schemas/item_0.xsd:12 :elements
 Type of anontype2 : ./test/schemas/item_0.xsd:11 :elements
+Type of sequence 3 : ./test/schemas/item_0.xsd:12 :elements
+Type of simpletype7 : ./test/schemas/item_0.xsd:29 :simple
+Type of restriction 1 : ./test/schemas/item_0.xsd:6 :empty
+Type of SKU : ./test/schemas/item_0.xsd:5 :simple
 Building content model for Item
 Content model of Item:
  regexp: '(null)' 
diff --git a/result/schemas/item_1_0.err b/result/schemas/item_1_0.err
index 1c5674e5..125cd709 100644
--- a/result/schemas/item_1_0.err
+++ b/result/schemas/item_1_0.err
@@ -1,12 +1,12 @@
-Type of sequence 3 : ./test/schemas/item_1.xsd:12 :elements
-Type of restriction 5 : ./test/schemas/item_1.xsd:16 :empty
-Type of simpletype4 : ./test/schemas/item_1.xsd:15 :simple
-Type of SKU : ./test/schemas/item_1.xsd:5 :simple
 Type of restriction 9 : ./test/schemas/item_1.xsd:34 :empty
-Type of simpletype8 : ./test/schemas/item_1.xsd:33 :simple
-Type of restriction 1 : ./test/schemas/item_1.xsd:6 :empty
+Type of simpletype4 : ./test/schemas/item_1.xsd:15 :simple
+Type of restriction 5 : ./test/schemas/item_1.xsd:16 :empty
 Type of sequence 3 : ./test/schemas/item_1.xsd:12 :elements
 Type of anontype2 : ./test/schemas/item_1.xsd:11 :elements
+Type of sequence 3 : ./test/schemas/item_1.xsd:12 :elements
+Type of simpletype8 : ./test/schemas/item_1.xsd:33 :simple
+Type of restriction 1 : ./test/schemas/item_1.xsd:6 :empty
+Type of SKU : ./test/schemas/item_1.xsd:5 :simple
 Building content model for Item
 Content model of Item:
  regexp: '(null)' 
diff --git a/result/schemas/length2_0_0.err b/result/schemas/length2_0_0.err
index 8e88f78c..d1235d6e 100644
--- a/result/schemas/length2_0_0.err
+++ b/result/schemas/length2_0_0.err
@@ -1,10 +1,10 @@
 Unable to lookup type nonPositiveInteger:http://www.w3.org/2001/XMLSchemaSchemas: element size type nonPositiveInteger not found
 Type of sequence 3 : ./test/schemas/length2_0.xsd:6 :elements
-Type of sequence 3 : ./test/schemas/length2_0.xsd:6 :elements
 Type of restriction 2 : ./test/schemas/length2_0.xsd:5 :elements
 Type of complexContent 1 : ./test/schemas/length2_0.xsd:4 :elements
-Type of length2 : ./test/schemas/length2_0.xsd:3 :elements
+Type of sequence 3 : ./test/schemas/length2_0.xsd:6 :elements
 Type of complexContent 1 : ./test/schemas/length2_0.xsd:4 :elements
+Type of length2 : ./test/schemas/length2_0.xsd:3 :elements
 Type of restriction 2 : ./test/schemas/length2_0.xsd:5 :elements
 Building content model for depth
 Content model of depth:
diff --git a/result/schemas/po0_0_0.err b/result/schemas/po0_0_0.err
index 59b46ba1..118781f7 100644
--- a/result/schemas/po0_0_0.err
+++ b/result/schemas/po0_0_0.err
@@ -1,40 +1,52 @@
-Type of sequence 3 : ./test/schemas/po0_0.xsd:21 :elements
-Type of sequence 4 : ./test/schemas/po0_0.xsd:31 :elements
-Type of sequence 6 : ./test/schemas/po0_0.xsd:34 :elements
-Type of anontype5 : ./test/schemas/po0_0.xsd:33 :elements
 Type of sequence 1 : ./test/schemas/po0_0.xsd:12 :elements
 Type of PurchaseOrderType : ./test/schemas/po0_0.xsd:11 :elements
-Type of sequence 6 : ./test/schemas/po0_0.xsd:34 :elements
-Type of SKU : ./test/schemas/po0_0.xsd:53 :simple
+Type of restriction 8 : ./test/schemas/po0_0.xsd:38 :empty
 Type of sequence 4 : ./test/schemas/po0_0.xsd:31 :elements
 Type of Items : ./test/schemas/po0_0.xsd:30 :elements
-Type of restriction 8 : ./test/schemas/po0_0.xsd:38 :empty
-Type of simpletype7 : ./test/schemas/po0_0.xsd:37 :simple
-Type of restriction 10 : ./test/schemas/po0_0.xsd:54 :empty
-Type of sequence 1 : ./test/schemas/po0_0.xsd:12 :elements
 Type of sequence 3 : ./test/schemas/po0_0.xsd:21 :elements
 Type of USAddress : ./test/schemas/po0_0.xsd:20 :elements
-Building content model for shipTo
-Content model of shipTo:
+Type of sequence 6 : ./test/schemas/po0_0.xsd:34 :elements
+Type of anontype5 : ./test/schemas/po0_0.xsd:33 :elements
+Type of sequence 3 : ./test/schemas/po0_0.xsd:21 :elements
+Type of restriction 10 : ./test/schemas/po0_0.xsd:54 :empty
+Type of sequence 4 : ./test/schemas/po0_0.xsd:31 :elements
+Type of sequence 6 : ./test/schemas/po0_0.xsd:34 :elements
+Type of simpletype7 : ./test/schemas/po0_0.xsd:37 :simple
+Type of sequence 1 : ./test/schemas/po0_0.xsd:12 :elements
+Type of SKU : ./test/schemas/po0_0.xsd:53 :simple
+Building content model for purchaseOrder
+Content model of purchaseOrder:
  regexp: '(null)' 
-5 atoms:
- 00  atom: string once 'name' 
- 01  atom: string once 'street' 
- 02  atom: string once 'city' 
- 03  atom: string once 'state' 
- 04  atom: string once 'zip' 
-6 states:
+4 atoms:
+ 00  atom: string once 'shipTo' 
+ 01  atom: string once 'billTo' 
+ 02  atom: string once 'comment' 
+ 03  atom: string once 'items' 
+5 states:
  state: 0, 1 transitions:
   trans: atom 0, to 1
  state: 1, 1 transitions:
   trans: atom 1, to 2
- state: 2, 1 transitions:
+ state: 2, 3 transitions:
   trans: atom 2, to 3
+  trans: removed
+  trans: atom 3, to 4
  state: 3, 1 transitions:
   trans: atom 3, to 4
- state: 4, 1 transitions:
-  trans: atom 4, to 5
- state: FINAL 5, 0 transitions:
+ state: FINAL 4, 0 transitions:
+0 counters:
+Building content model for items
+Content model of items:
+ regexp: '(null)' 
+1 atoms:
+ 00  atom: string once 'item' 
+2 states:
+ state: FINAL 0, 2 transitions:
+  trans: atom 0, to 1
+  trans: removed
+ state: FINAL 1, 2 transitions:
+  trans: removed
+  trans: atom 0, to 1
 0 counters:
 Building content model for item
 Content model of item:
@@ -61,26 +73,27 @@ Content model of item:
   trans: removed
  state: FINAL 5, 0 transitions:
 0 counters:
-Building content model for purchaseOrder
-Content model of purchaseOrder:
+Building content model for shipTo
+Content model of shipTo:
  regexp: '(null)' 
-4 atoms:
- 00  atom: string once 'shipTo' 
- 01  atom: string once 'billTo' 
- 02  atom: string once 'comment' 
- 03  atom: string once 'items' 
-5 states:
+5 atoms:
+ 00  atom: string once 'name' 
+ 01  atom: string once 'street' 
+ 02  atom: string once 'city' 
+ 03  atom: string once 'state' 
+ 04  atom: string once 'zip' 
+6 states:
  state: 0, 1 transitions:
   trans: atom 0, to 1
  state: 1, 1 transitions:
   trans: atom 1, to 2
- state: 2, 3 transitions:
+ state: 2, 1 transitions:
   trans: atom 2, to 3
-  trans: removed
-  trans: atom 3, to 4
  state: 3, 1 transitions:
   trans: atom 3, to 4
- state: FINAL 4, 0 transitions:
+ state: 4, 1 transitions:
+  trans: atom 4, to 5
+ state: FINAL 5, 0 transitions:
 0 counters:
 Building content model for billTo
 Content model of billTo:
@@ -104,19 +117,6 @@ Content model of billTo:
   trans: atom 4, to 5
  state: FINAL 5, 0 transitions:
 0 counters:
-Building content model for items
-Content model of items:
- regexp: '(null)' 
-1 atoms:
- 00  atom: string once 'item' 
-2 states:
- state: FINAL 0, 2 transitions:
-  trans: atom 0, to 1
-  trans: removed
- state: FINAL 1, 2 transitions:
-  trans: removed
-  trans: atom 0, to 1
-0 counters:
 xmlSchemaValidateCallback: shipTo, shipTo, shipTo
 xmlSchemaValidateCallback: name, name, name
 xmlSchemaValidateCallback: street, street, street
diff --git a/result/schemas/restriction0_0_0.err b/result/schemas/restriction0_0_0.err
index fe94ad1c..e269b0d7 100644
--- a/result/schemas/restriction0_0_0.err
+++ b/result/schemas/restriction0_0_0.err
@@ -1,13 +1,13 @@
-Type of sequence 4 : ./test/schemas/restriction0_0.xsd:13 :elements
-Type of sequence 4 : ./test/schemas/restriction0_0.xsd:13 :elements
-Type of restriction 3 : ./test/schemas/restriction0_0.xsd:12 :elements
-Type of complexContent 2 : ./test/schemas/restriction0_0.xsd:11 :elements
-Type of complexContent 2 : ./test/schemas/restriction0_0.xsd:11 :elements
-Type of simpleName : ./test/schemas/restriction0_0.xsd:10 :elements
 Type of sequence 1 : ./test/schemas/restriction0_0.xsd:4 :elements
 Type of personName : ./test/schemas/restriction0_0.xsd:3 :elements
-Type of sequence 1 : ./test/schemas/restriction0_0.xsd:4 :elements
+Type of sequence 4 : ./test/schemas/restriction0_0.xsd:13 :elements
 Type of restriction 3 : ./test/schemas/restriction0_0.xsd:12 :elements
+Type of complexContent 2 : ./test/schemas/restriction0_0.xsd:11 :elements
+Type of restriction 3 : ./test/schemas/restriction0_0.xsd:12 :elements
+Type of sequence 4 : ./test/schemas/restriction0_0.xsd:13 :elements
+Type of sequence 1 : ./test/schemas/restriction0_0.xsd:4 :elements
+Type of complexContent 2 : ./test/schemas/restriction0_0.xsd:11 :elements
+Type of simpleName : ./test/schemas/restriction0_0.xsd:10 :elements
 Building content model for who
 Content model of who:
  regexp: '(null)'