Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11456
Merged at revision: 11699
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 7896 lines (+1613/-1613)
138 files modified
src/runtime/visitors/printer_visitor_impl.cpp (+2/-2)
test/iterplans/zorba/dblp/q0.iter (+10/-10)
test/iterplans/zorba/hashjoins/9065.iter (+6/-6)
test/iterplans/zorba/hashjoins/9066.iter (+3/-3)
test/iterplans/zorba/hashjoins/9067.iter (+2/-2)
test/iterplans/zorba/hashjoins/9068.iter (+3/-3)
test/iterplans/zorba/hashjoins/9197.iter (+2/-2)
test/iterplans/zorba/hashjoins/9198.iter (+2/-2)
test/iterplans/zorba/hashjoins/9199.iter (+2/-2)
test/iterplans/zorba/hashjoins/9204.iter (+2/-2)
test/iterplans/zorba/hashjoins/9206.iter (+2/-2)
test/iterplans/zorba/hashjoins/9207.iter (+2/-2)
test/iterplans/zorba/hashjoins/9210.iter (+2/-2)
test/iterplans/zorba/hashjoins/9211.iter (+2/-2)
test/iterplans/zorba/hashjoins/9212.iter (+4/-4)
test/iterplans/zorba/hashjoins/9389.iter (+2/-2)
test/iterplans/zorba/hashjoins/9390.iter (+2/-2)
test/iterplans/zorba/hashjoins/9391.iter (+2/-2)
test/iterplans/zorba/hashjoins/9392.iter (+2/-2)
test/iterplans/zorba/hashjoins/9399.iter (+2/-2)
test/iterplans/zorba/hashjoins/9400.iter (+2/-2)
test/iterplans/zorba/hashjoins/gary1.iter (+13/-13)
test/iterplans/zorba/hashjoins/gflwor_02.iter (+8/-8)
test/iterplans/zorba/hashjoins/gflwor_03.iter (+6/-6)
test/iterplans/zorba/hashjoins/idx1.iter (+11/-11)
test/iterplans/zorba/hashjoins/idx10.iter (+2/-2)
test/iterplans/zorba/hashjoins/idx2.iter (+11/-11)
test/iterplans/zorba/hashjoins/idx3.iter (+1/-1)
test/iterplans/zorba/hashjoins/idx4.iter (+2/-2)
test/iterplans/zorba/hashjoins/idx8.iter (+7/-7)
test/iterplans/zorba/hashjoins/idx9.iter (+4/-4)
test/iterplans/zorba/hashjoins/no_idx1.iter (+3/-3)
test/iterplans/zorba/hashjoins/q8.iter (+11/-11)
test/iterplans/zorba/index/match_veq_01.iter (+3/-3)
test/iterplans/zorba/index/match_veq_02.iter (+4/-4)
test/iterplans/zorba/index/match_veq_03.iter (+4/-4)
test/iterplans/zorba/index/match_veq_04.iter (+6/-6)
test/iterplans/zorba/index/match_veq_05.iter (+9/-9)
test/iterplans/zorba/index/match_veq_06.iter (+4/-4)
test/iterplans/zorba/index/match_veq_07.iter (+19/-19)
test/iterplans/zorba/index/match_veq_11.iter (+10/-10)
test/iterplans/zorba/index/match_vrange_01.iter (+5/-5)
test/iterplans/zorba/index/match_vrange_02.iter (+13/-13)
test/iterplans/zorba/index/match_vrange_02a.iter (+18/-18)
test/iterplans/zorba/index/match_vrange_02b.iter (+13/-13)
test/iterplans/zorba/index/match_vrange_03.iter (+13/-13)
test/iterplans/zorba/misc/hoist4.iter (+4/-4)
test/iterplans/zorba/misc/inline_var1.iter (+5/-5)
test/iterplans/zorba/no-copy/dataguide-c.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide-nc.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide2-c.iter (+4/-4)
test/iterplans/zorba/no-copy/dataguide2-nc.iter (+4/-4)
test/iterplans/zorba/no-copy/dblp-q0.iter (+10/-10)
test/iterplans/zorba/no-copy/hashjoin-9065.iter (+6/-6)
test/iterplans/zorba/no-copy/hashjoin-9198.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9199.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9212.iter (+4/-4)
test/iterplans/zorba/no-copy/hashjoin-9389.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9390.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-9392.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-gary1.iter (+13/-13)
test/iterplans/zorba/no-copy/hashjoin-idx1.iter (+11/-11)
test/iterplans/zorba/no-copy/hashjoin-idx4.iter (+2/-2)
test/iterplans/zorba/no-copy/hashjoin-q8.iter (+11/-11)
test/iterplans/zorba/no-copy/node-copy-01.iter (+3/-3)
test/iterplans/zorba/no-copy/node-copy-02.iter (+3/-3)
test/iterplans/zorba/no-copy/node-copy-03.iter (+3/-3)
test/iterplans/zorba/no-copy/path17.iter (+6/-6)
test/iterplans/zorba/no-copy/q1.iter (+6/-6)
test/iterplans/zorba/no-copy/q10.iter (+40/-40)
test/iterplans/zorba/no-copy/q11.iter (+12/-12)
test/iterplans/zorba/no-copy/q12.iter (+14/-14)
test/iterplans/zorba/no-copy/q13.iter (+7/-7)
test/iterplans/zorba/no-copy/q14.iter (+5/-5)
test/iterplans/zorba/no-copy/q15.iter (+13/-13)
test/iterplans/zorba/no-copy/q16.iter (+15/-15)
test/iterplans/zorba/no-copy/q17.iter (+7/-7)
test/iterplans/zorba/no-copy/q18.iter (+4/-4)
test/iterplans/zorba/no-copy/q19.iter (+8/-8)
test/iterplans/zorba/no-copy/q2.iter (+6/-6)
test/iterplans/zorba/no-copy/q20.iter (+21/-21)
test/iterplans/zorba/no-copy/q3.iter (+15/-15)
test/iterplans/zorba/no-copy/q4.iter (+11/-11)
test/iterplans/zorba/no-copy/q5.iter (+6/-6)
test/iterplans/zorba/no-copy/q6.iter (+3/-3)
test/iterplans/zorba/no-copy/q7.iter (+4/-4)
test/iterplans/zorba/no-copy/q8.iter (+11/-11)
test/iterplans/zorba/no-copy/q9.iter (+20/-20)
test/iterplans/zorba/no-copy/ser_03.iter (+2/-2)
test/iterplans/zorba/no-copy/test5.iter (+2/-2)
test/iterplans/zorba/no-copy/test6.iter (+1/-1)
test/iterplans/zorba/no-copy/udfs1.iter (+2/-2)
test/iterplans/zorba/optim/doc_order_01.iter (+8/-8)
test/iterplans/zorba/optim/hoist_trycatch_01.iter (+5/-5)
test/iterplans/zorba/optim/hoist_window_01.iter (+11/-11)
test/iterplans/zorba/optim/pos_pred11.iter (+1/-1)
test/iterplans/zorba/optim/pos_pred12.iter (+7/-7)
test/iterplans/zorba/optim/pos_pred13.iter (+2/-2)
test/iterplans/zorba/optim/pos_pred2.iter (+2/-2)
test/iterplans/zorba/optim/pos_pred3.iter (+1/-1)
test/iterplans/zorba/optim/var_inline_05.iter (+1/-1)
test/iterplans/zorba/paths/path10.iter (+2/-2)
test/iterplans/zorba/paths/path11.iter (+1/-1)
test/iterplans/zorba/paths/path13.iter (+2/-2)
test/iterplans/zorba/paths/path17.iter (+6/-6)
test/iterplans/zorba/paths/path24.iter (+2/-2)
test/iterplans/zorba/paths/path_pred4.iter (+4/-4)
test/iterplans/zorba/paths/path_pred5.iter (+4/-4)
test/iterplans/zorba/udf/udf1.iter (+2/-2)
test/iterplans/zorba/w3c/ForExpr010.iter (+4/-4)
test/iterplans/zorba/w3c/ForExpr025.iter (+5/-5)
test/iterplans/zorba/w3c/WhereExpr001.iter (+5/-5)
test/iterplans/zorba/w3c/nodeexpression47.iter (+442/-442)
test/iterplans/zorba/w3c/rdb-queries-results-q5.iter (+22/-22)
test/iterplans/zorba/windowing/q10.iter (+7/-7)
test/iterplans/zorba/windowing/q4.iter (+7/-7)
test/iterplans/zorba/windowing/q9.iter (+9/-9)
test/iterplans/zorba/xmark/q1.iter (+6/-6)
test/iterplans/zorba/xmark/q10.iter (+40/-40)
test/iterplans/zorba/xmark/q11.iter (+12/-12)
test/iterplans/zorba/xmark/q12.iter (+14/-14)
test/iterplans/zorba/xmark/q13.iter (+7/-7)
test/iterplans/zorba/xmark/q14.iter (+5/-5)
test/iterplans/zorba/xmark/q15.iter (+13/-13)
test/iterplans/zorba/xmark/q16.iter (+15/-15)
test/iterplans/zorba/xmark/q17.iter (+7/-7)
test/iterplans/zorba/xmark/q18.iter (+4/-4)
test/iterplans/zorba/xmark/q19.iter (+8/-8)
test/iterplans/zorba/xmark/q2.iter (+6/-6)
test/iterplans/zorba/xmark/q20.iter (+21/-21)
test/iterplans/zorba/xmark/q3.iter (+15/-15)
test/iterplans/zorba/xmark/q4.iter (+11/-11)
test/iterplans/zorba/xmark/q5.iter (+6/-6)
test/iterplans/zorba/xmark/q6.iter (+3/-3)
test/iterplans/zorba/xmark/q7.iter (+4/-4)
test/iterplans/zorba/xmark/q8.iter (+11/-11)
test/iterplans/zorba/xmark/q9.iter (+20/-20)
test/iterplans/zorba/xray/ppm_10.iter (+223/-223)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+208048@code.launchpad.net

Commit message

Fixed attribute names with spaces in iterator printer.

Description of the change

Fixed attribute names with spaces.
FYI: this wasn't my code.

To post a comment you must log in.
lp:~paul-lucas/zorba/pjl-misc updated
11456. By Paul J. Lucas

Fixed attribute names with spaces.

Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/208048

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
2--- src/runtime/visitors/printer_visitor_impl.cpp 2014-02-21 03:53:46 +0000
3+++ src/runtime/visitors/printer_visitor_impl.cpp 2014-02-25 00:37:05 +0000
4@@ -91,7 +91,7 @@
5 }
6
7 void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {
8- thePrinter.addAttribute("test kind", toString(a->getTestKind()));
9+ thePrinter.addAttribute("test-kind", toString(a->getTestKind()));
10
11 if (a->getDocTestKind() != match_no_test)
12 thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));
13@@ -108,7 +108,7 @@
14
15 std::stringstream lStream;
16 lStream << a->nilledAllowed();
17- thePrinter.addAttribute("nill allowed", lStream.str());
18+ thePrinter.addAttribute("nill-allowed", lStream.str());
19
20 if (a->getTargetPos() >= 0)
21 thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));
22
23=== modified file 'test/iterplans/zorba/dblp/q0.iter'
24--- test/iterplans/zorba/dblp/q0.iter 2014-02-24 20:08:54 +0000
25+++ test/iterplans/zorba/dblp/q0.iter 2014-02-25 00:37:05 +0000
26@@ -27,14 +27,14 @@
27 </LetVariable>
28 <LetVariable name="$$opt_temp_1" materialize="true">
29 <HoistIterator>
30- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
31+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
32 <LetVarIterator varname="doc"/>
33 </ChildAxisIterator>
34 </HoistIterator>
35 </LetVariable>
36 <LetVariable name="$$opt_temp_0" materialize="true">
37 <HoistIterator>
38- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
39+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
40 <LetVarIterator varname="doc"/>
41 </ChildAxisIterator>
42 </HoistIterator>
43@@ -50,8 +50,8 @@
44 <SingletonIterator value="xs:QName(,,paper)"/>
45 <EnclosedIterator attr_cont="false">
46 <FnCountIterator>
47- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
48- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
49+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
50+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
51 <LetVarIterator varname="doc"/>
52 </ChildAxisIterator>
53 </ChildAxisIterator>
54@@ -64,7 +64,7 @@
55 <FnCountIterator>
56 <FnDistinctValuesIterator>
57 <FnDataIterator>
58- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
59+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
60 <LetVarIterator varname="doc"/>
61 </DescendantAxisIterator>
62 </FnDataIterator>
63@@ -109,14 +109,14 @@
64 </UnhoistIterator>
65 </ForVariable>
66 <ForVariable name="$$context-item">
67- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
68+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
69 <ForVarIterator varname="$$context-item"/>
70 </ChildAxisIterator>
71 </ForVariable>
72 <WhereClause>
73 <CompareIterator>
74 <FnDataIterator>
75- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
76+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
77 <ForVarIterator varname="$$context-item"/>
78 </ChildAxisIterator>
79 </FnDataIterator>
80@@ -136,7 +136,7 @@
81 <FnCountIterator>
82 <FnDistinctValuesIterator>
83 <FnDataIterator>
84- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
85+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
86 <FLWORIterator>
87 <ForVariable name="$$context-item">
88 <UnhoistIterator>
89@@ -144,14 +144,14 @@
90 </UnhoistIterator>
91 </ForVariable>
92 <ForVariable name="$$context-item">
93- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
94+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
95 <ForVarIterator varname="$$context-item"/>
96 </ChildAxisIterator>
97 </ForVariable>
98 <WhereClause>
99 <CompareIterator>
100 <FnDataIterator>
101- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
102+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
103 <ForVarIterator varname="$$context-item"/>
104 </ChildAxisIterator>
105 </FnDataIterator>
106
107=== modified file 'test/iterplans/zorba/hashjoins/9065.iter'
108--- test/iterplans/zorba/hashjoins/9065.iter 2014-02-24 20:08:54 +0000
109+++ test/iterplans/zorba/hashjoins/9065.iter 2014-02-25 00:37:05 +0000
110@@ -7,9 +7,9 @@
111 </ForVariable>
112 <LetVariable name="$$opt_temp_1" materialize="true">
113 <HoistIterator>
114- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
115- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
116- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
117+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
118+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
119+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
120 <ForVarIterator varname="b"/>
121 </ChildAxisIterator>
122 </ChildAxisIterator>
123@@ -19,9 +19,9 @@
124 <ForVariable name="$$opt_temp_0">
125 <HoistIterator>
126 <FnCountIterator>
127- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
128- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
129- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
130+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
131+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
132+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
133 <ForVarIterator varname="b"/>
134 </ChildAxisIterator>
135 </ChildAxisIterator>
136
137=== modified file 'test/iterplans/zorba/hashjoins/9066.iter'
138--- test/iterplans/zorba/hashjoins/9066.iter 2014-02-24 20:08:54 +0000
139+++ test/iterplans/zorba/hashjoins/9066.iter 2014-02-25 00:37:05 +0000
140@@ -8,9 +8,9 @@
141 <ForVariable name="$$opt_temp_0">
142 <HoistIterator>
143 <FnCountIterator>
144- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
145- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
146- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
147+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
148+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
149+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
150 <ForVarIterator varname="b"/>
151 </ChildAxisIterator>
152 </ChildAxisIterator>
153
154=== modified file 'test/iterplans/zorba/hashjoins/9067.iter'
155--- test/iterplans/zorba/hashjoins/9067.iter 2014-02-24 20:08:54 +0000
156+++ test/iterplans/zorba/hashjoins/9067.iter 2014-02-25 00:37:05 +0000
157@@ -26,7 +26,7 @@
158 </CreateInternalIndexIterator>
159 </LetVariable>
160 <ForVariable name="b">
161- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
162+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
163 <FnDocIterator>
164 <SingletonIterator value="xs:string(books.xml)"/>
165 </FnDocIterator>
166@@ -35,7 +35,7 @@
167 <ForVariable name="$$opt_temp_1">
168 <HoistIterator>
169 <FnCountIterator>
170- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
171+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
172 <ForVarIterator varname="b"/>
173 </ChildAxisIterator>
174 </FnCountIterator>
175
176=== modified file 'test/iterplans/zorba/hashjoins/9068.iter'
177--- test/iterplans/zorba/hashjoins/9068.iter 2014-02-24 20:08:54 +0000
178+++ test/iterplans/zorba/hashjoins/9068.iter 2014-02-25 00:37:05 +0000
179@@ -26,7 +26,7 @@
180 </CreateInternalIndexIterator>
181 </LetVariable>
182 <ForVariable name="b">
183- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
184+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
185 <FnDocIterator>
186 <SingletonIterator value="xs:string(books.xml)"/>
187 </FnDocIterator>
188@@ -34,7 +34,7 @@
189 </ForVariable>
190 <LetVariable name="$$opt_temp_2" materialize="true">
191 <HoistIterator>
192- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
193+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
194 <ForVarIterator varname="b"/>
195 </ChildAxisIterator>
196 </HoistIterator>
197@@ -42,7 +42,7 @@
198 <ForVariable name="$$opt_temp_1">
199 <HoistIterator>
200 <FnCountIterator>
201- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
202+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
203 <ForVarIterator varname="b"/>
204 </ChildAxisIterator>
205 </FnCountIterator>
206
207=== modified file 'test/iterplans/zorba/hashjoins/9197.iter'
208--- test/iterplans/zorba/hashjoins/9197.iter 2014-02-24 20:08:54 +0000
209+++ test/iterplans/zorba/hashjoins/9197.iter 2014-02-25 00:37:05 +0000
210@@ -29,7 +29,7 @@
211 </CreateInternalIndexIterator>
212 </LetVariable>
213 <ForVariable name="book">
214- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
215+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
216 <FnDocIterator>
217 <SingletonIterator value="xs:string(books.xml)"/>
218 </FnDocIterator>
219@@ -38,7 +38,7 @@
220 <ForVariable name="$$opt_temp_1">
221 <HoistIterator>
222 <FnCountIterator>
223- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
224+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
225 <ForVarIterator varname="book"/>
226 </ChildAxisIterator>
227 </FnCountIterator>
228
229=== modified file 'test/iterplans/zorba/hashjoins/9198.iter'
230--- test/iterplans/zorba/hashjoins/9198.iter 2014-02-24 20:08:54 +0000
231+++ test/iterplans/zorba/hashjoins/9198.iter 2014-02-25 00:37:05 +0000
232@@ -29,7 +29,7 @@
233 </CreateInternalIndexIterator>
234 </LetVariable>
235 <ForVariable name="book">
236- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
237+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
238 <FnDocIterator>
239 <SingletonIterator value="xs:string(books.xml)"/>
240 </FnDocIterator>
241@@ -38,7 +38,7 @@
242 <ForVariable name="$$opt_temp_1">
243 <HoistIterator>
244 <FnCountIterator>
245- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
246+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
247 <ForVarIterator varname="book"/>
248 </ChildAxisIterator>
249 </FnCountIterator>
250
251=== modified file 'test/iterplans/zorba/hashjoins/9199.iter'
252--- test/iterplans/zorba/hashjoins/9199.iter 2014-02-24 20:08:54 +0000
253+++ test/iterplans/zorba/hashjoins/9199.iter 2014-02-25 00:37:05 +0000
254@@ -29,7 +29,7 @@
255 </CreateInternalIndexIterator>
256 </LetVariable>
257 <ForVariable name="book">
258- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
259+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
260 <FnDocIterator>
261 <SingletonIterator value="xs:string(books.xml)"/>
262 </FnDocIterator>
263@@ -38,7 +38,7 @@
264 <ForVariable name="$$opt_temp_1">
265 <HoistIterator>
266 <FnCountIterator>
267- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
268+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
269 <ForVarIterator varname="book"/>
270 </ChildAxisIterator>
271 </FnCountIterator>
272
273=== modified file 'test/iterplans/zorba/hashjoins/9204.iter'
274--- test/iterplans/zorba/hashjoins/9204.iter 2014-02-24 20:08:54 +0000
275+++ test/iterplans/zorba/hashjoins/9204.iter 2014-02-25 00:37:05 +0000
276@@ -26,7 +26,7 @@
277 </CreateInternalIndexIterator>
278 </LetVariable>
279 <ForVariable name="book">
280- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
281+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
282 <FnDocIterator>
283 <SingletonIterator value="xs:string(books.xml)"/>
284 </FnDocIterator>
285@@ -35,7 +35,7 @@
286 <ForVariable name="$$opt_temp_1">
287 <HoistIterator>
288 <FnCountIterator>
289- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
290+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
291 <ForVarIterator varname="book"/>
292 </ChildAxisIterator>
293 </FnCountIterator>
294
295=== modified file 'test/iterplans/zorba/hashjoins/9206.iter'
296--- test/iterplans/zorba/hashjoins/9206.iter 2014-02-24 20:08:54 +0000
297+++ test/iterplans/zorba/hashjoins/9206.iter 2014-02-25 00:37:05 +0000
298@@ -5,7 +5,7 @@
299 <FLWORIterator>
300 <LetVariable name="$$opt_temp_0" materialize="true">
301 <HoistIterator>
302- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
303+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
304 <FnDocIterator>
305 <SingletonIterator value="xs:string(books.xml)"/>
306 </FnDocIterator>
307@@ -24,7 +24,7 @@
308 <ValueIndexEntryBuilderIterator>
309 <ForVarIterator varname="$$opt_temp_1"/>
310 <FnCountIterator>
311- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
312+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
313 <ForVarIterator varname="$$opt_temp_1"/>
314 </ChildAxisIterator>
315 </FnCountIterator>
316
317=== modified file 'test/iterplans/zorba/hashjoins/9207.iter'
318--- test/iterplans/zorba/hashjoins/9207.iter 2014-02-24 20:08:54 +0000
319+++ test/iterplans/zorba/hashjoins/9207.iter 2014-02-25 00:37:05 +0000
320@@ -29,7 +29,7 @@
321 </CreateInternalIndexIterator>
322 </LetVariable>
323 <ForVariable name="book">
324- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
325+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
326 <FnDocIterator>
327 <SingletonIterator value="xs:string(books.xml)"/>
328 </FnDocIterator>
329@@ -38,7 +38,7 @@
330 <ForVariable name="$$opt_temp_1">
331 <HoistIterator>
332 <FnCountIterator>
333- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
334+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
335 <ForVarIterator varname="book"/>
336 </ChildAxisIterator>
337 </FnCountIterator>
338
339=== modified file 'test/iterplans/zorba/hashjoins/9210.iter'
340--- test/iterplans/zorba/hashjoins/9210.iter 2014-02-24 20:08:54 +0000
341+++ test/iterplans/zorba/hashjoins/9210.iter 2014-02-25 00:37:05 +0000
342@@ -5,7 +5,7 @@
343 <FLWORIterator>
344 <LetVariable name="$$opt_temp_0" materialize="true">
345 <HoistIterator>
346- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
347+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
348 <FnDocIterator>
349 <SingletonIterator value="xs:string(books.xml)"/>
350 </FnDocIterator>
351@@ -24,7 +24,7 @@
352 <ValueIndexEntryBuilderIterator>
353 <ForVarIterator varname="$$opt_temp_1"/>
354 <FnCountIterator>
355- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
356+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
357 <ForVarIterator varname="$$opt_temp_1"/>
358 </ChildAxisIterator>
359 </FnCountIterator>
360
361=== modified file 'test/iterplans/zorba/hashjoins/9211.iter'
362--- test/iterplans/zorba/hashjoins/9211.iter 2014-02-24 20:08:54 +0000
363+++ test/iterplans/zorba/hashjoins/9211.iter 2014-02-25 00:37:05 +0000
364@@ -5,7 +5,7 @@
365 <FLWORIterator>
366 <LetVariable name="$$opt_temp_0" materialize="true">
367 <HoistIterator>
368- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
369+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
370 <FnDocIterator>
371 <SingletonIterator value="xs:string(books.xml)"/>
372 </FnDocIterator>
373@@ -24,7 +24,7 @@
374 <ValueIndexEntryBuilderIterator>
375 <ForVarIterator varname="$$opt_temp_1"/>
376 <FnCountIterator>
377- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
378+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
379 <ForVarIterator varname="$$opt_temp_1"/>
380 </ChildAxisIterator>
381 </FnCountIterator>
382
383=== modified file 'test/iterplans/zorba/hashjoins/9212.iter'
384--- test/iterplans/zorba/hashjoins/9212.iter 2014-02-24 20:08:54 +0000
385+++ test/iterplans/zorba/hashjoins/9212.iter 2014-02-25 00:37:05 +0000
386@@ -5,7 +5,7 @@
387 <FLWORIterator>
388 <LetVariable name="$$opt_temp_0" materialize="true">
389 <HoistIterator>
390- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
391+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
392 <FnDocIterator>
393 <SingletonIterator value="xs:string(books.xml)"/>
394 </FnDocIterator>
395@@ -24,7 +24,7 @@
396 <ValueIndexEntryBuilderIterator>
397 <ForVarIterator varname="$$opt_temp_1"/>
398 <FnCountIterator>
399- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
400+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
401 <ForVarIterator varname="$$opt_temp_1"/>
402 </ChildAxisIterator>
403 </FnCountIterator>
404@@ -34,7 +34,7 @@
405 </CreateInternalIndexIterator>
406 </LetVariable>
407 <ForVariable name="book">
408- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
409+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
410 <FnDocIterator>
411 <SingletonIterator value="xs:string(books.xml)"/>
412 </FnDocIterator>
413@@ -42,7 +42,7 @@
414 </ForVariable>
415 <ForVariable name="anzahl">
416 <FnCountIterator>
417- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
418+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
419 <ForVarIterator varname="book"/>
420 </ChildAxisIterator>
421 </FnCountIterator>
422
423=== modified file 'test/iterplans/zorba/hashjoins/9389.iter'
424--- test/iterplans/zorba/hashjoins/9389.iter 2014-02-24 20:08:54 +0000
425+++ test/iterplans/zorba/hashjoins/9389.iter 2014-02-25 00:37:05 +0000
426@@ -5,7 +5,7 @@
427 <FLWORIterator>
428 <LetVariable name="$$opt_temp_0" materialize="true">
429 <HoistIterator>
430- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
431+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
432 <FnDocIterator>
433 <SingletonIterator value="xs:string(books.xml)"/>
434 </FnDocIterator>
435@@ -24,7 +24,7 @@
436 <ValueIndexEntryBuilderIterator>
437 <ForVarIterator varname="$$opt_temp_1"/>
438 <FnCountIterator>
439- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
440+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
441 <ForVarIterator varname="$$opt_temp_1"/>
442 </ChildAxisIterator>
443 </FnCountIterator>
444
445=== modified file 'test/iterplans/zorba/hashjoins/9390.iter'
446--- test/iterplans/zorba/hashjoins/9390.iter 2014-02-24 20:08:54 +0000
447+++ test/iterplans/zorba/hashjoins/9390.iter 2014-02-25 00:37:05 +0000
448@@ -2,7 +2,7 @@
449 <FLWORIterator>
450 <LetVariable name="$$opt_temp_0" materialize="true">
451 <HoistIterator>
452- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
453+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
454 <FnDocIterator>
455 <SingletonIterator value="xs:string(books.xml)"/>
456 </FnDocIterator>
457@@ -21,7 +21,7 @@
458 <ValueIndexEntryBuilderIterator>
459 <ForVarIterator varname="$$opt_temp_1"/>
460 <FnCountIterator>
461- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
462+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
463 <ForVarIterator varname="$$opt_temp_1"/>
464 </ChildAxisIterator>
465 </FnCountIterator>
466
467=== modified file 'test/iterplans/zorba/hashjoins/9391.iter'
468--- test/iterplans/zorba/hashjoins/9391.iter 2014-02-24 20:08:54 +0000
469+++ test/iterplans/zorba/hashjoins/9391.iter 2014-02-25 00:37:05 +0000
470@@ -5,7 +5,7 @@
471 <FLWORIterator>
472 <LetVariable name="$$opt_temp_0" materialize="true">
473 <HoistIterator>
474- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
475+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
476 <FnDocIterator>
477 <SingletonIterator value="xs:string(books.xml)"/>
478 </FnDocIterator>
479@@ -24,7 +24,7 @@
480 <ValueIndexEntryBuilderIterator>
481 <ForVarIterator varname="$$opt_temp_1"/>
482 <FnCountIterator>
483- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
484+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
485 <ForVarIterator varname="$$opt_temp_1"/>
486 </ChildAxisIterator>
487 </FnCountIterator>
488
489=== modified file 'test/iterplans/zorba/hashjoins/9392.iter'
490--- test/iterplans/zorba/hashjoins/9392.iter 2014-02-24 20:08:54 +0000
491+++ test/iterplans/zorba/hashjoins/9392.iter 2014-02-25 00:37:05 +0000
492@@ -12,7 +12,7 @@
493 <FLWORIterator>
494 <LetVariable name="$$opt_temp_0" materialize="true">
495 <HoistIterator>
496- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
497+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
498 <FnDocIterator>
499 <SingletonIterator value="xs:string(books.xml)"/>
500 </FnDocIterator>
501@@ -31,7 +31,7 @@
502 <ValueIndexEntryBuilderIterator>
503 <ForVarIterator varname="$$opt_temp_1"/>
504 <FnCountIterator>
505- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
506+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
507 <ForVarIterator varname="$$opt_temp_1"/>
508 </ChildAxisIterator>
509 </FnCountIterator>
510
511=== modified file 'test/iterplans/zorba/hashjoins/9399.iter'
512--- test/iterplans/zorba/hashjoins/9399.iter 2014-02-24 20:08:54 +0000
513+++ test/iterplans/zorba/hashjoins/9399.iter 2014-02-25 00:37:05 +0000
514@@ -5,7 +5,7 @@
515 <FLWORIterator>
516 <LetVariable name="$$opt_temp_0" materialize="true">
517 <HoistIterator>
518- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
519+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
520 <FnDocIterator>
521 <SingletonIterator value="xs:string(books.xml)"/>
522 </FnDocIterator>
523@@ -24,7 +24,7 @@
524 <ValueIndexEntryBuilderIterator>
525 <ForVarIterator varname="$$opt_temp_1"/>
526 <FnCountIterator>
527- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
528+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
529 <ForVarIterator varname="$$opt_temp_1"/>
530 </ChildAxisIterator>
531 </FnCountIterator>
532
533=== modified file 'test/iterplans/zorba/hashjoins/9400.iter'
534--- test/iterplans/zorba/hashjoins/9400.iter 2014-02-24 20:08:54 +0000
535+++ test/iterplans/zorba/hashjoins/9400.iter 2014-02-25 00:37:05 +0000
536@@ -5,7 +5,7 @@
537 <FLWORIterator>
538 <LetVariable name="$$opt_temp_0" materialize="true">
539 <HoistIterator>
540- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
541+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
542 <FnDocIterator>
543 <SingletonIterator value="xs:string(books.xml)"/>
544 </FnDocIterator>
545@@ -24,7 +24,7 @@
546 <ValueIndexEntryBuilderIterator>
547 <ForVarIterator varname="$$opt_temp_1"/>
548 <FnCountIterator>
549- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
550+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
551 <ForVarIterator varname="$$opt_temp_1"/>
552 </ChildAxisIterator>
553 </FnCountIterator>
554
555=== modified file 'test/iterplans/zorba/hashjoins/gary1.iter'
556--- test/iterplans/zorba/hashjoins/gary1.iter 2014-02-24 20:08:54 +0000
557+++ test/iterplans/zorba/hashjoins/gary1.iter 2014-02-25 00:37:05 +0000
558@@ -25,7 +25,7 @@
559 <EnclosedIterator attr_cont="false">
560 <FLWORIterator>
561 <LetVariable name="y" materialize="true">
562- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
563+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
564 <TupleStreamIterator>
565 <WhereIterator>
566 <WhereIterator>
567@@ -38,13 +38,13 @@
568 <SingletonIterator value="xs:string(min_ic1980.xml)"/>
569 </FnDocIterator>
570 </ForIterator>
571- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
572+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill-allowed="0">
573 <ForVarIterator varname="$$context-item"/>
574 </ChildAxisIterator>
575 </ForIterator>
576 <CompareIterator>
577 <FnDataIterator>
578- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
579+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
580 <ForVarIterator varname="$$context-item"/>
581 </AttributeAxisIterator>
582 </FnDataIterator>
583@@ -53,7 +53,7 @@
584 </WhereIterator>
585 <CompareIterator>
586 <FnDataIterator>
587- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
588+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
589 <ForVarIterator varname="$$context-item"/>
590 </AttributeAxisIterator>
591 </FnDataIterator>
592@@ -74,7 +74,7 @@
593 <GeneralIndexEntryBuilderIterator>
594 <ForVarIterator varname="$$opt_temp_2"/>
595 <FnDataIterator>
596- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">
597+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
598 <ForVarIterator varname="$$opt_temp_2"/>
599 </AttributeAxisIterator>
600 </FnDataIterator>
601@@ -84,8 +84,8 @@
602 </CreateInternalIndexIterator>
603 </LetVariable>
604 <ForVariable name="i">
605- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill allowed="0">
606- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill allowed="0">
607+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill-allowed="0">
608+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill-allowed="0">
609 <FnDocIterator>
610 <SingletonIterator value="xs:string(base.xml)"/>
611 </FnDocIterator>
612@@ -93,13 +93,13 @@
613 </ChildAxisIterator>
614 </ForVariable>
615 <LetVariable name="unitid" materialize="true">
616- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">
617+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
618 <ForVarIterator varname="i"/>
619 </AttributeAxisIterator>
620 </LetVariable>
621 <LetVariable name="$$opt_temp_1" materialize="true">
622 <HoistIterator>
623- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
624+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
625 <FLWORIterator>
626 <ForVariable name="$$context-item">
627 <NodeSortIterator distinct="true" ascending="true">
628@@ -131,12 +131,12 @@
629 <EnclosedIterator attr_cont="false">
630 <FLWORIterator>
631 <ForVariable name="j">
632- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
633+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
634 <ForVarIterator varname="i"/>
635 </ChildAxisIterator>
636 </ForVariable>
637 <LetVariable name="year" materialize="true">
638- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
639+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
640 <ForVarIterator varname="j"/>
641 </AttributeAxisIterator>
642 </LetVariable>
643@@ -163,12 +163,12 @@
644 <EnclosedIterator attr_cont="false">
645 <FLWORIterator>
646 <ForVariable name="k">
647- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
648+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
649 <ForVarIterator varname="j"/>
650 </ChildAxisIterator>
651 </ForVariable>
652 <LetVariable name="file" materialize="true">
653- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
654+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
655 <ForVarIterator varname="k"/>
656 </AttributeAxisIterator>
657 </LetVariable>
658
659=== modified file 'test/iterplans/zorba/hashjoins/gflwor_02.iter'
660--- test/iterplans/zorba/hashjoins/gflwor_02.iter 2014-02-24 20:08:54 +0000
661+++ test/iterplans/zorba/hashjoins/gflwor_02.iter 2014-02-25 00:37:05 +0000
662@@ -116,7 +116,7 @@
663 <LetVariable name="$$opt_temp_0" materialize="true"/>
664 <TupleSourceIterator/>
665 <HoistIterator>
666- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">
667+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
668 <CtxVarIterator varid="5" varname="sales" varkind="global"/>
669 </ChildAxisIterator>
670 </HoistIterator>
671@@ -132,7 +132,7 @@
672 <ValueIndexEntryBuilderIterator>
673 <ForVarIterator varname="$$opt_temp_4"/>
674 <FnStringIterator>
675- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,pid)" typename="*" nill allowed="0">
676+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,pid)" typename="*" nill-allowed="0">
677 <ForVarIterator varname="$$opt_temp_4"/>
678 </AttributeAxisIterator>
679 </FnStringIterator>
680@@ -141,14 +141,14 @@
681 </FLWORIterator>
682 </CreateInternalIndexIterator>
683 </LetIterator>
684- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,prod)" typename="*" nill allowed="0">
685+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,prod)" typename="*" nill-allowed="0">
686 <CtxVarIterator varid="4" varname="products" varkind="global"/>
687 </ChildAxisIterator>
688 </ForIterator>
689 <HoistIterator>
690 <PromoteIterator type="xs:anyAtomicType">
691 <FnDataIterator>
692- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">
693+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
694 <ForVarIterator varname="p"/>
695 </AttributeAxisIterator>
696 </FnDataIterator>
697@@ -157,7 +157,7 @@
698 </LetIterator>
699 <HoistIterator>
700 <FnDataIterator>
701- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
702+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
703 <ForVarIterator varname="p"/>
704 </AttributeAxisIterator>
705 </FnDataIterator>
706@@ -165,7 +165,7 @@
707 </LetIterator>
708 <HoistIterator>
709 <FnStringIterator>
710- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
711+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
712 <ForVarIterator varname="p"/>
713 </AttributeAxisIterator>
714 </FnStringIterator>
715@@ -174,7 +174,7 @@
716 <CompareIterator>
717 <CastIterator type="xs:integer">
718 <FnDataIterator>
719- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">
720+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
721 <ForVarIterator varname="p"/>
722 </AttributeAxisIterator>
723 </FnDataIterator>
724@@ -207,7 +207,7 @@
725 </UnhoistIterator>
726 <PromoteIterator type="xs:anyAtomicType">
727 <FnDataIterator>
728- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">
729+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
730 <ForVarIterator varname="s"/>
731 </AttributeAxisIterator>
732 </FnDataIterator>
733
734=== modified file 'test/iterplans/zorba/hashjoins/gflwor_03.iter'
735--- test/iterplans/zorba/hashjoins/gflwor_03.iter 2014-02-24 20:08:54 +0000
736+++ test/iterplans/zorba/hashjoins/gflwor_03.iter 2014-02-25 00:37:05 +0000
737@@ -106,7 +106,7 @@
738 <LetVariable name="$$opt_temp_0" materialize="true"/>
739 <TupleSourceIterator/>
740 <HoistIterator>
741- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">
742+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
743 <CtxVarIterator varid="5" varname="locations" varkind="global"/>
744 </ChildAxisIterator>
745 </HoistIterator>
746@@ -122,7 +122,7 @@
747 <ValueIndexEntryBuilderIterator>
748 <ForVarIterator varname="$$opt_temp_2"/>
749 <FnStringIterator>
750- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
751+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
752 <ForVarIterator varname="$$opt_temp_2"/>
753 </AttributeAxisIterator>
754 </FnStringIterator>
755@@ -131,14 +131,14 @@
756 </FLWORIterator>
757 </CreateInternalIndexIterator>
758 </LetIterator>
759- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">
760+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
761 <CtxVarIterator varid="4" varname="sales" varkind="global"/>
762 </ChildAxisIterator>
763 </ForIterator>
764 <Spec>
765 <TreatIterator quant="?">
766 <FnDataIterator>
767- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">
768+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
769 <ForVarIterator varname="s"/>
770 </AttributeAxisIterator>
771 </FnDataIterator>
772@@ -162,7 +162,7 @@
773 <AttributeIterator qname="xs:QName(,,city)">
774 <EnclosedIterator attr_cont="true">
775 <FnDataIterator>
776- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">
777+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
778 <FLWORIterator>
779 <ForVariable name="$$context-item">
780 <ProbeIndexPointValueIterator>
781@@ -185,7 +185,7 @@
782 <FnSumIterator>
783 <FnDataIterator>
784 <NodeDistinctIterator allow-atomics="false" check-only="false">
785- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">
786+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
787 <LetVarIterator varname="s"/>
788 </AttributeAxisIterator>
789 </NodeDistinctIterator>
790
791=== modified file 'test/iterplans/zorba/hashjoins/idx1.iter'
792--- test/iterplans/zorba/hashjoins/idx1.iter 2014-02-24 20:08:54 +0000
793+++ test/iterplans/zorba/hashjoins/idx1.iter 2014-02-25 00:37:05 +0000
794@@ -7,9 +7,9 @@
795 </LetVariable>
796 <LetVariable name="$$opt_temp_0" materialize="true">
797 <HoistIterator>
798- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
799- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
800- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
801+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
802+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
803+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
804 <LetVarIterator varname="auction"/>
805 </ChildAxisIterator>
806 </ChildAxisIterator>
807@@ -29,8 +29,8 @@
808 <ForVarIterator varname="$$opt_temp_3"/>
809 <PromoteIterator type="xs:anyAtomicType">
810 <FnDataIterator>
811- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
812- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
813+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
814+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
815 <ForVarIterator varname="$$opt_temp_3"/>
816 </ChildAxisIterator>
817 </AttributeAxisIterator>
818@@ -42,9 +42,9 @@
819 </CreateInternalIndexIterator>
820 </LetVariable>
821 <ForVariable name="p">
822- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
823- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
824- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
825+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
826+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
827+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
828 <LetVarIterator varname="auction"/>
829 </ChildAxisIterator>
830 </ChildAxisIterator>
831@@ -53,8 +53,8 @@
832 <LetVariable name="$$opt_temp_2" materialize="true">
833 <HoistIterator>
834 <FnDataIterator>
835- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
836- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
837+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
838+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
839 <ForVarIterator varname="p"/>
840 </ChildAxisIterator>
841 </ChildAxisIterator>
842@@ -64,7 +64,7 @@
843 <LetVariable name="$$opt_temp_1" materialize="true">
844 <HoistIterator>
845 <FnDataIterator>
846- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
847+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
848 <ForVarIterator varname="p"/>
849 </AttributeAxisIterator>
850 </FnDataIterator>
851
852=== modified file 'test/iterplans/zorba/hashjoins/idx10.iter'
853--- test/iterplans/zorba/hashjoins/idx10.iter 2014-02-24 20:08:54 +0000
854+++ test/iterplans/zorba/hashjoins/idx10.iter 2014-02-25 00:37:05 +0000
855@@ -21,7 +21,7 @@
856 <FLWORIterator>
857 <ForVariable name="$$opt_temp_3">
858 <NodeSortIterator distinct="true" ascending="true">
859- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
860+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
861 <FunctionTraceIterator>
862 <FLWORIterator>
863 <ForVariable name="$$opt_temp_0">
864@@ -78,7 +78,7 @@
865 </LetVariable>
866 <ForVariable name="i">
867 <NodeSortIterator distinct="true" ascending="true">
868- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
869+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
870 <FunctionTraceIterator>
871 <FLWORIterator>
872 <ForVariable name="i">
873
874=== modified file 'test/iterplans/zorba/hashjoins/idx2.iter'
875--- test/iterplans/zorba/hashjoins/idx2.iter 2014-02-24 20:08:54 +0000
876+++ test/iterplans/zorba/hashjoins/idx2.iter 2014-02-25 00:37:05 +0000
877@@ -7,17 +7,17 @@
878 </LetVariable>
879 <LetVariable name="$$opt_temp_0" materialize="true">
880 <HoistIterator>
881- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
882- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
883+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
884+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
885 <LetVarIterator varname="auction"/>
886 </ChildAxisIterator>
887 </ChildAxisIterator>
888 </HoistIterator>
889 </LetVariable>
890 <ForVariable name="p">
891- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
892- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
893- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
894+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
895+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
896+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
897 <LetVarIterator varname="auction"/>
898 </ChildAxisIterator>
899 </ChildAxisIterator>
900@@ -26,8 +26,8 @@
901 <LetVariable name="$$opt_temp_2" materialize="true">
902 <HoistIterator>
903 <FnDataIterator>
904- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
905- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
906+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
907+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
908 <ForVarIterator varname="p"/>
909 </ChildAxisIterator>
910 </ChildAxisIterator>
911@@ -37,7 +37,7 @@
912 <LetVariable name="$$opt_temp_1" materialize="true">
913 <HoistIterator>
914 <FnDataIterator>
915- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
916+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
917 <ForVarIterator varname="p"/>
918 </AttributeAxisIterator>
919 </FnDataIterator>
920@@ -49,7 +49,7 @@
921 </UnhoistIterator>
922 </ForVariable>
923 <ForVariable name="t">
924- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
925+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
926 <ForVarIterator varname="a"/>
927 </ChildAxisIterator>
928 </ForVariable>
929@@ -58,8 +58,8 @@
930 <TypedValueCompareIterator_STRING>
931 <PromoteIterator type="xs:anyAtomicType">
932 <FnDataIterator>
933- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
934- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
935+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
936+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
937 <ForVarIterator varname="t"/>
938 </ChildAxisIterator>
939 </AttributeAxisIterator>
940
941=== modified file 'test/iterplans/zorba/hashjoins/idx3.iter'
942--- test/iterplans/zorba/hashjoins/idx3.iter 2014-02-24 20:08:54 +0000
943+++ test/iterplans/zorba/hashjoins/idx3.iter 2014-02-25 00:37:05 +0000
944@@ -31,7 +31,7 @@
945 </LetVariable>
946 <ForVariable name="rec">
947 <NodeSortIterator distinct="true" ascending="true">
948- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
949+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
950 <FnConcatIterator>
951 <ElementIterator>
952 <SingletonIterator value="xs:QName(,,a)"/>
953
954=== modified file 'test/iterplans/zorba/hashjoins/idx4.iter'
955--- test/iterplans/zorba/hashjoins/idx4.iter 2014-02-24 20:08:54 +0000
956+++ test/iterplans/zorba/hashjoins/idx4.iter 2014-02-25 00:37:05 +0000
957@@ -2,7 +2,7 @@
958 <FunctionTraceIterator>
959 <FLWORIterator>
960 <LetVariable name="e" materialize="true">
961- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill allowed="0" target_position="0">
962+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill-allowed="0" target_position="0">
963 <ElementIterator>
964 <SingletonIterator value="xs:QName(,,r1)"/>
965 <FnConcatIterator/>
966@@ -34,7 +34,7 @@
967 </HoistIterator>
968 </ForVariable>
969 <LetVariable name="parent" materialize="true">
970- <ParentAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
971+ <ParentAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
972 <LetVarIterator varname="e"/>
973 </ParentAxisIterator>
974 </LetVariable>
975
976=== modified file 'test/iterplans/zorba/hashjoins/idx8.iter'
977--- test/iterplans/zorba/hashjoins/idx8.iter 2014-02-24 20:08:54 +0000
978+++ test/iterplans/zorba/hashjoins/idx8.iter 2014-02-25 00:37:05 +0000
979@@ -16,9 +16,9 @@
980 </HoistIterator>
981 </LetVariable>
982 <LetVariable name="fs" materialize="true">
983- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,function)" typename="*" nill allowed="0">
984- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,functions)" typename="*" nill allowed="0">
985- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,xqdoc)" typename="*" nill allowed="0">
986+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,function)" typename="*" nill-allowed="0">
987+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,functions)" typename="*" nill-allowed="0">
988+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,xqdoc)" typename="*" nill-allowed="0">
989 <FnDocIterator>
990 <SingletonIterator value="xs:string(xqdoc.xml)"/>
991 </FnDocIterator>
992@@ -34,7 +34,7 @@
993 </ForVariable>
994 <LetVariable name="$$opt_temp_2" materialize="true">
995 <HoistIterator>
996- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,invoked)" typename="*" nill allowed="0">
997+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,invoked)" typename="*" nill-allowed="0">
998 <ForVarIterator varname="function"/>
999 </ChildAxisIterator>
1000 </HoistIterator>
1001@@ -52,7 +52,7 @@
1002 <ForVarIterator varname="$$opt_temp_3"/>
1003 <FnStringIterator>
1004 <TreatIterator quant="?">
1005- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,uri)" typename="*" nill allowed="0">
1006+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,uri)" typename="*" nill-allowed="0">
1007 <ForVarIterator varname="$$opt_temp_3"/>
1008 </ChildAxisIterator>
1009 </TreatIterator>
1010@@ -64,8 +64,8 @@
1011 </LetVariable>
1012 <LetVariable name="$$opt_temp_1" materialize="true">
1013 <HoistIterator>
1014- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
1015- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,name)" typename="*" nill allowed="0">
1016+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
1017+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.xqdoc.org/1.0,xqdoc,name)" typename="*" nill-allowed="0">
1018 <ForVarIterator varname="function"/>
1019 </ChildAxisIterator>
1020 </ChildAxisIterator>
1021
1022=== modified file 'test/iterplans/zorba/hashjoins/idx9.iter'
1023--- test/iterplans/zorba/hashjoins/idx9.iter 2014-02-24 20:08:54 +0000
1024+++ test/iterplans/zorba/hashjoins/idx9.iter 2014-02-25 00:37:05 +0000
1025@@ -44,7 +44,7 @@
1026 <GeneralIndexEntryBuilderIterator>
1027 <ForVarIterator varname="$$opt_temp_1"/>
1028 <FnDataIterator>
1029- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill allowed="0">
1030+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill-allowed="0">
1031 <ForVarIterator varname="$$opt_temp_1"/>
1032 </AttributeAxisIterator>
1033 </FnDataIterator>
1034@@ -59,7 +59,7 @@
1035 </ForIterator>
1036 <CompareIterator>
1037 <FnDataIterator>
1038- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uid)" typename="*" nill allowed="0">
1039+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uid)" typename="*" nill-allowed="0">
1040 <ForVarIterator varname="$$context-item"/>
1041 </AttributeAxisIterator>
1042 </FnDataIterator>
1043@@ -67,13 +67,13 @@
1044 </CompareIterator>
1045 </WhereIterator>
1046 <FnBooleanIterator>
1047- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,result)" typename="*" nill allowed="0">
1048+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,result)" typename="*" nill-allowed="0">
1049 <ProbeIndexPointGeneralIterator>
1050 <SingletonIterator value="xs:QName(,,tempIndex0)"/>
1051 <UnhoistIterator>
1052 <HoistIterator>
1053 <FnDataIterator>
1054- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill allowed="0">
1055+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,gid)" typename="*" nill-allowed="0">
1056 <ForVarIterator varname="$$context-item"/>
1057 </AttributeAxisIterator>
1058 </FnDataIterator>
1059
1060=== modified file 'test/iterplans/zorba/hashjoins/no_idx1.iter'
1061--- test/iterplans/zorba/hashjoins/no_idx1.iter 2014-02-24 20:08:54 +0000
1062+++ test/iterplans/zorba/hashjoins/no_idx1.iter 2014-02-25 00:37:05 +0000
1063@@ -9,7 +9,7 @@
1064 <FunctionTraceIterator>
1065 <FLWORIterator>
1066 <ForVariable name="ancestor">
1067- <AncestorSelfAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
1068+ <AncestorSelfAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
1069 <ElementIterator>
1070 <SingletonIterator value="xs:QName(,,a)"/>
1071 </ElementIterator>
1072@@ -33,12 +33,12 @@
1073 </FnStringIterator>
1074 <FLWORIterator>
1075 <ForVariable name="$$context-item">
1076- <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
1077+ <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
1078 <ForVarIterator varname="ancestor"/>
1079 </ParentAxisIterator>
1080 </ForVariable>
1081 <ForVariable name="$$context-item">
1082- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
1083+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
1084 <ForVarIterator varname="$$context-item"/>
1085 </ChildAxisIterator>
1086 </ForVariable>
1087
1088=== modified file 'test/iterplans/zorba/hashjoins/q8.iter'
1089--- test/iterplans/zorba/hashjoins/q8.iter 2014-02-24 20:08:54 +0000
1090+++ test/iterplans/zorba/hashjoins/q8.iter 2014-02-25 00:37:05 +0000
1091@@ -7,9 +7,9 @@
1092 </LetVariable>
1093 <LetVariable name="$$opt_temp_0" materialize="true">
1094 <HoistIterator>
1095- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
1096- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
1097- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1098+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
1099+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
1100+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1101 <LetVarIterator varname="auction"/>
1102 </ChildAxisIterator>
1103 </ChildAxisIterator>
1104@@ -29,8 +29,8 @@
1105 <ForVarIterator varname="$$opt_temp_2"/>
1106 <CastIterator type="xs:string">
1107 <FnDataIterator>
1108- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
1109- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
1110+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
1111+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
1112 <ForVarIterator varname="$$opt_temp_2"/>
1113 </ChildAxisIterator>
1114 </AttributeAxisIterator>
1115@@ -42,9 +42,9 @@
1116 </CreateInternalIndexIterator>
1117 </LetVariable>
1118 <ForVariable name="p">
1119- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
1120- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
1121- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1122+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
1123+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
1124+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1125 <LetVarIterator varname="auction"/>
1126 </ChildAxisIterator>
1127 </ChildAxisIterator>
1128@@ -54,7 +54,7 @@
1129 <HoistIterator>
1130 <CastIterator type="xs:string">
1131 <FnDataIterator>
1132- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1133+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1134 <ForVarIterator varname="p"/>
1135 </AttributeAxisIterator>
1136 </FnDataIterator>
1137@@ -67,8 +67,8 @@
1138 <AttributeIterator qname="xs:QName(,,person)">
1139 <EnclosedIterator attr_cont="true">
1140 <FnDataIterator>
1141- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
1142- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
1143+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
1144+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
1145 <ForVarIterator varname="p"/>
1146 </ChildAxisIterator>
1147 </ChildAxisIterator>
1148
1149=== modified file 'test/iterplans/zorba/index/match_veq_01.iter'
1150--- test/iterplans/zorba/index/match_veq_01.iter 2014-02-24 20:08:54 +0000
1151+++ test/iterplans/zorba/index/match_veq_01.iter 2014-02-25 00:37:05 +0000
1152@@ -8,7 +8,7 @@
1153 <ForVarIterator varname="$$context-item"/>
1154 <CastIterator type="xs:string">
1155 <FnDataIterator>
1156- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill allowed="0">
1157+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill-allowed="0">
1158 <ForVarIterator varname="$$context-item"/>
1159 </AttributeAxisIterator>
1160 </FnDataIterator>
1161@@ -29,7 +29,7 @@
1162 <ForVarIterator varname="$$context-item"/>
1163 <CastIterator type="xs:string">
1164 <FnDataIterator>
1165- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill allowed="0">
1166+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,email)" typename="*" nill-allowed="0">
1167 <ForVarIterator varname="$$context-item"/>
1168 </AttributeAxisIterator>
1169 </FnDataIterator>
1170@@ -94,7 +94,7 @@
1171 </ApplyIterator>
1172 <FLWORIterator>
1173 <ForVariable name="acc">
1174- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,account)" typename="*" nill allowed="0">
1175+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,account)" typename="*" nill-allowed="0">
1176 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
1177 </ChildAxisIterator>
1178 </ForVariable>
1179
1180=== modified file 'test/iterplans/zorba/index/match_veq_02.iter'
1181--- test/iterplans/zorba/index/match_veq_02.iter 2014-02-24 20:08:54 +0000
1182+++ test/iterplans/zorba/index/match_veq_02.iter 2014-02-25 00:37:05 +0000
1183@@ -8,7 +8,7 @@
1184 <ForVarIterator varname="$$context-item"/>
1185 <CastIterator type="xs:string">
1186 <FnDataIterator>
1187- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1188+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1189 <ForVarIterator varname="$$context-item"/>
1190 </AttributeAxisIterator>
1191 </FnDataIterator>
1192@@ -29,7 +29,7 @@
1193 <ForVarIterator varname="$$context-item"/>
1194 <CastIterator type="xs:string">
1195 <FnDataIterator>
1196- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1197+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1198 <ForVarIterator varname="$$context-item"/>
1199 </AttributeAxisIterator>
1200 </FnDataIterator>
1201@@ -102,7 +102,7 @@
1202 </ApplyIterator>
1203 <FLWORIterator>
1204 <ForVariable name="s">
1205- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1206+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1207 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
1208 </ChildAxisIterator>
1209 </ForVariable>
1210@@ -158,7 +158,7 @@
1211 <LetVarIterator varname="id"/>
1212 <SingletonIterator value="xs:string(no session with the given uuid)"/>
1213 </TraceIterator>
1214- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
1215+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
1216 <LetVarIterator varname="session"/>
1217 </ChildAxisIterator>
1218 </IfThenElseIterator>
1219
1220=== modified file 'test/iterplans/zorba/index/match_veq_03.iter'
1221--- test/iterplans/zorba/index/match_veq_03.iter 2014-02-24 20:08:54 +0000
1222+++ test/iterplans/zorba/index/match_veq_03.iter 2014-02-25 00:37:05 +0000
1223@@ -8,7 +8,7 @@
1224 <ForVarIterator varname="$$context-item"/>
1225 <CastIterator type="xs:string">
1226 <FnDataIterator>
1227- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1228+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1229 <ForVarIterator varname="$$context-item"/>
1230 </AttributeAxisIterator>
1231 </FnDataIterator>
1232@@ -29,7 +29,7 @@
1233 <ForVarIterator varname="$$context-item"/>
1234 <CastIterator type="xs:string">
1235 <FnDataIterator>
1236- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1237+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1238 <ForVarIterator varname="$$context-item"/>
1239 </AttributeAxisIterator>
1240 </FnDataIterator>
1241@@ -102,7 +102,7 @@
1242 </ApplyIterator>
1243 <FLWORIterator>
1244 <ForVariable name="s">
1245- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1246+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1247 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
1248 </ChildAxisIterator>
1249 </ForVariable>
1250@@ -158,7 +158,7 @@
1251 <LetVarIterator varname="id"/>
1252 <SingletonIterator value="xs:string(no session with the given uuid)"/>
1253 </TraceIterator>
1254- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
1255+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
1256 <LetVarIterator varname="session"/>
1257 </ChildAxisIterator>
1258 </IfThenElseIterator>
1259
1260=== modified file 'test/iterplans/zorba/index/match_veq_04.iter'
1261--- test/iterplans/zorba/index/match_veq_04.iter 2014-02-24 20:08:54 +0000
1262+++ test/iterplans/zorba/index/match_veq_04.iter 2014-02-25 00:37:05 +0000
1263@@ -15,7 +15,7 @@
1264 <WhereClause>
1265 <CompareIterator>
1266 <FnDataIterator>
1267- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">
1268+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
1269 <ForVarIterator varname="$$context-item"/>
1270 </AttributeAxisIterator>
1271 </FnDataIterator>
1272@@ -32,7 +32,7 @@
1273 <ForVarIterator varname="$$context-item"/>
1274 <CastIterator type="xs:string">
1275 <FnDataIterator>
1276- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1277+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1278 <ForVarIterator varname="$$context-item"/>
1279 </AttributeAxisIterator>
1280 </FnDataIterator>
1281@@ -53,7 +53,7 @@
1282 <WhereClause>
1283 <CompareIterator>
1284 <FnDataIterator>
1285- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">
1286+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
1287 <ForVarIterator varname="$$context-item"/>
1288 </AttributeAxisIterator>
1289 </FnDataIterator>
1290@@ -70,7 +70,7 @@
1291 <ForVarIterator varname="$$context-item"/>
1292 <CastIterator type="xs:string">
1293 <FnDataIterator>
1294- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1295+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1296 <ForVarIterator varname="$$context-item"/>
1297 </AttributeAxisIterator>
1298 </FnDataIterator>
1299@@ -165,7 +165,7 @@
1300 </ApplyIterator>
1301 <FLWORIterator>
1302 <ForVariable name="s">
1303- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1304+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1305 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
1306 </ChildAxisIterator>
1307 </ForVariable>
1308@@ -219,7 +219,7 @@
1309 <LetVarIterator varname="id"/>
1310 <SingletonIterator value="xs:string(no session with the given uuid)"/>
1311 </TraceIterator>
1312- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
1313+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
1314 <LetVarIterator varname="session"/>
1315 </ChildAxisIterator>
1316 </IfThenElseIterator>
1317
1318=== modified file 'test/iterplans/zorba/index/match_veq_05.iter'
1319--- test/iterplans/zorba/index/match_veq_05.iter 2014-02-24 20:08:54 +0000
1320+++ test/iterplans/zorba/index/match_veq_05.iter 2014-02-25 00:37:05 +0000
1321@@ -15,7 +15,7 @@
1322 <WhereClause>
1323 <CompareIterator>
1324 <FnDataIterator>
1325- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">
1326+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
1327 <ForVarIterator varname="$$context-item"/>
1328 </AttributeAxisIterator>
1329 </FnDataIterator>
1330@@ -32,7 +32,7 @@
1331 <ForVarIterator varname="$$context-item"/>
1332 <PromoteIterator type="xs:string">
1333 <FnDataIterator>
1334- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1335+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1336 <ForVarIterator varname="$$context-item"/>
1337 </AttributeAxisIterator>
1338 </FnDataIterator>
1339@@ -53,7 +53,7 @@
1340 <WhereClause>
1341 <CompareIterator>
1342 <FnDataIterator>
1343- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">
1344+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
1345 <ForVarIterator varname="$$context-item"/>
1346 </AttributeAxisIterator>
1347 </FnDataIterator>
1348@@ -70,7 +70,7 @@
1349 <ForVarIterator varname="$$context-item"/>
1350 <PromoteIterator type="xs:string">
1351 <FnDataIterator>
1352- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1353+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1354 <ForVarIterator varname="$$context-item"/>
1355 </AttributeAxisIterator>
1356 </FnDataIterator>
1357@@ -206,7 +206,7 @@
1358 </ApplyIterator>
1359 <FLWORIterator>
1360 <ForVariable name="s">
1361- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1362+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1363 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
1364 </ChildAxisIterator>
1365 </ForVariable>
1366@@ -224,7 +224,7 @@
1367 </FLWORIterator>
1368 <FLWORIterator>
1369 <ForVariable name="s">
1370- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1371+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1372 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>
1373 </ChildAxisIterator>
1374 </ForVariable>
1375@@ -242,7 +242,7 @@
1376 </FLWORIterator>
1377 <FLWORIterator>
1378 <ForVariable name="s">
1379- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill allowed="0">
1380+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,session)" typename="*" nill-allowed="0">
1381 <CtxVarIterator varid="7" varname="doc2" varkind="global"/>
1382 </ChildAxisIterator>
1383 </ForVariable>
1384@@ -287,7 +287,7 @@
1385 <WhereClause>
1386 <CompareIterator>
1387 <FnDataIterator>
1388- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill allowed="0">
1389+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,duration)" typename="*" nill-allowed="0">
1390 <ForVarIterator varname="$$context-item"/>
1391 </AttributeAxisIterator>
1392 </FnDataIterator>
1393@@ -308,7 +308,7 @@
1394 <LetVarIterator varname="id"/>
1395 <SingletonIterator value="xs:string(no session with the given uuid)"/>
1396 </TraceIterator>
1397- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
1398+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
1399 <LetVarIterator varname="session"/>
1400 </ChildAxisIterator>
1401 </IfThenElseIterator>
1402
1403=== modified file 'test/iterplans/zorba/index/match_veq_06.iter'
1404--- test/iterplans/zorba/index/match_veq_06.iter 2014-02-24 20:08:54 +0000
1405+++ test/iterplans/zorba/index/match_veq_06.iter 2014-02-25 00:37:05 +0000
1406@@ -8,14 +8,14 @@
1407 <ForVarIterator varname="$$context-item"/>
1408 <PromoteIterator type="xs:string">
1409 <FnDataIterator>
1410- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">
1411+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
1412 <ForVarIterator varname="$$context-item"/>
1413 </AttributeAxisIterator>
1414 </FnDataIterator>
1415 </PromoteIterator>
1416 <PromoteIterator type="xs:string">
1417 <FnDataIterator>
1418- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill allowed="0">
1419+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill-allowed="0">
1420 <ForVarIterator varname="$$context-item"/>
1421 </AttributeAxisIterator>
1422 </FnDataIterator>
1423@@ -36,14 +36,14 @@
1424 <ForVarIterator varname="$$context-item"/>
1425 <PromoteIterator type="xs:string">
1426 <FnDataIterator>
1427- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">
1428+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
1429 <ForVarIterator varname="$$context-item"/>
1430 </AttributeAxisIterator>
1431 </FnDataIterator>
1432 </PromoteIterator>
1433 <PromoteIterator type="xs:string">
1434 <FnDataIterator>
1435- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill allowed="0">
1436+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,child)" typename="*" nill-allowed="0">
1437 <ForVarIterator varname="$$context-item"/>
1438 </AttributeAxisIterator>
1439 </FnDataIterator>
1440
1441=== modified file 'test/iterplans/zorba/index/match_veq_07.iter'
1442--- test/iterplans/zorba/index/match_veq_07.iter 2014-02-24 20:08:54 +0000
1443+++ test/iterplans/zorba/index/match_veq_07.iter 2014-02-25 00:37:05 +0000
1444@@ -1,9 +1,9 @@
1445 <iterator-tree description="doc indexer">
1446 <FLWORIterator>
1447 <ForVariable name="$$context-item">
1448- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
1449- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
1450- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1451+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
1452+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
1453+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1454 <CtxVarIterator varid="1" varname="$$idx_doc_var" varkind="global"/>
1455 </ChildAxisIterator>
1456 </ChildAxisIterator>
1457@@ -14,8 +14,8 @@
1458 <ForVarIterator varname="$$context-item"/>
1459 <PromoteIterator type="xs:string">
1460 <FnDataIterator>
1461- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
1462- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
1463+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
1464+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
1465 <ForVarIterator varname="$$context-item"/>
1466 </ChildAxisIterator>
1467 </AttributeAxisIterator>
1468@@ -28,9 +28,9 @@
1469 <iterator-tree description="index">
1470 <FLWORIterator>
1471 <ForVariable name="$$context-item">
1472- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
1473- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
1474- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1475+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
1476+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
1477+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1478 <ZorbaCollectionIterator>
1479 <SingletonIterator value="xs:QName(www.xmark.com,x,auctions)"/>
1480 </ZorbaCollectionIterator>
1481@@ -43,8 +43,8 @@
1482 <ForVarIterator varname="$$context-item"/>
1483 <PromoteIterator type="xs:string">
1484 <FnDataIterator>
1485- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
1486- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
1487+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
1488+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
1489 <ForVarIterator varname="$$context-item"/>
1490 </ChildAxisIterator>
1491 </AttributeAxisIterator>
1492@@ -89,9 +89,9 @@
1493 </LetVariable>
1494 <LetVariable name="$$opt_temp_0" materialize="true">
1495 <HoistIterator>
1496- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
1497- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
1498- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1499+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
1500+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
1501+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1502 <LetVarIterator varname="auctions"/>
1503 </ChildAxisIterator>
1504 </ChildAxisIterator>
1505@@ -99,9 +99,9 @@
1506 </HoistIterator>
1507 </LetVariable>
1508 <ForVariable name="p">
1509- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
1510- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
1511- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
1512+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
1513+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
1514+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
1515 <LetVarIterator varname="auctions"/>
1516 </ChildAxisIterator>
1517 </ChildAxisIterator>
1518@@ -110,7 +110,7 @@
1519 <LetVariable name="$$opt_temp_1" materialize="true">
1520 <HoistIterator>
1521 <FnDataIterator>
1522- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1523+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1524 <ForVarIterator varname="p"/>
1525 </AttributeAxisIterator>
1526 </FnDataIterator>
1527@@ -122,8 +122,8 @@
1528 <AttributeIterator qname="xs:QName(,,person)">
1529 <EnclosedIterator attr_cont="true">
1530 <FnDataIterator>
1531- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
1532- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
1533+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
1534+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
1535 <ForVarIterator varname="p"/>
1536 </ChildAxisIterator>
1537 </ChildAxisIterator>
1538
1539=== modified file 'test/iterplans/zorba/index/match_veq_11.iter'
1540--- test/iterplans/zorba/index/match_veq_11.iter 2014-02-24 20:08:54 +0000
1541+++ test/iterplans/zorba/index/match_veq_11.iter 2014-02-25 00:37:05 +0000
1542@@ -9,7 +9,7 @@
1543 <TreatIterator quant="">
1544 <CastIterator type="xs:int">
1545 <FnDataIterator>
1546- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1547+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1548 <ForVarIterator varname="$$context-item"/>
1549 </AttributeAxisIterator>
1550 </FnDataIterator>
1551@@ -32,7 +32,7 @@
1552 <TreatIterator quant="">
1553 <CastIterator type="xs:int">
1554 <FnDataIterator>
1555- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1556+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1557 <ForVarIterator varname="$$context-item"/>
1558 </AttributeAxisIterator>
1559 </FnDataIterator>
1560@@ -52,7 +52,7 @@
1561 <ForVarIterator varname="$$context-item"/>
1562 <PromoteIterator type="xs:string">
1563 <FnDataIterator>
1564- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1565+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1566 <ForVarIterator varname="$$context-item"/>
1567 </AttributeAxisIterator>
1568 </FnDataIterator>
1569@@ -73,7 +73,7 @@
1570 <ForVarIterator varname="$$context-item"/>
1571 <PromoteIterator type="xs:string">
1572 <FnDataIterator>
1573- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1574+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1575 <ForVarIterator varname="$$context-item"/>
1576 </AttributeAxisIterator>
1577 </FnDataIterator>
1578@@ -135,7 +135,7 @@
1579 <GeneralIndexEntryBuilderIterator>
1580 <ForVarIterator varname="$$opt_temp_0"/>
1581 <FnDataIterator>
1582- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,Acct)" typename="*" nill allowed="0">
1583+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,Acct)" typename="*" nill-allowed="0">
1584 <ForVarIterator varname="$$opt_temp_0"/>
1585 </AttributeAxisIterator>
1586 </FnDataIterator>
1587@@ -153,9 +153,9 @@
1588 </ProbeIndexPointValueIterator>
1589 </ForVariable>
1590 <ForVariable name="$$context-item">
1591- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1592- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,Account)" typename="*" nill allowed="0">
1593- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,Accounts)" typename="*" nill allowed="0">
1594+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1595+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,Account)" typename="*" nill-allowed="0">
1596+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,Accounts)" typename="*" nill-allowed="0">
1597 <ForVarIterator varname="$$context-item"/>
1598 </ChildAxisIterator>
1599 </ChildAxisIterator>
1600@@ -175,8 +175,8 @@
1601 </NodeSortIterator>
1602 </ForVariable>
1603 <ReturnClause>
1604- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,Cash)" typename="*" nill allowed="0">
1605- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,OrdQty)" typename="*" nill allowed="0">
1606+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,Cash)" typename="*" nill-allowed="0">
1607+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,OrdQty)" typename="*" nill-allowed="0">
1608 <ForVarIterator varname="ord"/>
1609 </ChildAxisIterator>
1610 </AttributeAxisIterator>
1611
1612=== modified file 'test/iterplans/zorba/index/match_vrange_01.iter'
1613--- test/iterplans/zorba/index/match_vrange_01.iter 2014-02-24 20:08:54 +0000
1614+++ test/iterplans/zorba/index/match_vrange_01.iter 2014-02-25 00:37:05 +0000
1615@@ -8,14 +8,14 @@
1616 <ForVarIterator varname="$$context-item"/>
1617 <PromoteIterator type="xs:string">
1618 <FnDataIterator>
1619- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">
1620+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
1621 <ForVarIterator varname="$$context-item"/>
1622 </AttributeAxisIterator>
1623 </FnDataIterator>
1624 </PromoteIterator>
1625 <PromoteIterator type="xs:string">
1626 <FnDataIterator>
1627- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1628+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1629 <ForVarIterator varname="$$context-item"/>
1630 </AttributeAxisIterator>
1631 </FnDataIterator>
1632@@ -36,14 +36,14 @@
1633 <ForVarIterator varname="$$context-item"/>
1634 <PromoteIterator type="xs:string">
1635 <FnDataIterator>
1636- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill allowed="0">
1637+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,uri)" typename="*" nill-allowed="0">
1638 <ForVarIterator varname="$$context-item"/>
1639 </AttributeAxisIterator>
1640 </FnDataIterator>
1641 </PromoteIterator>
1642 <PromoteIterator type="xs:string">
1643 <FnDataIterator>
1644- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1645+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1646 <ForVarIterator varname="$$context-item"/>
1647 </AttributeAxisIterator>
1648 </FnDataIterator>
1649@@ -176,7 +176,7 @@
1650 </ApplyIterator>
1651 <FLWORIterator>
1652 <ForVariable name="p">
1653- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parent)" typename="*" nill allowed="0">
1654+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parent)" typename="*" nill-allowed="0">
1655 <CtxVarIterator varid="6" varname="doc" varkind="global"/>
1656 </ChildAxisIterator>
1657 </ForVariable>
1658
1659=== modified file 'test/iterplans/zorba/index/match_vrange_02.iter'
1660--- test/iterplans/zorba/index/match_vrange_02.iter 2014-02-24 20:08:54 +0000
1661+++ test/iterplans/zorba/index/match_vrange_02.iter 2014-02-25 00:37:05 +0000
1662@@ -9,8 +9,8 @@
1663 <SubstringAfterIterator>
1664 <PromoteIterator type="xs:string">
1665 <FnDataIterator>
1666- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1667- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1668+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1669+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1670 <ForVarIterator varname="$$context-item"/>
1671 </ChildAxisIterator>
1672 </AttributeAxisIterator>
1673@@ -20,9 +20,9 @@
1674 </SubstringAfterIterator>
1675 <FnStringIterator>
1676 <TreatIterator quant="?">
1677- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1678- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1679- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1680+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1681+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1682+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1683 <ForVarIterator varname="$$context-item"/>
1684 </DescendantAxisIterator>
1685 </ChildAxisIterator>
1686@@ -46,8 +46,8 @@
1687 <SubstringAfterIterator>
1688 <PromoteIterator type="xs:string">
1689 <FnDataIterator>
1690- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1691- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1692+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1693+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1694 <ForVarIterator varname="$$context-item"/>
1695 </ChildAxisIterator>
1696 </AttributeAxisIterator>
1697@@ -57,9 +57,9 @@
1698 </SubstringAfterIterator>
1699 <FnStringIterator>
1700 <TreatIterator quant="?">
1701- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1702- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1703- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1704+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1705+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1706+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1707 <ForVarIterator varname="$$context-item"/>
1708 </DescendantAxisIterator>
1709 </ChildAxisIterator>
1710@@ -272,9 +272,9 @@
1711 <SingletonIterator value="xs:string(2012-12-31)"/>
1712 <FnStringIterator>
1713 <TreatIterator quant="?">
1714- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1715- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1716- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1717+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1718+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1719+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1720 <ForVarIterator varname="$$context-item"/>
1721 </DescendantAxisIterator>
1722 </ChildAxisIterator>
1723
1724=== modified file 'test/iterplans/zorba/index/match_vrange_02a.iter'
1725--- test/iterplans/zorba/index/match_vrange_02a.iter 2014-02-24 20:08:54 +0000
1726+++ test/iterplans/zorba/index/match_vrange_02a.iter 2014-02-25 00:37:05 +0000
1727@@ -9,8 +9,8 @@
1728 <SubstringAfterIterator>
1729 <PromoteIterator type="xs:string">
1730 <FnDataIterator>
1731- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1732- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1733+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1734+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1735 <ForVarIterator varname="$$context-item"/>
1736 </ChildAxisIterator>
1737 </AttributeAxisIterator>
1738@@ -20,9 +20,9 @@
1739 </SubstringAfterIterator>
1740 <FnStringIterator>
1741 <TreatIterator quant="?">
1742- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1743- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1744- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1745+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1746+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1747+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1748 <ForVarIterator varname="$$context-item"/>
1749 </DescendantAxisIterator>
1750 </ChildAxisIterator>
1751@@ -46,8 +46,8 @@
1752 <SubstringAfterIterator>
1753 <PromoteIterator type="xs:string">
1754 <FnDataIterator>
1755- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1756- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1757+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1758+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1759 <ForVarIterator varname="$$context-item"/>
1760 </ChildAxisIterator>
1761 </AttributeAxisIterator>
1762@@ -57,9 +57,9 @@
1763 </SubstringAfterIterator>
1764 <FnStringIterator>
1765 <TreatIterator quant="?">
1766- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1767- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1768- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1769+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1770+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1771+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1772 <ForVarIterator varname="$$context-item"/>
1773 </DescendantAxisIterator>
1774 </ChildAxisIterator>
1775@@ -230,8 +230,8 @@
1776 <ForIterator>
1777 <ForVariable name="group"/>
1778 <TupleSourceIterator/>
1779- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1780- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1781+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1782+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1783 <SubsequenceIntIterator>
1784 <ProbeIndexRangeValueIterator>
1785 <SingletonIterator value="xs:QName(www.data.com,data,idx)"/>
1786@@ -258,8 +258,8 @@
1787 <TreatIterator quant="?">
1788 <FLWORIterator>
1789 <ForVariable name="$$context-item">
1790- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,revision-id)" typename="*" nill allowed="0">
1791- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1792+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,revision-id)" typename="*" nill-allowed="0">
1793+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1794 <ForVarIterator varname="group"/>
1795 </ChildAxisIterator>
1796 </AttributeAxisIterator>
1797@@ -282,8 +282,8 @@
1798 <FLWORIterator>
1799 <ForVariable name="$$context-item">
1800 <NodeDistinctIterator allow-atomics="false" check-only="false">
1801- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1802- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1803+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1804+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1805 <LetVarIterator varname="group"/>
1806 </ChildAxisIterator>
1807 </AttributeAxisIterator>
1808@@ -305,8 +305,8 @@
1809 <WhereClause>
1810 <CompareIterator>
1811 <FnDataIterator>
1812- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1813- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1814+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1815+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1816 <ForVarIterator varname="$$context-item"/>
1817 </ChildAxisIterator>
1818 </AttributeAxisIterator>
1819
1820=== modified file 'test/iterplans/zorba/index/match_vrange_02b.iter'
1821--- test/iterplans/zorba/index/match_vrange_02b.iter 2014-02-24 20:08:54 +0000
1822+++ test/iterplans/zorba/index/match_vrange_02b.iter 2014-02-25 00:37:05 +0000
1823@@ -9,8 +9,8 @@
1824 <SubstringAfterIterator>
1825 <PromoteIterator type="xs:string">
1826 <FnDataIterator>
1827- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1828- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1829+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1830+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1831 <ForVarIterator varname="$$context-item"/>
1832 </ChildAxisIterator>
1833 </AttributeAxisIterator>
1834@@ -20,9 +20,9 @@
1835 </SubstringAfterIterator>
1836 <FnStringIterator>
1837 <TreatIterator quant="?">
1838- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1839- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1840- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1841+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1842+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1843+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1844 <ForVarIterator varname="$$context-item"/>
1845 </DescendantAxisIterator>
1846 </ChildAxisIterator>
1847@@ -46,8 +46,8 @@
1848 <SubstringAfterIterator>
1849 <PromoteIterator type="xs:string">
1850 <FnDataIterator>
1851- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1852- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1853+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1854+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1855 <ForVarIterator varname="$$context-item"/>
1856 </ChildAxisIterator>
1857 </AttributeAxisIterator>
1858@@ -57,9 +57,9 @@
1859 </SubstringAfterIterator>
1860 <FnStringIterator>
1861 <TreatIterator quant="?">
1862- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1863- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1864- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1865+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1866+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1867+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1868 <ForVarIterator varname="$$context-item"/>
1869 </DescendantAxisIterator>
1870 </ChildAxisIterator>
1871@@ -278,9 +278,9 @@
1872 <ForVariable name="key2">
1873 <FnStringIterator>
1874 <TreatIterator quant="?">
1875- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1876- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1877- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1878+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1879+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1880+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1881 <ForVarIterator varname="d"/>
1882 </DescendantAxisIterator>
1883 </ChildAxisIterator>
1884
1885=== modified file 'test/iterplans/zorba/index/match_vrange_03.iter'
1886--- test/iterplans/zorba/index/match_vrange_03.iter 2014-02-24 20:08:54 +0000
1887+++ test/iterplans/zorba/index/match_vrange_03.iter 2014-02-25 00:37:05 +0000
1888@@ -9,8 +9,8 @@
1889 <SubstringAfterIterator>
1890 <PromoteIterator type="xs:string">
1891 <FnDataIterator>
1892- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1893- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1894+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1895+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1896 <ForVarIterator varname="$$context-item"/>
1897 </ChildAxisIterator>
1898 </AttributeAxisIterator>
1899@@ -20,9 +20,9 @@
1900 </SubstringAfterIterator>
1901 <FnStringIterator>
1902 <TreatIterator quant="?">
1903- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1904- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1905- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1906+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1907+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1908+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1909 <ForVarIterator varname="$$context-item"/>
1910 </DescendantAxisIterator>
1911 </ChildAxisIterator>
1912@@ -46,8 +46,8 @@
1913 <SubstringAfterIterator>
1914 <PromoteIterator type="xs:string">
1915 <FnDataIterator>
1916- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill allowed="0">
1917- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill allowed="0">
1918+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,base-uri)" typename="*" nill-allowed="0">
1919+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,doc)" typename="*" nill-allowed="0">
1920 <ForVarIterator varname="$$context-item"/>
1921 </ChildAxisIterator>
1922 </AttributeAxisIterator>
1923@@ -57,9 +57,9 @@
1924 </SubstringAfterIterator>
1925 <FnStringIterator>
1926 <TreatIterator quant="?">
1927- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1928- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1929- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1930+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1931+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1932+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1933 <ForVarIterator varname="$$context-item"/>
1934 </DescendantAxisIterator>
1935 </ChildAxisIterator>
1936@@ -270,9 +270,9 @@
1937 <SingletonIterator value="xs:string(2012-12-31)"/>
1938 <FnStringIterator>
1939 <TreatIterator quant="?">
1940- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill allowed="0">
1941- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill allowed="0">
1942- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill allowed="0">
1943+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date-time)" typename="*" nill-allowed="0">
1944+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-metadata)" typename="*" nill-allowed="0">
1945+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,sports-content)" typename="*" nill-allowed="0">
1946 <ForVarIterator varname="$$context-item"/>
1947 </DescendantAxisIterator>
1948 </ChildAxisIterator>
1949
1950=== modified file 'test/iterplans/zorba/misc/hoist4.iter'
1951--- test/iterplans/zorba/misc/hoist4.iter 2014-02-24 20:08:54 +0000
1952+++ test/iterplans/zorba/misc/hoist4.iter 2014-02-25 00:37:05 +0000
1953@@ -1,7 +1,7 @@
1954 <iterator-tree description="main query">
1955 <FLWORIterator>
1956 <ForVariable name="a">
1957- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">
1958+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
1959 <ElementIterator copyInputNodes="false">
1960 <SingletonIterator value="xs:QName(,,root)"/>
1961 <FnConcatIterator>
1962@@ -50,14 +50,14 @@
1963 </ChildAxisIterator>
1964 </ForVariable>
1965 <ForVariable name="b">
1966- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,boo)" typename="*" nill allowed="0">
1967+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,boo)" typename="*" nill-allowed="0">
1968 <ForVarIterator varname="a"/>
1969 </DescendantAxisIterator>
1970 </ForVariable>
1971 <ReturnClause>
1972 <SequentialIterator>
1973 <CtxVarDeclareIterator varid="4" varname="x">
1974- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1975+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1976 <ForVarIterator varname="b"/>
1977 </AttributeAxisIterator>
1978 </CtxVarDeclareIterator>
1979@@ -67,7 +67,7 @@
1980 <GenericArithIterator_AddOperation>
1981 <PromoteIterator type="xs:anyAtomicType">
1982 <FnDataIterator>
1983- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
1984+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
1985 <ForVarIterator varname="a"/>
1986 </AttributeAxisIterator>
1987 </FnDataIterator>
1988
1989=== modified file 'test/iterplans/zorba/misc/inline_var1.iter'
1990--- test/iterplans/zorba/misc/inline_var1.iter 2014-02-24 20:08:54 +0000
1991+++ test/iterplans/zorba/misc/inline_var1.iter 2014-02-25 00:37:05 +0000
1992@@ -26,15 +26,15 @@
1993 <ReturnClause>
1994 <IfThenElseIterator>
1995 <FnBooleanIterator>
1996- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
1997+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
1998 <ForVarIterator varname="x"/>
1999 </ChildAxisIterator>
2000 </FnBooleanIterator>
2001 <GenericArithIterator_AddOperation>
2002 <PromoteIterator type="xs:anyAtomicType">
2003 <FnDataIterator>
2004- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,att1)" typename="*" nill allowed="0">
2005- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2006+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,att1)" typename="*" nill-allowed="0">
2007+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2008 <ForVarIterator varname="x"/>
2009 </ChildAxisIterator>
2010 </AttributeAxisIterator>
2011@@ -45,10 +45,10 @@
2012 <GenericArithIterator_AddOperation>
2013 <PromoteIterator type="xs:anyAtomicType">
2014 <FnDataIterator>
2015- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,att2)" typename="*" nill allowed="0">
2016+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,att2)" typename="*" nill-allowed="0">
2017 <FunctionTraceIterator>
2018 <TreatIterator quant="">
2019- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2020+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2021 <ForVarIterator varname="x"/>
2022 </ChildAxisIterator>
2023 </TreatIterator>
2024
2025=== modified file 'test/iterplans/zorba/no-copy/dataguide-c.iter'
2026--- test/iterplans/zorba/no-copy/dataguide-c.iter 2014-02-24 20:08:54 +0000
2027+++ test/iterplans/zorba/no-copy/dataguide-c.iter 2014-02-25 00:37:05 +0000
2028@@ -38,8 +38,8 @@
2029 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
2030 </CtxVarDeclareIterator>
2031 <CtxVarDeclareIterator varid="8" varname="input">
2032- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2033- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2034+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2035+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2036 <FnDocIterator>
2037 <SingletonIterator value="xs:string(books.xml)"/>
2038 </FnDocIterator>
2039@@ -145,14 +145,14 @@
2040 </CtxVarDeclareIterator>
2041 <CtxVarDeclareIterator varid="5" varname="a">
2042 <NodeSortIterator distinct="true" ascending="true">
2043- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2044+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2045 <LetVarIterator varname="x"/>
2046 </AttributeAxisIterator>
2047 </NodeSortIterator>
2048 </CtxVarDeclareIterator>
2049 <CtxVarDeclareIterator varid="6" varname="c">
2050 <NodeSortIterator distinct="true" ascending="true">
2051- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2052+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2053 <LetVarIterator varname="x"/>
2054 </ChildAxisIterator>
2055 </NodeSortIterator>
2056
2057=== modified file 'test/iterplans/zorba/no-copy/dataguide-nc.iter'
2058--- test/iterplans/zorba/no-copy/dataguide-nc.iter 2014-02-24 20:08:54 +0000
2059+++ test/iterplans/zorba/no-copy/dataguide-nc.iter 2014-02-25 00:37:05 +0000
2060@@ -38,8 +38,8 @@
2061 <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
2062 </CtxVarDeclareIterator>
2063 <CtxVarDeclareIterator varid="8" varname="input">
2064- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2065- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2066+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2067+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2068 <FnDocIterator>
2069 <SingletonIterator value="xs:string(books.xml)"/>
2070 </FnDocIterator>
2071@@ -145,14 +145,14 @@
2072 </CtxVarDeclareIterator>
2073 <CtxVarDeclareIterator varid="5" varname="a">
2074 <NodeSortIterator distinct="true" ascending="true">
2075- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2076+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2077 <LetVarIterator varname="x"/>
2078 </AttributeAxisIterator>
2079 </NodeSortIterator>
2080 </CtxVarDeclareIterator>
2081 <CtxVarDeclareIterator varid="6" varname="c">
2082 <NodeSortIterator distinct="true" ascending="true">
2083- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2084+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2085 <LetVarIterator varname="x"/>
2086 </ChildAxisIterator>
2087 </NodeSortIterator>
2088
2089=== modified file 'test/iterplans/zorba/no-copy/dataguide2-c.iter'
2090--- test/iterplans/zorba/no-copy/dataguide2-c.iter 2014-02-24 20:08:54 +0000
2091+++ test/iterplans/zorba/no-copy/dataguide2-c.iter 2014-02-25 00:37:05 +0000
2092@@ -1,8 +1,8 @@
2093 <iterator-tree description="main query">
2094 <SequentialIterator>
2095 <CtxVarDeclareIterator varid="4" varname="input">
2096- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2097- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2098+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2099+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2100 <FnDocIterator>
2101 <SingletonIterator value="xs:string(books.xml)"/>
2102 </FnDocIterator>
2103@@ -35,14 +35,14 @@
2104 </CtxVarDeclareIterator>
2105 <CtxVarDeclareIterator varid="3" varname="a">
2106 <NodeSortIterator distinct="true" ascending="true">
2107- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2108+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2109 <LetVarIterator varname="x"/>
2110 </AttributeAxisIterator>
2111 </NodeSortIterator>
2112 </CtxVarDeclareIterator>
2113 <CtxVarDeclareIterator varid="4" varname="c">
2114 <NodeSortIterator distinct="true" ascending="true">
2115- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2116+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2117 <LetVarIterator varname="x"/>
2118 </ChildAxisIterator>
2119 </NodeSortIterator>
2120
2121=== modified file 'test/iterplans/zorba/no-copy/dataguide2-nc.iter'
2122--- test/iterplans/zorba/no-copy/dataguide2-nc.iter 2014-02-24 20:08:54 +0000
2123+++ test/iterplans/zorba/no-copy/dataguide2-nc.iter 2014-02-25 00:37:05 +0000
2124@@ -1,8 +1,8 @@
2125 <iterator-tree description="main query">
2126 <SequentialIterator>
2127 <CtxVarDeclareIterator varid="4" varname="input">
2128- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2129- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2130+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2131+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2132 <FnDocIterator>
2133 <SingletonIterator value="xs:string(books.xml)"/>
2134 </FnDocIterator>
2135@@ -35,14 +35,14 @@
2136 </CtxVarDeclareIterator>
2137 <CtxVarDeclareIterator varid="3" varname="a">
2138 <NodeSortIterator distinct="true" ascending="true">
2139- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2140+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2141 <LetVarIterator varname="x"/>
2142 </AttributeAxisIterator>
2143 </NodeSortIterator>
2144 </CtxVarDeclareIterator>
2145 <CtxVarDeclareIterator varid="4" varname="c">
2146 <NodeSortIterator distinct="true" ascending="true">
2147- <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2148+ <ChildAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2149 <LetVarIterator varname="x"/>
2150 </ChildAxisIterator>
2151 </NodeSortIterator>
2152
2153=== modified file 'test/iterplans/zorba/no-copy/dblp-q0.iter'
2154--- test/iterplans/zorba/no-copy/dblp-q0.iter 2014-02-24 20:08:54 +0000
2155+++ test/iterplans/zorba/no-copy/dblp-q0.iter 2014-02-25 00:37:05 +0000
2156@@ -27,14 +27,14 @@
2157 </LetVariable>
2158 <LetVariable name="$$opt_temp_1" materialize="true">
2159 <HoistIterator>
2160- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
2161+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
2162 <LetVarIterator varname="doc"/>
2163 </ChildAxisIterator>
2164 </HoistIterator>
2165 </LetVariable>
2166 <LetVariable name="$$opt_temp_0" materialize="true">
2167 <HoistIterator>
2168- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
2169+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
2170 <LetVarIterator varname="doc"/>
2171 </ChildAxisIterator>
2172 </HoistIterator>
2173@@ -50,8 +50,8 @@
2174 <SingletonIterator value="xs:QName(,,paper)"/>
2175 <EnclosedIterator attr_cont="false">
2176 <FnCountIterator>
2177- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
2178- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
2179+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
2180+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill-allowed="0">
2181 <LetVarIterator varname="doc"/>
2182 </ChildAxisIterator>
2183 </ChildAxisIterator>
2184@@ -64,7 +64,7 @@
2185 <FnCountIterator>
2186 <FnDistinctValuesIterator>
2187 <FnDataIterator>
2188- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2189+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2190 <LetVarIterator varname="doc"/>
2191 </DescendantAxisIterator>
2192 </FnDataIterator>
2193@@ -109,14 +109,14 @@
2194 </UnhoistIterator>
2195 </ForVariable>
2196 <ForVariable name="$$context-item">
2197- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
2198+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
2199 <ForVarIterator varname="$$context-item"/>
2200 </ChildAxisIterator>
2201 </ForVariable>
2202 <WhereClause>
2203 <CompareIterator>
2204 <FnDataIterator>
2205- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
2206+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
2207 <ForVarIterator varname="$$context-item"/>
2208 </ChildAxisIterator>
2209 </FnDataIterator>
2210@@ -136,7 +136,7 @@
2211 <FnCountIterator>
2212 <FnDistinctValuesIterator>
2213 <FnDataIterator>
2214- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2215+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2216 <FLWORIterator>
2217 <ForVariable name="$$context-item">
2218 <UnhoistIterator>
2219@@ -144,14 +144,14 @@
2220 </UnhoistIterator>
2221 </ForVariable>
2222 <ForVariable name="$$context-item">
2223- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
2224+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill-allowed="0">
2225 <ForVarIterator varname="$$context-item"/>
2226 </ChildAxisIterator>
2227 </ForVariable>
2228 <WhereClause>
2229 <CompareIterator>
2230 <FnDataIterator>
2231- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
2232+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill-allowed="0">
2233 <ForVarIterator varname="$$context-item"/>
2234 </ChildAxisIterator>
2235 </FnDataIterator>
2236
2237=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9065.iter'
2238--- test/iterplans/zorba/no-copy/hashjoin-9065.iter 2014-02-24 20:08:54 +0000
2239+++ test/iterplans/zorba/no-copy/hashjoin-9065.iter 2014-02-25 00:37:05 +0000
2240@@ -7,9 +7,9 @@
2241 </ForVariable>
2242 <LetVariable name="$$opt_temp_1" materialize="true">
2243 <HoistIterator>
2244- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
2245- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2246- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
2247+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill-allowed="0">
2248+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2249+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
2250 <ForVarIterator varname="b"/>
2251 </ChildAxisIterator>
2252 </ChildAxisIterator>
2253@@ -19,9 +19,9 @@
2254 <ForVariable name="$$opt_temp_0">
2255 <HoistIterator>
2256 <FnCountIterator>
2257- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2258- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2259- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
2260+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2261+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2262+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill-allowed="0">
2263 <ForVarIterator varname="b"/>
2264 </ChildAxisIterator>
2265 </ChildAxisIterator>
2266
2267=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9198.iter'
2268--- test/iterplans/zorba/no-copy/hashjoin-9198.iter 2014-02-24 20:08:54 +0000
2269+++ test/iterplans/zorba/no-copy/hashjoin-9198.iter 2014-02-25 00:37:05 +0000
2270@@ -29,7 +29,7 @@
2271 </CreateInternalIndexIterator>
2272 </LetVariable>
2273 <ForVariable name="book">
2274- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2275+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2276 <FnDocIterator>
2277 <SingletonIterator value="xs:string(books.xml)"/>
2278 </FnDocIterator>
2279@@ -38,7 +38,7 @@
2280 <ForVariable name="$$opt_temp_1">
2281 <HoistIterator>
2282 <FnCountIterator>
2283- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2284+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2285 <ForVarIterator varname="book"/>
2286 </ChildAxisIterator>
2287 </FnCountIterator>
2288
2289=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9199.iter'
2290--- test/iterplans/zorba/no-copy/hashjoin-9199.iter 2014-02-24 20:08:54 +0000
2291+++ test/iterplans/zorba/no-copy/hashjoin-9199.iter 2014-02-25 00:37:05 +0000
2292@@ -29,7 +29,7 @@
2293 </CreateInternalIndexIterator>
2294 </LetVariable>
2295 <ForVariable name="book">
2296- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2297+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2298 <FnDocIterator>
2299 <SingletonIterator value="xs:string(books.xml)"/>
2300 </FnDocIterator>
2301@@ -38,7 +38,7 @@
2302 <ForVariable name="$$opt_temp_1">
2303 <HoistIterator>
2304 <FnCountIterator>
2305- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2306+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2307 <ForVarIterator varname="book"/>
2308 </ChildAxisIterator>
2309 </FnCountIterator>
2310
2311=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9212.iter'
2312--- test/iterplans/zorba/no-copy/hashjoin-9212.iter 2014-02-24 20:08:54 +0000
2313+++ test/iterplans/zorba/no-copy/hashjoin-9212.iter 2014-02-25 00:37:05 +0000
2314@@ -5,7 +5,7 @@
2315 <FLWORIterator>
2316 <LetVariable name="$$opt_temp_0" materialize="true">
2317 <HoistIterator>
2318- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2319+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2320 <FnDocIterator>
2321 <SingletonIterator value="xs:string(books.xml)"/>
2322 </FnDocIterator>
2323@@ -24,7 +24,7 @@
2324 <ValueIndexEntryBuilderIterator>
2325 <ForVarIterator varname="$$opt_temp_1"/>
2326 <FnCountIterator>
2327- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2328+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2329 <ForVarIterator varname="$$opt_temp_1"/>
2330 </ChildAxisIterator>
2331 </FnCountIterator>
2332@@ -34,7 +34,7 @@
2333 </CreateInternalIndexIterator>
2334 </LetVariable>
2335 <ForVariable name="book">
2336- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2337+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2338 <FnDocIterator>
2339 <SingletonIterator value="xs:string(books.xml)"/>
2340 </FnDocIterator>
2341@@ -42,7 +42,7 @@
2342 </ForVariable>
2343 <ForVariable name="anzahl">
2344 <FnCountIterator>
2345- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2346+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2347 <ForVarIterator varname="book"/>
2348 </ChildAxisIterator>
2349 </FnCountIterator>
2350
2351=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9389.iter'
2352--- test/iterplans/zorba/no-copy/hashjoin-9389.iter 2014-02-24 20:08:54 +0000
2353+++ test/iterplans/zorba/no-copy/hashjoin-9389.iter 2014-02-25 00:37:05 +0000
2354@@ -5,7 +5,7 @@
2355 <FLWORIterator>
2356 <LetVariable name="$$opt_temp_0" materialize="true">
2357 <HoistIterator>
2358- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2359+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2360 <FnDocIterator>
2361 <SingletonIterator value="xs:string(books.xml)"/>
2362 </FnDocIterator>
2363@@ -24,7 +24,7 @@
2364 <ValueIndexEntryBuilderIterator>
2365 <ForVarIterator varname="$$opt_temp_1"/>
2366 <FnCountIterator>
2367- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2368+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2369 <ForVarIterator varname="$$opt_temp_1"/>
2370 </ChildAxisIterator>
2371 </FnCountIterator>
2372
2373=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9390.iter'
2374--- test/iterplans/zorba/no-copy/hashjoin-9390.iter 2014-02-24 20:08:54 +0000
2375+++ test/iterplans/zorba/no-copy/hashjoin-9390.iter 2014-02-25 00:37:05 +0000
2376@@ -2,7 +2,7 @@
2377 <FLWORIterator>
2378 <LetVariable name="$$opt_temp_0" materialize="true">
2379 <HoistIterator>
2380- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2381+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2382 <FnDocIterator>
2383 <SingletonIterator value="xs:string(books.xml)"/>
2384 </FnDocIterator>
2385@@ -21,7 +21,7 @@
2386 <ValueIndexEntryBuilderIterator>
2387 <ForVarIterator varname="$$opt_temp_1"/>
2388 <FnCountIterator>
2389- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2390+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2391 <ForVarIterator varname="$$opt_temp_1"/>
2392 </ChildAxisIterator>
2393 </FnCountIterator>
2394
2395=== modified file 'test/iterplans/zorba/no-copy/hashjoin-9392.iter'
2396--- test/iterplans/zorba/no-copy/hashjoin-9392.iter 2014-02-24 20:08:54 +0000
2397+++ test/iterplans/zorba/no-copy/hashjoin-9392.iter 2014-02-25 00:37:05 +0000
2398@@ -12,7 +12,7 @@
2399 <FLWORIterator>
2400 <LetVariable name="$$opt_temp_0" materialize="true">
2401 <HoistIterator>
2402- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
2403+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
2404 <FnDocIterator>
2405 <SingletonIterator value="xs:string(books.xml)"/>
2406 </FnDocIterator>
2407@@ -31,7 +31,7 @@
2408 <ValueIndexEntryBuilderIterator>
2409 <ForVarIterator varname="$$opt_temp_1"/>
2410 <FnCountIterator>
2411- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
2412+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill-allowed="0">
2413 <ForVarIterator varname="$$opt_temp_1"/>
2414 </ChildAxisIterator>
2415 </FnCountIterator>
2416
2417=== modified file 'test/iterplans/zorba/no-copy/hashjoin-gary1.iter'
2418--- test/iterplans/zorba/no-copy/hashjoin-gary1.iter 2014-02-24 20:08:54 +0000
2419+++ test/iterplans/zorba/no-copy/hashjoin-gary1.iter 2014-02-25 00:37:05 +0000
2420@@ -25,7 +25,7 @@
2421 <EnclosedIterator attr_cont="false">
2422 <FLWORIterator>
2423 <LetVariable name="y" materialize="true">
2424- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
2425+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill-allowed="0">
2426 <TupleStreamIterator>
2427 <WhereIterator>
2428 <WhereIterator>
2429@@ -38,13 +38,13 @@
2430 <SingletonIterator value="xs:string(../hashjoins/min_ic1980.xml)"/>
2431 </FnDocIterator>
2432 </ForIterator>
2433- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
2434+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill-allowed="0">
2435 <ForVarIterator varname="$$context-item"/>
2436 </ChildAxisIterator>
2437 </ForIterator>
2438 <CompareIterator>
2439 <FnDataIterator>
2440- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
2441+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
2442 <ForVarIterator varname="$$context-item"/>
2443 </AttributeAxisIterator>
2444 </FnDataIterator>
2445@@ -53,7 +53,7 @@
2446 </WhereIterator>
2447 <CompareIterator>
2448 <FnDataIterator>
2449- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
2450+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
2451 <ForVarIterator varname="$$context-item"/>
2452 </AttributeAxisIterator>
2453 </FnDataIterator>
2454@@ -74,7 +74,7 @@
2455 <GeneralIndexEntryBuilderIterator>
2456 <ForVarIterator varname="$$opt_temp_2"/>
2457 <FnDataIterator>
2458- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">
2459+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
2460 <ForVarIterator varname="$$opt_temp_2"/>
2461 </AttributeAxisIterator>
2462 </FnDataIterator>
2463@@ -84,8 +84,8 @@
2464 </CreateInternalIndexIterator>
2465 </LetVariable>
2466 <ForVariable name="i">
2467- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill allowed="0">
2468- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill allowed="0">
2469+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,inst)" typename="*" nill-allowed="0">
2470+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,institutions)" typename="*" nill-allowed="0">
2471 <FnDocIterator>
2472 <SingletonIterator value="xs:string(../hashjoins/base.xml)"/>
2473 </FnDocIterator>
2474@@ -93,13 +93,13 @@
2475 </ChildAxisIterator>
2476 </ForVariable>
2477 <LetVariable name="unitid" materialize="true">
2478- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill allowed="0">
2479+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,unitid)" typename="*" nill-allowed="0">
2480 <ForVarIterator varname="i"/>
2481 </AttributeAxisIterator>
2482 </LetVariable>
2483 <LetVariable name="$$opt_temp_1" materialize="true">
2484 <HoistIterator>
2485- <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2486+ <AttributeAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2487 <FLWORIterator>
2488 <ForVariable name="$$context-item">
2489 <NodeSortIterator distinct="true" ascending="true">
2490@@ -131,12 +131,12 @@
2491 <EnclosedIterator attr_cont="false">
2492 <FLWORIterator>
2493 <ForVariable name="j">
2494- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
2495+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill-allowed="0">
2496 <ForVarIterator varname="i"/>
2497 </ChildAxisIterator>
2498 </ForVariable>
2499 <LetVariable name="year" materialize="true">
2500- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2501+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2502 <ForVarIterator varname="j"/>
2503 </AttributeAxisIterator>
2504 </LetVariable>
2505@@ -163,12 +163,12 @@
2506 <EnclosedIterator attr_cont="false">
2507 <FLWORIterator>
2508 <ForVariable name="k">
2509- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
2510+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill-allowed="0">
2511 <ForVarIterator varname="j"/>
2512 </ChildAxisIterator>
2513 </ForVariable>
2514 <LetVariable name="file" materialize="true">
2515- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2516+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2517 <ForVarIterator varname="k"/>
2518 </AttributeAxisIterator>
2519 </LetVariable>
2520
2521=== modified file 'test/iterplans/zorba/no-copy/hashjoin-idx1.iter'
2522--- test/iterplans/zorba/no-copy/hashjoin-idx1.iter 2014-02-24 20:08:54 +0000
2523+++ test/iterplans/zorba/no-copy/hashjoin-idx1.iter 2014-02-25 00:37:05 +0000
2524@@ -7,9 +7,9 @@
2525 </LetVariable>
2526 <LetVariable name="$$opt_temp_0" materialize="true">
2527 <HoistIterator>
2528- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
2529- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
2530- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2531+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
2532+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
2533+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2534 <LetVarIterator varname="auction"/>
2535 </ChildAxisIterator>
2536 </ChildAxisIterator>
2537@@ -29,8 +29,8 @@
2538 <ForVarIterator varname="$$opt_temp_3"/>
2539 <PromoteIterator type="xs:anyAtomicType">
2540 <FnDataIterator>
2541- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2542- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
2543+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2544+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
2545 <ForVarIterator varname="$$opt_temp_3"/>
2546 </ChildAxisIterator>
2547 </AttributeAxisIterator>
2548@@ -42,9 +42,9 @@
2549 </CreateInternalIndexIterator>
2550 </LetVariable>
2551 <ForVariable name="p">
2552- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2553- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
2554- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2555+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2556+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
2557+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2558 <LetVarIterator varname="auction"/>
2559 </ChildAxisIterator>
2560 </ChildAxisIterator>
2561@@ -53,8 +53,8 @@
2562 <LetVariable name="$$opt_temp_2" materialize="true">
2563 <HoistIterator>
2564 <FnDataIterator>
2565- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2566- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2567+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2568+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2569 <ForVarIterator varname="p"/>
2570 </ChildAxisIterator>
2571 </ChildAxisIterator>
2572@@ -64,7 +64,7 @@
2573 <LetVariable name="$$opt_temp_1" materialize="true">
2574 <HoistIterator>
2575 <FnDataIterator>
2576- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
2577+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
2578 <ForVarIterator varname="p"/>
2579 </AttributeAxisIterator>
2580 </FnDataIterator>
2581
2582=== modified file 'test/iterplans/zorba/no-copy/hashjoin-idx4.iter'
2583--- test/iterplans/zorba/no-copy/hashjoin-idx4.iter 2014-02-24 20:08:54 +0000
2584+++ test/iterplans/zorba/no-copy/hashjoin-idx4.iter 2014-02-25 00:37:05 +0000
2585@@ -2,7 +2,7 @@
2586 <FunctionTraceIterator>
2587 <FLWORIterator>
2588 <LetVariable name="e" materialize="true">
2589- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill allowed="0" target_position="0">
2590+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,r2)" typename="*" nill-allowed="0" target_position="0">
2591 <ElementIterator>
2592 <SingletonIterator value="xs:QName(,,r1)"/>
2593 <FnConcatIterator/>
2594@@ -34,7 +34,7 @@
2595 </HoistIterator>
2596 </ForVariable>
2597 <LetVariable name="parent" materialize="true">
2598- <ParentAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
2599+ <ParentAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
2600 <LetVarIterator varname="e"/>
2601 </ParentAxisIterator>
2602 </LetVariable>
2603
2604=== modified file 'test/iterplans/zorba/no-copy/hashjoin-q8.iter'
2605--- test/iterplans/zorba/no-copy/hashjoin-q8.iter 2014-02-24 20:08:54 +0000
2606+++ test/iterplans/zorba/no-copy/hashjoin-q8.iter 2014-02-25 00:37:05 +0000
2607@@ -7,9 +7,9 @@
2608 </LetVariable>
2609 <LetVariable name="$$opt_temp_0" materialize="true">
2610 <HoistIterator>
2611- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
2612- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
2613- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2614+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
2615+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
2616+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2617 <LetVarIterator varname="auction"/>
2618 </ChildAxisIterator>
2619 </ChildAxisIterator>
2620@@ -29,8 +29,8 @@
2621 <ForVarIterator varname="$$opt_temp_2"/>
2622 <CastIterator type="xs:string">
2623 <FnDataIterator>
2624- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2625- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
2626+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2627+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
2628 <ForVarIterator varname="$$opt_temp_2"/>
2629 </ChildAxisIterator>
2630 </AttributeAxisIterator>
2631@@ -42,9 +42,9 @@
2632 </CreateInternalIndexIterator>
2633 </LetVariable>
2634 <ForVariable name="p">
2635- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2636- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
2637- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2638+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2639+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
2640+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2641 <LetVarIterator varname="auction"/>
2642 </ChildAxisIterator>
2643 </ChildAxisIterator>
2644@@ -54,7 +54,7 @@
2645 <HoistIterator>
2646 <CastIterator type="xs:string">
2647 <FnDataIterator>
2648- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
2649+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
2650 <ForVarIterator varname="p"/>
2651 </AttributeAxisIterator>
2652 </FnDataIterator>
2653@@ -67,8 +67,8 @@
2654 <AttributeIterator qname="xs:QName(,,person)">
2655 <EnclosedIterator attr_cont="true">
2656 <FnDataIterator>
2657- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2658- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2659+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2660+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2661 <ForVarIterator varname="p"/>
2662 </ChildAxisIterator>
2663 </ChildAxisIterator>
2664
2665=== modified file 'test/iterplans/zorba/no-copy/node-copy-01.iter'
2666--- test/iterplans/zorba/no-copy/node-copy-01.iter 2014-02-24 20:08:54 +0000
2667+++ test/iterplans/zorba/no-copy/node-copy-01.iter 2014-02-25 00:37:05 +0000
2668@@ -13,14 +13,14 @@
2669 </ElementIterator>
2670 </CtxVarDeclareIterator>
2671 <FnConcatIterator>
2672- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
2673+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
2674 <NodeCopyIterator>
2675- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2676+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2677 <ElementIterator>
2678 <SingletonIterator value="xs:QName(,,node)"/>
2679 <FnConcatIterator/>
2680 <EnclosedIterator attr_cont="false">
2681- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2682+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2683 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
2684 </ChildAxisIterator>
2685 </EnclosedIterator>
2686
2687=== modified file 'test/iterplans/zorba/no-copy/node-copy-02.iter'
2688--- test/iterplans/zorba/no-copy/node-copy-02.iter 2014-02-24 20:08:54 +0000
2689+++ test/iterplans/zorba/no-copy/node-copy-02.iter 2014-02-25 00:37:05 +0000
2690@@ -13,14 +13,14 @@
2691 </ElementIterator>
2692 </CtxVarDeclareIterator>
2693 <FnConcatIterator>
2694- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
2695+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
2696 <NodeCopyIterator>
2697- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2698+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2699 <ElementIterator copyInputNodes="false">
2700 <SingletonIterator value="xs:QName(,,node)"/>
2701 <FnConcatIterator/>
2702 <EnclosedIterator attr_cont="false">
2703- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2704+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2705 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
2706 </ChildAxisIterator>
2707 </EnclosedIterator>
2708
2709=== modified file 'test/iterplans/zorba/no-copy/node-copy-03.iter'
2710--- test/iterplans/zorba/no-copy/node-copy-03.iter 2014-02-24 20:08:54 +0000
2711+++ test/iterplans/zorba/no-copy/node-copy-03.iter 2014-02-25 00:37:05 +0000
2712@@ -13,14 +13,14 @@
2713 </ElementIterator>
2714 </CtxVarDeclareIterator>
2715 <FnConcatIterator>
2716- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
2717+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
2718 <NodeCopyIterator>
2719- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2720+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2721 <ElementIterator copyInputNodes="false">
2722 <SingletonIterator value="xs:QName(,,node)"/>
2723 <FnConcatIterator/>
2724 <EnclosedIterator attr_cont="false">
2725- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
2726+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
2727 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
2728 </ChildAxisIterator>
2729 </EnclosedIterator>
2730
2731=== modified file 'test/iterplans/zorba/no-copy/path17.iter'
2732--- test/iterplans/zorba/no-copy/path17.iter 2014-02-24 20:08:54 +0000
2733+++ test/iterplans/zorba/no-copy/path17.iter 2014-02-25 00:37:05 +0000
2734@@ -16,7 +16,7 @@
2735 <NodeSortIterator distinct="true" ascending="true">
2736 <FLWORIterator>
2737 <ForVariable name="$$context-item">
2738- <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
2739+ <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
2740 <FnDocIterator>
2741 <PromoteIterator type="xs:string">
2742 <FnDataIterator>
2743@@ -27,20 +27,20 @@
2744 </DescendantSelfAxisIterator>
2745 </ForVariable>
2746 <ForVariable name="$$context-item">
2747- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">
2748+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill-allowed="0">
2749 <ForVarIterator varname="$$context-item"/>
2750 </ChildAxisIterator>
2751 </ForVariable>
2752 <WhereClause>
2753 <AndIterator>
2754 <FnEmptyIterator>
2755- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">
2756+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill-allowed="0">
2757 <ForVarIterator varname="$$context-item"/>
2758 </AttributeAxisIterator>
2759 </FnEmptyIterator>
2760 <CompareIterator>
2761 <FnDataIterator>
2762- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2763+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2764 <ForVarIterator varname="$$context-item"/>
2765 </ChildAxisIterator>
2766 </FnDataIterator>
2767@@ -56,8 +56,8 @@
2768 </ForVariable>
2769 <ReturnClause>
2770 <FnStringIterator>
2771- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2772- <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
2773+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2774+ <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
2775 <ForVarIterator varname="x"/>
2776 </ParentAxisIterator>
2777 </AttributeAxisIterator>
2778
2779=== modified file 'test/iterplans/zorba/no-copy/q1.iter'
2780--- test/iterplans/zorba/no-copy/q1.iter 2014-02-24 20:08:54 +0000
2781+++ test/iterplans/zorba/no-copy/q1.iter 2014-02-25 00:37:05 +0000
2782@@ -10,8 +10,8 @@
2783 <CtxVarDeclareIterator varid="4" varname="input-context"/>
2784 <FLWORIterator>
2785 <ForVariable name="$$context-item">
2786- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
2787- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2788+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
2789+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2790 <FnDocIterator>
2791 <PromoteIterator type="xs:string">
2792 <FnDataIterator>
2793@@ -23,14 +23,14 @@
2794 </ChildAxisIterator>
2795 </ForVariable>
2796 <ForVariable name="$$context-item">
2797- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2798+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2799 <ForVarIterator varname="$$context-item"/>
2800 </ChildAxisIterator>
2801 </ForVariable>
2802 <WhereClause>
2803 <CompareIterator>
2804 <FnDataIterator>
2805- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
2806+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
2807 <ForVarIterator varname="$$context-item"/>
2808 </AttributeAxisIterator>
2809 </FnDataIterator>
2810@@ -38,8 +38,8 @@
2811 </CompareIterator>
2812 </WhereClause>
2813 <ReturnClause>
2814- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2815- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2816+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2817+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2818 <ForVarIterator varname="$$context-item"/>
2819 </ChildAxisIterator>
2820 </ChildAxisIterator>
2821
2822=== modified file 'test/iterplans/zorba/no-copy/q10.iter'
2823--- test/iterplans/zorba/no-copy/q10.iter 2014-02-24 20:08:54 +0000
2824+++ test/iterplans/zorba/no-copy/q10.iter 2014-02-25 00:37:05 +0000
2825@@ -13,9 +13,9 @@
2826 </LetVariable>
2827 <LetVariable name="$$opt_temp_0" materialize="true">
2828 <HoistIterator>
2829- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2830- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
2831- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2832+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2833+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
2834+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2835 <LetVarIterator varname="auction"/>
2836 </ChildAxisIterator>
2837 </ChildAxisIterator>
2838@@ -34,9 +34,9 @@
2839 <GeneralIndexEntryBuilderIterator>
2840 <ForVarIterator varname="$$opt_temp_1"/>
2841 <FnDataIterator>
2842- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill allowed="0">
2843- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill allowed="0">
2844- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2845+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill-allowed="0">
2846+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill-allowed="0">
2847+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2848 <ForVarIterator varname="$$opt_temp_1"/>
2849 </ChildAxisIterator>
2850 </ChildAxisIterator>
2851@@ -50,12 +50,12 @@
2852 <ForVariable name="i">
2853 <FnDistinctValuesIterator>
2854 <FnDataIterator>
2855- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill allowed="0">
2856- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill allowed="0">
2857- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2858- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
2859- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
2860- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
2861+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,category)" typename="*" nill-allowed="0">
2862+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,interest)" typename="*" nill-allowed="0">
2863+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2864+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
2865+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
2866+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
2867 <LetVarIterator varname="auction"/>
2868 </ChildAxisIterator>
2869 </ChildAxisIterator>
2870@@ -96,9 +96,9 @@
2871 <ElementIterator copyInputNodes="false">
2872 <SingletonIterator value="xs:QName(,,sexe)"/>
2873 <EnclosedIterator attr_cont="false">
2874- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2875- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,gender)" typename="*" nill allowed="0">
2876- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2877+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2878+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,gender)" typename="*" nill-allowed="0">
2879+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2880 <ForVarIterator varname="t"/>
2881 </ChildAxisIterator>
2882 </ChildAxisIterator>
2883@@ -108,9 +108,9 @@
2884 <ElementIterator copyInputNodes="false">
2885 <SingletonIterator value="xs:QName(,,age)"/>
2886 <EnclosedIterator attr_cont="false">
2887- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2888- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,age)" typename="*" nill allowed="0">
2889- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2890+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2891+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,age)" typename="*" nill-allowed="0">
2892+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2893 <ForVarIterator varname="t"/>
2894 </ChildAxisIterator>
2895 </ChildAxisIterator>
2896@@ -120,9 +120,9 @@
2897 <ElementIterator copyInputNodes="false">
2898 <SingletonIterator value="xs:QName(,,education)"/>
2899 <EnclosedIterator attr_cont="false">
2900- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2901- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,education)" typename="*" nill allowed="0">
2902- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2903+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2904+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,education)" typename="*" nill-allowed="0">
2905+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2906 <ForVarIterator varname="t"/>
2907 </ChildAxisIterator>
2908 </ChildAxisIterator>
2909@@ -133,8 +133,8 @@
2910 <SingletonIterator value="xs:QName(,,revenu)"/>
2911 <EnclosedIterator attr_cont="false">
2912 <FnDataIterator>
2913- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
2914- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
2915+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
2916+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
2917 <ForVarIterator varname="t"/>
2918 </ChildAxisIterator>
2919 </AttributeAxisIterator>
2920@@ -149,8 +149,8 @@
2921 <ElementIterator copyInputNodes="false">
2922 <SingletonIterator value="xs:QName(,,nom)"/>
2923 <EnclosedIterator attr_cont="false">
2924- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2925- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
2926+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2927+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
2928 <ForVarIterator varname="t"/>
2929 </ChildAxisIterator>
2930 </ChildAxisIterator>
2931@@ -159,9 +159,9 @@
2932 <ElementIterator copyInputNodes="false">
2933 <SingletonIterator value="xs:QName(,,rue)"/>
2934 <EnclosedIterator attr_cont="false">
2935- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2936- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,street)" typename="*" nill allowed="0">
2937- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">
2938+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2939+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,street)" typename="*" nill-allowed="0">
2940+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
2941 <ForVarIterator varname="t"/>
2942 </ChildAxisIterator>
2943 </ChildAxisIterator>
2944@@ -171,9 +171,9 @@
2945 <ElementIterator copyInputNodes="false">
2946 <SingletonIterator value="xs:QName(,,ville)"/>
2947 <EnclosedIterator attr_cont="false">
2948- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2949- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">
2950- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">
2951+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2952+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
2953+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
2954 <ForVarIterator varname="t"/>
2955 </ChildAxisIterator>
2956 </ChildAxisIterator>
2957@@ -183,9 +183,9 @@
2958 <ElementIterator copyInputNodes="false">
2959 <SingletonIterator value="xs:QName(,,pays)"/>
2960 <EnclosedIterator attr_cont="false">
2961- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2962- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,country)" typename="*" nill allowed="0">
2963- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill allowed="0">
2964+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2965+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,country)" typename="*" nill-allowed="0">
2966+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,address)" typename="*" nill-allowed="0">
2967 <ForVarIterator varname="t"/>
2968 </ChildAxisIterator>
2969 </ChildAxisIterator>
2970@@ -198,8 +198,8 @@
2971 <ElementIterator copyInputNodes="false">
2972 <SingletonIterator value="xs:QName(,,courrier)"/>
2973 <EnclosedIterator attr_cont="false">
2974- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2975- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill allowed="0">
2976+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2977+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill-allowed="0">
2978 <ForVarIterator varname="t"/>
2979 </ChildAxisIterator>
2980 </ChildAxisIterator>
2981@@ -208,8 +208,8 @@
2982 <ElementIterator copyInputNodes="false">
2983 <SingletonIterator value="xs:QName(,,pagePerso)"/>
2984 <EnclosedIterator attr_cont="false">
2985- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2986- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill allowed="0">
2987+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2988+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill-allowed="0">
2989 <ForVarIterator varname="t"/>
2990 </ChildAxisIterator>
2991 </ChildAxisIterator>
2992@@ -222,8 +222,8 @@
2993 <ElementIterator copyInputNodes="false">
2994 <SingletonIterator value="xs:QName(,,cartePaiement)"/>
2995 <EnclosedIterator attr_cont="false">
2996- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
2997- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,creditcard)" typename="*" nill allowed="0">
2998+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
2999+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,creditcard)" typename="*" nill-allowed="0">
3000 <ForVarIterator varname="t"/>
3001 </ChildAxisIterator>
3002 </ChildAxisIterator>
3003
3004=== modified file 'test/iterplans/zorba/no-copy/q11.iter'
3005--- test/iterplans/zorba/no-copy/q11.iter 2014-02-24 20:08:54 +0000
3006+++ test/iterplans/zorba/no-copy/q11.iter 2014-02-25 00:37:05 +0000
3007@@ -18,10 +18,10 @@
3008 </LetVariable>
3009 <LetVariable name="$$opt_temp_0" materialize="true">
3010 <HoistIterator>
3011- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill allowed="0">
3012- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3013- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3014- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3015+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill-allowed="0">
3016+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3017+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3018+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3019 <LetVarIterator varname="auction"/>
3020 </ChildAxisIterator>
3021 </ChildAxisIterator>
3022@@ -30,9 +30,9 @@
3023 </HoistIterator>
3024 </LetVariable>
3025 <ForVariable name="p">
3026- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3027- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3028- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3029+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3030+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3031+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3032 <LetVarIterator varname="auction"/>
3033 </ChildAxisIterator>
3034 </ChildAxisIterator>
3035@@ -41,8 +41,8 @@
3036 <LetVariable name="$$opt_temp_1" materialize="true">
3037 <HoistIterator>
3038 <FnDataIterator>
3039- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3040- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3041+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3042+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3043 <ForVarIterator varname="p"/>
3044 </ChildAxisIterator>
3045 </AttributeAxisIterator>
3046@@ -55,8 +55,8 @@
3047 <AttributeIterator qname="xs:QName(,,name)">
3048 <EnclosedIterator attr_cont="true">
3049 <FnDataIterator>
3050- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3051- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3052+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3053+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3054 <ForVarIterator varname="p"/>
3055 </ChildAxisIterator>
3056 </ChildAxisIterator>
3057@@ -81,7 +81,7 @@
3058 <PromoteIterator type="xs:double">
3059 <FnDataIterator>
3060 <FnExactlyOneIterator>
3061- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3062+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3063 <ForVarIterator varname="i"/>
3064 </ChildAxisIterator>
3065 </FnExactlyOneIterator>
3066
3067=== modified file 'test/iterplans/zorba/no-copy/q12.iter'
3068--- test/iterplans/zorba/no-copy/q12.iter 2014-02-24 20:08:54 +0000
3069+++ test/iterplans/zorba/no-copy/q12.iter 2014-02-25 00:37:05 +0000
3070@@ -18,10 +18,10 @@
3071 </LetVariable>
3072 <LetVariable name="$$opt_temp_0" materialize="true">
3073 <HoistIterator>
3074- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill allowed="0">
3075- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3076- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3077- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3078+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,initial)" typename="*" nill-allowed="0">
3079+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3080+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3081+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3082 <LetVarIterator varname="auction"/>
3083 </ChildAxisIterator>
3084 </ChildAxisIterator>
3085@@ -30,9 +30,9 @@
3086 </HoistIterator>
3087 </LetVariable>
3088 <ForVariable name="p">
3089- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3090- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3091- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3092+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3093+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3094+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3095 <LetVarIterator varname="auction"/>
3096 </ChildAxisIterator>
3097 </ChildAxisIterator>
3098@@ -41,8 +41,8 @@
3099 <LetVariable name="$$opt_temp_1" materialize="true">
3100 <HoistIterator>
3101 <FnDataIterator>
3102- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3103- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3104+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3105+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3106 <ForVarIterator varname="p"/>
3107 </ChildAxisIterator>
3108 </AttributeAxisIterator>
3109@@ -52,8 +52,8 @@
3110 <WhereClause>
3111 <CompareIterator>
3112 <FnDataIterator>
3113- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3114- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3115+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3116+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3117 <ForVarIterator varname="p"/>
3118 </ChildAxisIterator>
3119 </AttributeAxisIterator>
3120@@ -67,8 +67,8 @@
3121 <AttributeIterator qname="xs:QName(,,person)">
3122 <EnclosedIterator attr_cont="true">
3123 <FnDataIterator>
3124- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3125- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3126+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3127+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3128 <ForVarIterator varname="p"/>
3129 </ChildAxisIterator>
3130 </AttributeAxisIterator>
3131@@ -93,7 +93,7 @@
3132 <PromoteIterator type="xs:double">
3133 <FnDataIterator>
3134 <FnExactlyOneIterator>
3135- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3136+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3137 <ForVarIterator varname="i"/>
3138 </ChildAxisIterator>
3139 </FnExactlyOneIterator>
3140
3141=== modified file 'test/iterplans/zorba/no-copy/q13.iter'
3142--- test/iterplans/zorba/no-copy/q13.iter 2014-02-24 20:08:54 +0000
3143+++ test/iterplans/zorba/no-copy/q13.iter 2014-02-25 00:37:05 +0000
3144@@ -3,10 +3,10 @@
3145 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3146 <FLWORIterator>
3147 <ForVariable name="i">
3148- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3149- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,australia)" typename="*" nill allowed="0">
3150- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">
3151- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3152+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3153+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,australia)" typename="*" nill-allowed="0">
3154+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
3155+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3156 <FnDocIterator>
3157 <PromoteIterator type="xs:string">
3158 <FnDataIterator>
3159@@ -25,8 +25,8 @@
3160 <AttributeIterator qname="xs:QName(,,name)">
3161 <EnclosedIterator attr_cont="true">
3162 <FnDataIterator>
3163- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3164- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3165+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3166+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3167 <ForVarIterator varname="i"/>
3168 </ChildAxisIterator>
3169 </ChildAxisIterator>
3170@@ -34,7 +34,7 @@
3171 </EnclosedIterator>
3172 </AttributeIterator>
3173 <EnclosedIterator attr_cont="false">
3174- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">
3175+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
3176 <ForVarIterator varname="i"/>
3177 </ChildAxisIterator>
3178 </EnclosedIterator>
3179
3180=== modified file 'test/iterplans/zorba/no-copy/q14.iter'
3181--- test/iterplans/zorba/no-copy/q14.iter 2014-02-24 20:08:54 +0000
3182+++ test/iterplans/zorba/no-copy/q14.iter 2014-02-25 00:37:05 +0000
3183@@ -3,8 +3,8 @@
3184 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3185 <FLWORIterator>
3186 <ForVariable name="i">
3187- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3188- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3189+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3190+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3191 <FnDocIterator>
3192 <PromoteIterator type="xs:string">
3193 <FnDataIterator>
3194@@ -19,7 +19,7 @@
3195 <ContainsIterator>
3196 <FnStringIterator>
3197 <FnExactlyOneIterator>
3198- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">
3199+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
3200 <ForVarIterator varname="i"/>
3201 </ChildAxisIterator>
3202 </FnExactlyOneIterator>
3203@@ -28,8 +28,8 @@
3204 </ContainsIterator>
3205 </WhereClause>
3206 <ReturnClause>
3207- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3208- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3209+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3210+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3211 <ForVarIterator varname="i"/>
3212 </ChildAxisIterator>
3213 </ChildAxisIterator>
3214
3215=== modified file 'test/iterplans/zorba/no-copy/q15.iter'
3216--- test/iterplans/zorba/no-copy/q15.iter 2014-02-24 20:08:54 +0000
3217+++ test/iterplans/zorba/no-copy/q15.iter 2014-02-25 00:37:05 +0000
3218@@ -3,19 +3,19 @@
3219 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3220 <FLWORIterator>
3221 <ForVariable name="a">
3222- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3223- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill allowed="0">
3224- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill allowed="0">
3225- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill allowed="0">
3226- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">
3227- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">
3228- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">
3229- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">
3230- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">
3231- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">
3232- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
3233- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
3234- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3235+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3236+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill-allowed="0">
3237+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill-allowed="0">
3238+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill-allowed="0">
3239+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
3240+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
3241+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
3242+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
3243+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
3244+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
3245+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
3246+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
3247+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3248 <FnDocIterator>
3249 <PromoteIterator type="xs:string">
3250 <FnDataIterator>
3251
3252=== modified file 'test/iterplans/zorba/no-copy/q16.iter'
3253--- test/iterplans/zorba/no-copy/q16.iter 2014-02-24 20:08:54 +0000
3254+++ test/iterplans/zorba/no-copy/q16.iter 2014-02-25 00:37:05 +0000
3255@@ -3,9 +3,9 @@
3256 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3257 <FLWORIterator>
3258 <ForVariable name="a">
3259- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
3260- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
3261- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3262+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
3263+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
3264+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3265 <FnDocIterator>
3266 <PromoteIterator type="xs:string">
3267 <FnDataIterator>
3268@@ -20,16 +20,16 @@
3269 <WhereClause>
3270 <FnBooleanIterator>
3271 <FnEmptyIterator>
3272- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3273- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill allowed="0">
3274- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill allowed="0">
3275- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill allowed="0">
3276- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">
3277- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">
3278- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill allowed="0">
3279- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill allowed="0">
3280- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">
3281- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">
3282+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3283+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,keyword)" typename="*" nill-allowed="0">
3284+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,emph)" typename="*" nill-allowed="0">
3285+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,text)" typename="*" nill-allowed="0">
3286+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
3287+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
3288+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,listitem)" typename="*" nill-allowed="0">
3289+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,parlist)" typename="*" nill-allowed="0">
3290+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
3291+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
3292 <ForVarIterator varname="a"/>
3293 </ChildAxisIterator>
3294 </ChildAxisIterator>
3295@@ -50,8 +50,8 @@
3296 <AttributeIterator qname="xs:QName(,,id)">
3297 <EnclosedIterator attr_cont="true">
3298 <FnDataIterator>
3299- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3300- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,seller)" typename="*" nill allowed="0">
3301+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3302+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,seller)" typename="*" nill-allowed="0">
3303 <ForVarIterator varname="a"/>
3304 </ChildAxisIterator>
3305 </AttributeAxisIterator>
3306
3307=== modified file 'test/iterplans/zorba/no-copy/q17.iter'
3308--- test/iterplans/zorba/no-copy/q17.iter 2014-02-24 20:08:54 +0000
3309+++ test/iterplans/zorba/no-copy/q17.iter 2014-02-25 00:37:05 +0000
3310@@ -3,9 +3,9 @@
3311 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3312 <FLWORIterator>
3313 <ForVariable name="p">
3314- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3315- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3316- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3317+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3318+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3319+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3320 <FnDocIterator>
3321 <PromoteIterator type="xs:string">
3322 <FnDataIterator>
3323@@ -19,8 +19,8 @@
3324 </ForVariable>
3325 <WhereClause>
3326 <FnEmptyIterator>
3327- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3328- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill allowed="0">
3329+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3330+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,homepage)" typename="*" nill-allowed="0">
3331 <ForVarIterator varname="p"/>
3332 </ChildAxisIterator>
3333 </ChildAxisIterator>
3334@@ -32,8 +32,8 @@
3335 <AttributeIterator qname="xs:QName(,,name)">
3336 <EnclosedIterator attr_cont="true">
3337 <FnDataIterator>
3338- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3339- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3340+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3341+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3342 <ForVarIterator varname="p"/>
3343 </ChildAxisIterator>
3344 </ChildAxisIterator>
3345
3346=== modified file 'test/iterplans/zorba/no-copy/q18.iter'
3347--- test/iterplans/zorba/no-copy/q18.iter 2014-02-24 20:08:54 +0000
3348+++ test/iterplans/zorba/no-copy/q18.iter 2014-02-25 00:37:05 +0000
3349@@ -3,9 +3,9 @@
3350 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3351 <FLWORIterator>
3352 <ForVariable name="i">
3353- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3354- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3355- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3356+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3357+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3358+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3359 <FnDocIterator>
3360 <PromoteIterator type="xs:string">
3361 <FnDataIterator>
3362@@ -24,7 +24,7 @@
3363 <PromoteIterator type="xs:decimal">
3364 <FnDataIterator>
3365 <FnZeroOrOneIterator>
3366- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill allowed="0">
3367+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill-allowed="0">
3368 <ForVarIterator varname="i"/>
3369 </ChildAxisIterator>
3370 </FnZeroOrOneIterator>
3371
3372=== modified file 'test/iterplans/zorba/no-copy/q19.iter'
3373--- test/iterplans/zorba/no-copy/q19.iter 2014-02-24 20:08:54 +0000
3374+++ test/iterplans/zorba/no-copy/q19.iter 2014-02-25 00:37:05 +0000
3375@@ -3,9 +3,9 @@
3376 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3377 <FLWORIterator>
3378 <ForVariable name="b">
3379- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3380- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">
3381- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3382+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3383+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
3384+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3385 <FnDocIterator>
3386 <PromoteIterator type="xs:string">
3387 <FnDataIterator>
3388@@ -20,7 +20,7 @@
3389 <OrderBySpec>
3390 <FnDataIterator>
3391 <FnZeroOrOneIterator>
3392- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">
3393+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
3394 <ForVarIterator varname="b"/>
3395 </ChildAxisIterator>
3396 </FnZeroOrOneIterator>
3397@@ -32,8 +32,8 @@
3398 <AttributeIterator qname="xs:QName(,,name)">
3399 <EnclosedIterator attr_cont="true">
3400 <FnDataIterator>
3401- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3402- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3403+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3404+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3405 <ForVarIterator varname="b"/>
3406 </ChildAxisIterator>
3407 </ChildAxisIterator>
3408@@ -41,8 +41,8 @@
3409 </EnclosedIterator>
3410 </AttributeIterator>
3411 <EnclosedIterator attr_cont="false">
3412- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3413- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">
3414+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3415+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
3416 <ForVarIterator varname="b"/>
3417 </ChildAxisIterator>
3418 </ChildAxisIterator>
3419
3420=== modified file 'test/iterplans/zorba/no-copy/q2.iter'
3421--- test/iterplans/zorba/no-copy/q2.iter 2014-02-24 20:08:54 +0000
3422+++ test/iterplans/zorba/no-copy/q2.iter 2014-02-25 00:37:05 +0000
3423@@ -3,9 +3,9 @@
3424 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3425 <FLWORIterator>
3426 <ForVariable name="b">
3427- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3428- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3429- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3430+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3431+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3432+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3433 <FnDocIterator>
3434 <PromoteIterator type="xs:string">
3435 <FnDataIterator>
3436@@ -21,9 +21,9 @@
3437 <ElementIterator copyInputNodes="false">
3438 <SingletonIterator value="xs:QName(,,increase)"/>
3439 <EnclosedIterator attr_cont="false">
3440- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3441- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">
3442- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">
3443+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3444+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
3445+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
3446 <ForVarIterator varname="b"/>
3447 </ChildAxisIterator>
3448 </ChildAxisIterator>
3449
3450=== modified file 'test/iterplans/zorba/no-copy/q20.iter'
3451--- test/iterplans/zorba/no-copy/q20.iter 2014-02-24 20:08:54 +0000
3452+++ test/iterplans/zorba/no-copy/q20.iter 2014-02-25 00:37:05 +0000
3453@@ -42,23 +42,23 @@
3454 <FnCountIterator>
3455 <FLWORIterator>
3456 <ForVariable name="$$context-item">
3457- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3458- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3459- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3460+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3461+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3462+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3463 <LetVarIterator varname="auction"/>
3464 </ChildAxisIterator>
3465 </ChildAxisIterator>
3466 </ChildAxisIterator>
3467 </ForVariable>
3468 <ForVariable name="$$context-item">
3469- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3470+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3471 <ForVarIterator varname="$$context-item"/>
3472 </ChildAxisIterator>
3473 </ForVariable>
3474 <WhereClause>
3475 <CompareIterator>
3476 <FnDataIterator>
3477- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3478+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3479 <ForVarIterator varname="$$context-item"/>
3480 </AttributeAxisIterator>
3481 </FnDataIterator>
3482@@ -78,16 +78,16 @@
3483 <FnCountIterator>
3484 <FLWORIterator>
3485 <ForVariable name="$$context-item">
3486- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3487- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3488- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3489+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3490+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3491+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3492 <LetVarIterator varname="auction"/>
3493 </ChildAxisIterator>
3494 </ChildAxisIterator>
3495 </ChildAxisIterator>
3496 </ForVariable>
3497 <ForVariable name="$$context-item">
3498- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3499+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3500 <ForVarIterator varname="$$context-item"/>
3501 </ChildAxisIterator>
3502 </ForVariable>
3503@@ -95,7 +95,7 @@
3504 <AndIterator>
3505 <CompareIterator>
3506 <FnDataIterator>
3507- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3508+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3509 <ForVarIterator varname="$$context-item"/>
3510 </AttributeAxisIterator>
3511 </FnDataIterator>
3512@@ -103,7 +103,7 @@
3513 </CompareIterator>
3514 <CompareIterator>
3515 <FnDataIterator>
3516- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3517+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3518 <ForVarIterator varname="$$context-item"/>
3519 </AttributeAxisIterator>
3520 </FnDataIterator>
3521@@ -124,23 +124,23 @@
3522 <FnCountIterator>
3523 <FLWORIterator>
3524 <ForVariable name="$$context-item">
3525- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3526- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3527- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3528+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3529+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3530+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3531 <LetVarIterator varname="auction"/>
3532 </ChildAxisIterator>
3533 </ChildAxisIterator>
3534 </ChildAxisIterator>
3535 </ForVariable>
3536 <ForVariable name="$$context-item">
3537- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3538+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3539 <ForVarIterator varname="$$context-item"/>
3540 </ChildAxisIterator>
3541 </ForVariable>
3542 <WhereClause>
3543 <CompareIterator>
3544 <FnDataIterator>
3545- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3546+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3547 <ForVarIterator varname="$$context-item"/>
3548 </AttributeAxisIterator>
3549 </FnDataIterator>
3550@@ -160,9 +160,9 @@
3551 <FnCountIterator>
3552 <FLWORIterator>
3553 <ForVariable name="p">
3554- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3555- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3556- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3557+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3558+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3559+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3560 <LetVarIterator varname="auction"/>
3561 </ChildAxisIterator>
3562 </ChildAxisIterator>
3563@@ -170,8 +170,8 @@
3564 </ForVariable>
3565 <WhereClause>
3566 <FnEmptyIterator>
3567- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
3568- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
3569+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill-allowed="0">
3570+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill-allowed="0">
3571 <ForVarIterator varname="p"/>
3572 </ChildAxisIterator>
3573 </AttributeAxisIterator>
3574
3575=== modified file 'test/iterplans/zorba/no-copy/q3.iter'
3576--- test/iterplans/zorba/no-copy/q3.iter 2014-02-24 20:08:54 +0000
3577+++ test/iterplans/zorba/no-copy/q3.iter 2014-02-25 00:37:05 +0000
3578@@ -8,9 +8,9 @@
3579 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3580 <FLWORIterator>
3581 <ForVariable name="b">
3582- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3583- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3584- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3585+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3586+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3587+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3588 <FnDocIterator>
3589 <PromoteIterator type="xs:string">
3590 <FnDataIterator>
3591@@ -28,9 +28,9 @@
3592 <PromoteIterator type="xs:double">
3593 <FnDataIterator>
3594 <FnZeroOrOneIterator>
3595- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3596- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">
3597- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">
3598+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3599+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
3600+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
3601 <ForVarIterator varname="b"/>
3602 </ChildAxisIterator>
3603 </ChildAxisIterator>
3604@@ -41,11 +41,11 @@
3605 <SingletonIterator value="xs:double(2)"/>
3606 </SpecificNumArithIterator_MultiplyOperation_DOUBLE>
3607 <FnDataIterator>
3608- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3609- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">
3610+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3611+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
3612 <FLWORIterator>
3613 <LetVariable name="$$temp4" materialize="true">
3614- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
3615+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
3616 <ForVarIterator varname="b"/>
3617 </ChildAxisIterator>
3618 </LetVariable>
3619@@ -69,9 +69,9 @@
3620 <AttributeIterator qname="xs:QName(,,first)">
3621 <EnclosedIterator attr_cont="true">
3622 <FnDataIterator>
3623- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3624- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">
3625- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0" target_position="0">
3626+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3627+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
3628+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0" target_position="0">
3629 <ForVarIterator varname="b"/>
3630 </ChildAxisIterator>
3631 </ChildAxisIterator>
3632@@ -82,11 +82,11 @@
3633 <AttributeIterator qname="xs:QName(,,last)">
3634 <EnclosedIterator attr_cont="true">
3635 <FnDataIterator>
3636- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3637- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill allowed="0">
3638+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3639+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,increase)" typename="*" nill-allowed="0">
3640 <FLWORIterator>
3641 <LetVariable name="$$temp8" materialize="true">
3642- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
3643+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
3644 <ForVarIterator varname="b"/>
3645 </ChildAxisIterator>
3646 </LetVariable>
3647
3648=== modified file 'test/iterplans/zorba/no-copy/q4.iter'
3649--- test/iterplans/zorba/no-copy/q4.iter 2014-02-24 20:08:54 +0000
3650+++ test/iterplans/zorba/no-copy/q4.iter 2014-02-25 00:37:05 +0000
3651@@ -17,9 +17,9 @@
3652 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3653 <FLWORIterator>
3654 <ForVariable name="b">
3655- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
3656- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill allowed="0">
3657- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3658+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill-allowed="0">
3659+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,open_auctions)" typename="*" nill-allowed="0">
3660+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3661 <FnDocIterator>
3662 <PromoteIterator type="xs:string">
3663 <FnDataIterator>
3664@@ -33,7 +33,7 @@
3665 </ForVariable>
3666 <LetVariable name="$$opt_temp_0" materialize="true">
3667 <HoistIterator>
3668- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
3669+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
3670 <ForVarIterator varname="b"/>
3671 </ChildAxisIterator>
3672 </HoistIterator>
3673@@ -53,17 +53,17 @@
3674 <ForIterator>
3675 <ForVariable name="$$context-item"/>
3676 <TupleSourceIterator/>
3677- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
3678+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill-allowed="0">
3679 <ForVarIterator varname="b"/>
3680 </ChildAxisIterator>
3681 </ForIterator>
3682- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
3683+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill-allowed="0">
3684 <ForVarIterator varname="$$context-item"/>
3685 </ChildAxisIterator>
3686 </ForIterator>
3687 <CompareIterator>
3688 <FnDataIterator>
3689- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3690+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3691 <ForVarIterator varname="$$context-item"/>
3692 </AttributeAxisIterator>
3693 </FnDataIterator>
3694@@ -74,13 +74,13 @@
3695 <LetVarIterator varname="$$opt_temp_0"/>
3696 </UnhoistIterator>
3697 </ForIterator>
3698- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
3699+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill-allowed="0">
3700 <ForVarIterator varname="$$context-item"/>
3701 </ChildAxisIterator>
3702 </ForIterator>
3703 <CompareIterator>
3704 <FnDataIterator>
3705- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3706+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3707 <ForVarIterator varname="$$context-item"/>
3708 </AttributeAxisIterator>
3709 </FnDataIterator>
3710@@ -102,8 +102,8 @@
3711 <ElementIterator copyInputNodes="false">
3712 <SingletonIterator value="xs:QName(,,history)"/>
3713 <EnclosedIterator attr_cont="false">
3714- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3715- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill allowed="0">
3716+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3717+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,reserve)" typename="*" nill-allowed="0">
3718 <ForVarIterator varname="b"/>
3719 </ChildAxisIterator>
3720 </ChildAxisIterator>
3721
3722=== modified file 'test/iterplans/zorba/no-copy/q5.iter'
3723--- test/iterplans/zorba/no-copy/q5.iter 2014-02-24 20:08:54 +0000
3724+++ test/iterplans/zorba/no-copy/q5.iter 2014-02-25 00:37:05 +0000
3725@@ -4,9 +4,9 @@
3726 <FnCountIterator>
3727 <FLWORIterator>
3728 <ForVariable name="i">
3729- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
3730- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
3731- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3732+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
3733+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
3734+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3735 <FnDocIterator>
3736 <PromoteIterator type="xs:string">
3737 <FnDataIterator>
3738@@ -21,8 +21,8 @@
3739 <WhereClause>
3740 <CompareIterator>
3741 <FnDataIterator>
3742- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3743- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">
3744+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3745+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
3746 <ForVarIterator varname="i"/>
3747 </ChildAxisIterator>
3748 </ChildAxisIterator>
3749@@ -31,7 +31,7 @@
3750 </CompareIterator>
3751 </WhereClause>
3752 <ReturnClause>
3753- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">
3754+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
3755 <ForVarIterator varname="i"/>
3756 </ChildAxisIterator>
3757 </ReturnClause>
3758
3759=== modified file 'test/iterplans/zorba/no-copy/q6.iter'
3760--- test/iterplans/zorba/no-copy/q6.iter 2014-02-24 20:08:54 +0000
3761+++ test/iterplans/zorba/no-copy/q6.iter 2014-02-25 00:37:05 +0000
3762@@ -4,8 +4,8 @@
3763 <FLWORIterator>
3764 <ForVariable name="b">
3765 <NodeSortIterator distinct="false" ascending="true">
3766- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">
3767- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3768+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
3769+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3770 <FnDocIterator>
3771 <PromoteIterator type="xs:string">
3772 <FnDataIterator>
3773@@ -19,7 +19,7 @@
3774 </ForVariable>
3775 <ReturnClause>
3776 <FnCountIterator>
3777- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3778+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3779 <ForVarIterator varname="b"/>
3780 </DescendantAxisIterator>
3781 </FnCountIterator>
3782
3783=== modified file 'test/iterplans/zorba/no-copy/q7.iter'
3784--- test/iterplans/zorba/no-copy/q7.iter 2014-02-24 20:08:54 +0000
3785+++ test/iterplans/zorba/no-copy/q7.iter 2014-02-25 00:37:05 +0000
3786@@ -3,7 +3,7 @@
3787 <CtxVarDeclareIterator varid="4" varname="input-context"/>
3788 <FLWORIterator>
3789 <ForVariable name="p">
3790- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3791+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3792 <FnDocIterator>
3793 <PromoteIterator type="xs:string">
3794 <FnDataIterator>
3795@@ -17,18 +17,18 @@
3796 <SpecificNumArithIterator_AddOperation_INTEGER>
3797 <SpecificNumArithIterator_AddOperation_INTEGER>
3798 <FnCountIterator>
3799- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill allowed="0">
3800+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,description)" typename="*" nill-allowed="0">
3801 <ForVarIterator varname="p"/>
3802 </DescendantAxisIterator>
3803 </FnCountIterator>
3804 <FnCountIterator>
3805- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill allowed="0">
3806+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,annotation)" typename="*" nill-allowed="0">
3807 <ForVarIterator varname="p"/>
3808 </DescendantAxisIterator>
3809 </FnCountIterator>
3810 </SpecificNumArithIterator_AddOperation_INTEGER>
3811 <FnCountIterator>
3812- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill allowed="0">
3813+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,emailaddress)" typename="*" nill-allowed="0">
3814 <ForVarIterator varname="p"/>
3815 </DescendantAxisIterator>
3816 </FnCountIterator>
3817
3818=== modified file 'test/iterplans/zorba/no-copy/q8.iter'
3819--- test/iterplans/zorba/no-copy/q8.iter 2014-02-24 20:08:54 +0000
3820+++ test/iterplans/zorba/no-copy/q8.iter 2014-02-25 00:37:05 +0000
3821@@ -13,9 +13,9 @@
3822 </LetVariable>
3823 <LetVariable name="$$opt_temp_0" materialize="true">
3824 <HoistIterator>
3825- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
3826- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
3827- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3828+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
3829+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
3830+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3831 <LetVarIterator varname="auction"/>
3832 </ChildAxisIterator>
3833 </ChildAxisIterator>
3834@@ -34,8 +34,8 @@
3835 <GeneralIndexEntryBuilderIterator>
3836 <ForVarIterator varname="$$opt_temp_2"/>
3837 <FnDataIterator>
3838- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3839- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
3840+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3841+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
3842 <ForVarIterator varname="$$opt_temp_2"/>
3843 </ChildAxisIterator>
3844 </AttributeAxisIterator>
3845@@ -46,9 +46,9 @@
3846 </CreateInternalIndexIterator>
3847 </LetVariable>
3848 <ForVariable name="p">
3849- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3850- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3851- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3852+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3853+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3854+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3855 <LetVarIterator varname="auction"/>
3856 </ChildAxisIterator>
3857 </ChildAxisIterator>
3858@@ -57,7 +57,7 @@
3859 <LetVariable name="$$opt_temp_1" materialize="true">
3860 <HoistIterator>
3861 <FnDataIterator>
3862- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
3863+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
3864 <ForVarIterator varname="p"/>
3865 </AttributeAxisIterator>
3866 </FnDataIterator>
3867@@ -69,8 +69,8 @@
3868 <AttributeIterator qname="xs:QName(,,person)">
3869 <EnclosedIterator attr_cont="true">
3870 <FnDataIterator>
3871- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3872- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3873+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3874+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3875 <ForVarIterator varname="p"/>
3876 </ChildAxisIterator>
3877 </ChildAxisIterator>
3878
3879=== modified file 'test/iterplans/zorba/no-copy/q9.iter'
3880--- test/iterplans/zorba/no-copy/q9.iter 2014-02-24 20:08:54 +0000
3881+++ test/iterplans/zorba/no-copy/q9.iter 2014-02-25 00:37:05 +0000
3882@@ -12,9 +12,9 @@
3883 </FnDocIterator>
3884 </LetVariable>
3885 <LetVariable name="ca" materialize="true">
3886- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
3887- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill allowed="0">
3888- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3889+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill-allowed="0">
3890+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,closed_auctions)" typename="*" nill-allowed="0">
3891+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3892 <LetVarIterator varname="auction"/>
3893 </ChildAxisIterator>
3894 </ChildAxisIterator>
3895@@ -30,8 +30,8 @@
3896 <GeneralIndexEntryBuilderIterator>
3897 <ForVarIterator varname="$$opt_temp_2"/>
3898 <FnDataIterator>
3899- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3900- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill allowed="0">
3901+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3902+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,buyer)" typename="*" nill-allowed="0">
3903 <ForVarIterator varname="$$opt_temp_2"/>
3904 </ChildAxisIterator>
3905 </AttributeAxisIterator>
3906@@ -42,10 +42,10 @@
3907 </CreateInternalIndexIterator>
3908 </LetVariable>
3909 <LetVariable name="ei" materialize="true">
3910- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3911- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,europe)" typename="*" nill allowed="0">
3912- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">
3913- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3914+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3915+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,europe)" typename="*" nill-allowed="0">
3916+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
3917+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3918 <LetVarIterator varname="auction"/>
3919 </ChildAxisIterator>
3920 </ChildAxisIterator>
3921@@ -62,7 +62,7 @@
3922 <GeneralIndexEntryBuilderIterator>
3923 <ForVarIterator varname="$$opt_temp_5"/>
3924 <FnDataIterator>
3925- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
3926+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
3927 <ForVarIterator varname="$$opt_temp_5"/>
3928 </AttributeAxisIterator>
3929 </FnDataIterator>
3930@@ -72,9 +72,9 @@
3931 </CreateInternalIndexIterator>
3932 </LetVariable>
3933 <ForVariable name="p">
3934- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
3935- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
3936- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
3937+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill-allowed="0">
3938+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill-allowed="0">
3939+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
3940 <LetVarIterator varname="auction"/>
3941 </ChildAxisIterator>
3942 </ChildAxisIterator>
3943@@ -83,7 +83,7 @@
3944 <LetVariable name="$$opt_temp_0" materialize="true">
3945 <HoistIterator>
3946 <FnDataIterator>
3947- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
3948+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
3949 <ForVarIterator varname="p"/>
3950 </AttributeAxisIterator>
3951 </FnDataIterator>
3952@@ -95,8 +95,8 @@
3953 <AttributeIterator qname="xs:QName(,,name)">
3954 <EnclosedIterator attr_cont="true">
3955 <FnDataIterator>
3956- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3957- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3958+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3959+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3960 <ForVarIterator varname="p"/>
3961 </ChildAxisIterator>
3962 </ChildAxisIterator>
3963@@ -118,8 +118,8 @@
3964 <LetVariable name="$$opt_temp_1" materialize="true">
3965 <HoistIterator>
3966 <FnDataIterator>
3967- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
3968- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,itemref)" typename="*" nill allowed="0">
3969+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
3970+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,itemref)" typename="*" nill-allowed="0">
3971 <ForVarIterator varname="t"/>
3972 </ChildAxisIterator>
3973 </AttributeAxisIterator>
3974@@ -130,8 +130,8 @@
3975 <ElementIterator copyInputNodes="false">
3976 <SingletonIterator value="xs:QName(,,item)"/>
3977 <EnclosedIterator attr_cont="false">
3978- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
3979- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
3980+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
3981+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
3982 <FLWORIterator>
3983 <ForVariable name="t2">
3984 <NodeSortIterator distinct="true" ascending="true">
3985
3986=== modified file 'test/iterplans/zorba/no-copy/ser_03.iter'
3987--- test/iterplans/zorba/no-copy/ser_03.iter 2014-02-24 20:08:54 +0000
3988+++ test/iterplans/zorba/no-copy/ser_03.iter 2014-02-25 00:37:05 +0000
3989@@ -18,12 +18,12 @@
3990 </ElementIterator>
3991 </CtxVarDeclareIterator>
3992 <FnCountIterator>
3993- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
3994+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
3995 <ElementIterator copyInputNodes="false">
3996 <SingletonIterator value="xs:QName(,,doc2)"/>
3997 <FnConcatIterator/>
3998 <EnclosedIterator attr_cont="false">
3999- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4000+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4001 <CtxVarIterator varid="4" varname="doc1" varkind="global"/>
4002 </ChildAxisIterator>
4003 </EnclosedIterator>
4004
4005=== modified file 'test/iterplans/zorba/no-copy/test5.iter'
4006--- test/iterplans/zorba/no-copy/test5.iter 2014-02-24 20:08:54 +0000
4007+++ test/iterplans/zorba/no-copy/test5.iter 2014-02-25 00:37:05 +0000
4008@@ -21,11 +21,11 @@
4009 </CtxVarDeclareIterator>
4010 <FLWORIterator>
4011 <LetVariable name="copyname" materialize="true">
4012- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill allowed="0">
4013+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill-allowed="0">
4014 <ElementIterator>
4015 <SingletonIterator value="xs:QName(,,root)"/>
4016 <EnclosedIterator attr_cont="false">
4017- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill allowed="0">
4018+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,name)" typename="*" nill-allowed="0">
4019 <ValidateIterator>
4020 <CtxVarIterator varid="4" varname="doc" varkind="global"/>
4021 </ValidateIterator>
4022
4023=== modified file 'test/iterplans/zorba/no-copy/test6.iter'
4024--- test/iterplans/zorba/no-copy/test6.iter 2014-02-24 20:08:54 +0000
4025+++ test/iterplans/zorba/no-copy/test6.iter 2014-02-25 00:37:05 +0000
4026@@ -21,7 +21,7 @@
4027 </CtxVarDeclareIterator>
4028 <FnConcatIterator>
4029 <FnDataIterator>
4030- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,person)" typename="*" nill allowed="0">
4031+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(http://www.zorba-xquery.org/simple,s,person)" typename="*" nill-allowed="0">
4032 <ElementIterator>
4033 <SingletonIterator value="xs:QName(,,root)"/>
4034 <EnclosedIterator attr_cont="false">
4035
4036=== modified file 'test/iterplans/zorba/no-copy/udfs1.iter'
4037--- test/iterplans/zorba/no-copy/udfs1.iter 2014-02-24 20:08:54 +0000
4038+++ test/iterplans/zorba/no-copy/udfs1.iter 2014-02-25 00:37:05 +0000
4039@@ -45,7 +45,7 @@
4040 <TreatIterator quant="">
4041 <FLWORIterator>
4042 <ForVariable name="child">
4043- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4044+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4045 <LetVarIterator varname="n"/>
4046 </ChildAxisIterator>
4047 </ForVariable>
4048@@ -63,7 +63,7 @@
4049 <ApplyIterator>
4050 <SingletonIterator value="xs:integer(2)"/>
4051 </ApplyIterator>
4052- <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
4053+ <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
4054 <LetVarIterator varname="n"/>
4055 </ParentAxisIterator>
4056 </SequentialIterator>
4057
4058=== modified file 'test/iterplans/zorba/optim/doc_order_01.iter'
4059--- test/iterplans/zorba/optim/doc_order_01.iter 2014-02-24 20:08:54 +0000
4060+++ test/iterplans/zorba/optim/doc_order_01.iter 2014-02-25 00:37:05 +0000
4061@@ -2,9 +2,9 @@
4062 <FLWORIterator>
4063 <ForVariable name="b">
4064 <NodeDistinctIterator allow-atomics="false" check-only="false">
4065- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
4066- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill allowed="0">
4067- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
4068+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill-allowed="0">
4069+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,regions)" typename="*" nill-allowed="0">
4070+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill-allowed="0">
4071 <FnDocIterator>
4072 <SingletonIterator value="xs:string(../xmark/auction.xml)"/>
4073 </FnDocIterator>
4074@@ -16,7 +16,7 @@
4075 <OrderBySpec>
4076 <FnDataIterator>
4077 <FnZeroOrOneIterator>
4078- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">
4079+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
4080 <ForVarIterator varname="b"/>
4081 </ChildAxisIterator>
4082 </FnZeroOrOneIterator>
4083@@ -28,8 +28,8 @@
4084 <AttributeIterator qname="xs:QName(,,name)">
4085 <EnclosedIterator attr_cont="true">
4086 <FnDataIterator>
4087- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
4088- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
4089+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
4090+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
4091 <ForVarIterator varname="b"/>
4092 </ChildAxisIterator>
4093 </ChildAxisIterator>
4094@@ -37,8 +37,8 @@
4095 </EnclosedIterator>
4096 </AttributeIterator>
4097 <EnclosedIterator attr_cont="false">
4098- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
4099- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill allowed="0">
4100+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
4101+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,location)" typename="*" nill-allowed="0">
4102 <ForVarIterator varname="b"/>
4103 </ChildAxisIterator>
4104 </ChildAxisIterator>
4105
4106=== modified file 'test/iterplans/zorba/optim/hoist_trycatch_01.iter'
4107--- test/iterplans/zorba/optim/hoist_trycatch_01.iter 2014-02-24 20:08:54 +0000
4108+++ test/iterplans/zorba/optim/hoist_trycatch_01.iter 2014-02-25 00:37:05 +0000
4109@@ -136,7 +136,7 @@
4110 <FLWORIterator>
4111 <LetVariable name="$$opt_temp_0" materialize="true">
4112 <HoistIterator>
4113- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">
4114+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
4115 <CtxVarIterator varid="6" varname="locations" varkind="global"/>
4116 </ChildAxisIterator>
4117 </HoistIterator>
4118@@ -157,7 +157,7 @@
4119 </GenericArithIterator_MultiplyOperation>
4120 <FLWORIterator>
4121 <ForVariable name="s">
4122- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">
4123+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
4124 <CtxVarIterator varid="5" varname="sales" varkind="global"/>
4125 </ChildAxisIterator>
4126 </ForVariable>
4127@@ -165,7 +165,7 @@
4128 <HoistIterator>
4129 <PromoteIterator type="xs:anyAtomicType">
4130 <FnDataIterator>
4131- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">
4132+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
4133 <ForVarIterator varname="s"/>
4134 </AttributeAxisIterator>
4135 </FnDataIterator>
4136@@ -185,7 +185,7 @@
4137 </UnhoistIterator>
4138 <PromoteIterator type="xs:anyAtomicType">
4139 <FnDataIterator>
4140- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
4141+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
4142 <ForVarIterator varname="l"/>
4143 </AttributeAxisIterator>
4144 </FnDataIterator>
4145@@ -197,7 +197,7 @@
4146 <ElementIterator>
4147 <SingletonIterator value="xs:QName(,,sale)"/>
4148 <EnclosedIterator attr_cont="false">
4149- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">
4150+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
4151 <ForVarIterator varname="l"/>
4152 </AttributeAxisIterator>
4153 </EnclosedIterator>
4154
4155=== modified file 'test/iterplans/zorba/optim/hoist_window_01.iter'
4156--- test/iterplans/zorba/optim/hoist_window_01.iter 2014-02-24 20:08:54 +0000
4157+++ test/iterplans/zorba/optim/hoist_window_01.iter 2014-02-25 00:37:05 +0000
4158@@ -142,7 +142,7 @@
4159 <TupleStreamIterator>
4160 <WindowIterator>
4161 <WindowVariable name="yearly-sales">
4162- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill allowed="0">
4163+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,sale)" typename="*" nill-allowed="0">
4164 <CtxVarIterator varid="4" varname="sales" varkind="global"/>
4165 </ChildAxisIterator>
4166 </WindowVariable>
4167@@ -154,7 +154,7 @@
4168 <SubstringIntOptIterator>
4169 <PromoteIterator type="xs:string">
4170 <FnDataIterator>
4171- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">
4172+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
4173 <ForVarIterator varname="s"/>
4174 </AttributeAxisIterator>
4175 </FnDataIterator>
4176@@ -165,7 +165,7 @@
4177 <SubstringIntOptIterator>
4178 <PromoteIterator type="xs:string">
4179 <FnDataIterator>
4180- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">
4181+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
4182 <ForVarIterator varname="p"/>
4183 </AttributeAxisIterator>
4184 </FnDataIterator>
4185@@ -179,7 +179,7 @@
4186 <HoistIterator>
4187 <PromoteIterator type="xs:anyAtomicType">
4188 <FnDataIterator>
4189- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill allowed="0">
4190+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,locid)" typename="*" nill-allowed="0">
4191 <ForVarIterator varname="s"/>
4192 </AttributeAxisIterator>
4193 </FnDataIterator>
4194@@ -196,7 +196,7 @@
4195 <CompareIterator>
4196 <PromoteIterator type="xs:anyAtomicType">
4197 <FnDataIterator>
4198- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
4199+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill-allowed="0">
4200 <ForVarIterator varname="$$context-item"/>
4201 </AttributeAxisIterator>
4202 </FnDataIterator>
4203@@ -208,7 +208,7 @@
4204 <CompareIterator>
4205 <PromoteIterator type="xs:anyAtomicType">
4206 <FnDataIterator>
4207- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill allowed="0">
4208+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,city)" typename="*" nill-allowed="0">
4209 <ForVarIterator varname="$$context-item"/>
4210 </AttributeAxisIterator>
4211 </FnDataIterator>
4212@@ -227,7 +227,7 @@
4213 <SubstringIntOptIterator>
4214 <PromoteIterator type="xs:string">
4215 <FnDataIterator>
4216- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">
4217+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
4218 <ForVarIterator varname="s"/>
4219 </AttributeAxisIterator>
4220 </FnDataIterator>
4221@@ -238,7 +238,7 @@
4222 <SubstringIntOptIterator>
4223 <PromoteIterator type="xs:string">
4224 <FnDataIterator>
4225- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">
4226+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
4227 <ForVarIterator varname="n"/>
4228 </AttributeAxisIterator>
4229 </FnDataIterator>
4230@@ -251,7 +251,7 @@
4231 <LetVariable name="$$opt_temp_0" materialize="true"/>
4232 <TupleSourceIterator/>
4233 <HoistIterator>
4234- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill allowed="0">
4235+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,loc)" typename="*" nill-allowed="0">
4236 <CtxVarIterator varid="5" varname="locations" varkind="global"/>
4237 </ChildAxisIterator>
4238 </HoistIterator>
4239@@ -265,7 +265,7 @@
4240 <SubstringIntOptIterator>
4241 <PromoteIterator type="xs:string">
4242 <FnDataIterator>
4243- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill allowed="0">
4244+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,date)" typename="*" nill-allowed="0">
4245 <ForVarIterator varname="s"/>
4246 </AttributeAxisIterator>
4247 </FnDataIterator>
4248@@ -280,7 +280,7 @@
4249 <FnSumIterator>
4250 <FnDataIterator>
4251 <NodeDistinctIterator allow-atomics="false" check-only="false">
4252- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill allowed="0">
4253+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,qty)" typename="*" nill-allowed="0">
4254 <LetVarIterator varname="yearly-sales"/>
4255 </AttributeAxisIterator>
4256 </NodeDistinctIterator>
4257
4258=== modified file 'test/iterplans/zorba/optim/pos_pred11.iter'
4259--- test/iterplans/zorba/optim/pos_pred11.iter 2014-02-24 20:08:54 +0000
4260+++ test/iterplans/zorba/optim/pos_pred11.iter 2014-02-25 00:37:05 +0000
4261@@ -25,7 +25,7 @@
4262 <FLWORIterator>
4263 <ForVariable name="$$context-item">
4264 <NodeSortIterator distinct="true" ascending="true">
4265- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4266+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4267 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4268 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4269 </TreatIterator>
4270
4271=== modified file 'test/iterplans/zorba/optim/pos_pred12.iter'
4272--- test/iterplans/zorba/optim/pos_pred12.iter 2014-02-24 20:08:54 +0000
4273+++ test/iterplans/zorba/optim/pos_pred12.iter 2014-02-25 00:37:05 +0000
4274@@ -118,7 +118,7 @@
4275 <FnConcatIterator>
4276 <SubsequenceIntIterator>
4277 <NodeSortIterator distinct="true" ascending="true">
4278- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4279+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4280 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4281 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4282 </TreatIterator>
4283@@ -131,7 +131,7 @@
4284 )"/>
4285 <SubsequenceIntIterator>
4286 <NodeSortIterator distinct="true" ascending="true">
4287- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4288+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4289 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4290 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4291 </TreatIterator>
4292@@ -144,7 +144,7 @@
4293 )"/>
4294 <SubsequenceIntIterator>
4295 <NodeSortIterator distinct="true" ascending="true">
4296- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4297+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4298 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4299 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4300 </TreatIterator>
4301@@ -157,7 +157,7 @@
4302 )"/>
4303 <SubsequenceIntIterator>
4304 <NodeSortIterator distinct="true" ascending="true">
4305- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4306+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4307 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4308 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4309 </TreatIterator>
4310@@ -170,7 +170,7 @@
4311 )"/>
4312 <SubsequenceIntIterator>
4313 <NodeSortIterator distinct="true" ascending="true">
4314- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4315+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4316 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4317 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4318 </TreatIterator>
4319@@ -183,7 +183,7 @@
4320 )"/>
4321 <SubsequenceIntIterator>
4322 <NodeSortIterator distinct="true" ascending="true">
4323- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4324+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4325 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4326 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4327 </TreatIterator>
4328@@ -195,7 +195,7 @@
4329 )"/>
4330 <SubsequenceIntIterator>
4331 <NodeSortIterator distinct="true" ascending="true">
4332- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4333+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4334 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4335 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4336 </TreatIterator>
4337
4338=== modified file 'test/iterplans/zorba/optim/pos_pred13.iter'
4339--- test/iterplans/zorba/optim/pos_pred13.iter 2014-02-24 20:08:54 +0000
4340+++ test/iterplans/zorba/optim/pos_pred13.iter 2014-02-25 00:37:05 +0000
4341@@ -54,7 +54,7 @@
4342 <ForVariable name="$$context-item">
4343 <SubsequenceIntIterator>
4344 <NodeSortIterator distinct="true" ascending="true">
4345- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4346+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4347 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4348 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4349 </TreatIterator>
4350@@ -68,7 +68,7 @@
4351 <CompareIterator>
4352 <PromoteIterator type="xs:anyAtomicType">
4353 <FnDataIterator>
4354- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,i)" typename="*" nill allowed="0">
4355+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,i)" typename="*" nill-allowed="0">
4356 <ForVarIterator varname="$$context-item"/>
4357 </AttributeAxisIterator>
4358 </FnDataIterator>
4359
4360=== modified file 'test/iterplans/zorba/optim/pos_pred2.iter'
4361--- test/iterplans/zorba/optim/pos_pred2.iter 2014-02-24 20:08:54 +0000
4362+++ test/iterplans/zorba/optim/pos_pred2.iter 2014-02-25 00:37:05 +0000
4363@@ -14,7 +14,7 @@
4364 <OuterForIterator varname="x">
4365 <TupleSourceIterator/>
4366 <NodeSortIterator distinct="true" ascending="true">
4367- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">
4368+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
4369 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4370 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4371 </TreatIterator>
4372@@ -41,7 +41,7 @@
4373 <TupleSourceIterator/>
4374 <SubsequenceIntIterator>
4375 <NodeSortIterator distinct="true" ascending="true">
4376- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">
4377+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill-allowed="0">
4378 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4379 <CtxVarIterator varid="4" varname="doc" varkind="local"/>
4380 </TreatIterator>
4381
4382=== modified file 'test/iterplans/zorba/optim/pos_pred3.iter'
4383--- test/iterplans/zorba/optim/pos_pred3.iter 2014-02-24 20:08:54 +0000
4384+++ test/iterplans/zorba/optim/pos_pred3.iter 2014-02-25 00:37:05 +0000
4385@@ -37,7 +37,7 @@
4386 </ForIterator>
4387 <Spec>
4388 <FnDataIterator>
4389- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,grp)" typename="*" nill allowed="0">
4390+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,grp)" typename="*" nill-allowed="0">
4391 <ForVarIterator varname="x"/>
4392 </AttributeAxisIterator>
4393 </FnDataIterator>
4394
4395=== modified file 'test/iterplans/zorba/optim/var_inline_05.iter'
4396--- test/iterplans/zorba/optim/var_inline_05.iter 2014-02-24 20:08:54 +0000
4397+++ test/iterplans/zorba/optim/var_inline_05.iter 2014-02-25 00:37:05 +0000
4398@@ -54,7 +54,7 @@
4399 <HoistIterator>
4400 <CastIterator type="xs:integer">
4401 <FnDataIterator>
4402- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0" target_position="1">
4403+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0" target_position="1">
4404 <ForVarIterator varname="x"/>
4405 </ChildAxisIterator>
4406 </FnDataIterator>
4407
4408=== modified file 'test/iterplans/zorba/paths/path10.iter'
4409--- test/iterplans/zorba/paths/path10.iter 2014-02-24 20:08:54 +0000
4410+++ test/iterplans/zorba/paths/path10.iter 2014-02-25 00:37:05 +0000
4411@@ -1,7 +1,7 @@
4412 <iterator-tree description="main query">
4413 <NodeSortIterator distinct="false" ascending="true">
4414- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
4415- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4416+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
4417+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4418 <ElementIterator>
4419 <SingletonIterator value="xs:QName(,,a)"/>
4420 <FnConcatIterator>
4421
4422=== modified file 'test/iterplans/zorba/paths/path11.iter'
4423--- test/iterplans/zorba/paths/path11.iter 2014-02-24 20:08:54 +0000
4424+++ test/iterplans/zorba/paths/path11.iter 2014-02-25 00:37:05 +0000
4425@@ -1,6 +1,6 @@
4426 <iterator-tree description="main query">
4427 <NodeSortIterator distinct="true" ascending="true">
4428- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4429+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4430 <FLWORIterator>
4431 <ForVariable name="x">
4432 <ElementIterator>
4433
4434=== modified file 'test/iterplans/zorba/paths/path13.iter'
4435--- test/iterplans/zorba/paths/path13.iter 2014-02-24 20:08:54 +0000
4436+++ test/iterplans/zorba/paths/path13.iter 2014-02-25 00:37:05 +0000
4437@@ -8,7 +8,7 @@
4438 <iterator-tree description="main query">
4439 <FLWORIterator>
4440 <ForVariable name="$$context-item">
4441- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4442+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4443 <ElementIterator>
4444 <SingletonIterator value="xs:QName(,,a)"/>
4445 <FnConcatIterator>
4446@@ -42,7 +42,7 @@
4447 </ForVariable>
4448 <WhereClause>
4449 <FnBooleanIterator>
4450- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
4451+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
4452 <ForVarIterator varname="$$context-item"/>
4453 </ChildAxisIterator>
4454 </FnBooleanIterator>
4455
4456=== modified file 'test/iterplans/zorba/paths/path17.iter'
4457--- test/iterplans/zorba/paths/path17.iter 2014-02-24 20:08:54 +0000
4458+++ test/iterplans/zorba/paths/path17.iter 2014-02-25 00:37:05 +0000
4459@@ -16,7 +16,7 @@
4460 <NodeSortIterator distinct="true" ascending="true">
4461 <FLWORIterator>
4462 <ForVariable name="$$context-item">
4463- <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
4464+ <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
4465 <FnDocIterator>
4466 <PromoteIterator type="xs:string">
4467 <FnDataIterator>
4468@@ -27,20 +27,20 @@
4469 </DescendantSelfAxisIterator>
4470 </ForVariable>
4471 <ForVariable name="$$context-item">
4472- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">
4473+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill-allowed="0">
4474 <ForVarIterator varname="$$context-item"/>
4475 </ChildAxisIterator>
4476 </ForVariable>
4477 <WhereClause>
4478 <AndIterator>
4479 <FnEmptyIterator>
4480- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">
4481+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill-allowed="0">
4482 <ForVarIterator varname="$$context-item"/>
4483 </AttributeAxisIterator>
4484 </FnEmptyIterator>
4485 <CompareIterator>
4486 <FnDataIterator>
4487- <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
4488+ <ChildAxisIterator test-kind="match_text_test" qname="*" typename="*" nill-allowed="0">
4489 <ForVarIterator varname="$$context-item"/>
4490 </ChildAxisIterator>
4491 </FnDataIterator>
4492@@ -56,8 +56,8 @@
4493 </ForVariable>
4494 <ReturnClause>
4495 <FnStringIterator>
4496- <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
4497- <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
4498+ <AttributeAxisIterator test-kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill-allowed="0">
4499+ <ParentAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
4500 <ForVarIterator varname="x"/>
4501 </ParentAxisIterator>
4502 </AttributeAxisIterator>
4503
4504=== modified file 'test/iterplans/zorba/paths/path24.iter'
4505--- test/iterplans/zorba/paths/path24.iter 2014-02-24 20:08:54 +0000
4506+++ test/iterplans/zorba/paths/path24.iter 2014-02-25 00:37:05 +0000
4507@@ -1,6 +1,6 @@
4508 <iterator-tree description="main query">
4509- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4510- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4511+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4512+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4513 <ElementIterator>
4514 <SingletonIterator value="xs:QName(,,a)"/>
4515 </ElementIterator>
4516
4517=== modified file 'test/iterplans/zorba/paths/path_pred4.iter'
4518--- test/iterplans/zorba/paths/path_pred4.iter 2014-02-24 20:08:54 +0000
4519+++ test/iterplans/zorba/paths/path_pred4.iter 2014-02-25 00:37:05 +0000
4520@@ -1,9 +1,9 @@
4521 <iterator-tree description="main query">
4522- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill allowed="0">
4523+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill-allowed="0">
4524 <FLWORIterator>
4525 <ForVariable name="$$context-item">
4526- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4527- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4528+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4529+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4530 <ElementIterator>
4531 <SingletonIterator value="xs:QName(,,root1)"/>
4532 <FnConcatIterator>
4533@@ -47,7 +47,7 @@
4534 </ChildAxisIterator>
4535 </ForVariable>
4536 <ReturnClause>
4537- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0" target_position="1">
4538+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0" target_position="1">
4539 <ForVarIterator varname="$$context-item"/>
4540 </ChildAxisIterator>
4541 </ReturnClause>
4542
4543=== modified file 'test/iterplans/zorba/paths/path_pred5.iter'
4544--- test/iterplans/zorba/paths/path_pred5.iter 2014-02-24 20:08:54 +0000
4545+++ test/iterplans/zorba/paths/path_pred5.iter 2014-02-25 00:37:05 +0000
4546@@ -1,9 +1,9 @@
4547 <iterator-tree description="main query">
4548- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill allowed="0">
4549+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill-allowed="0">
4550 <SequencePointAccessIterator>
4551- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
4552- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
4553- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
4554+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill-allowed="0">
4555+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill-allowed="0">
4556+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill-allowed="0">
4557 <ElementIterator>
4558 <SingletonIterator value="xs:QName(,,root1)"/>
4559 <ElementIterator>
4560
4561=== modified file 'test/iterplans/zorba/udf/udf1.iter'
4562--- test/iterplans/zorba/udf/udf1.iter 2014-02-24 20:08:54 +0000
4563+++ test/iterplans/zorba/udf/udf1.iter 2014-02-25 00:37:05 +0000
4564@@ -4,8 +4,8 @@
4565 <SingletonIterator value="xs:integer(1)"/>
4566 </CtxVarDeclareIterator>
4567 <UDFunctionCallIterator function="local:sum">
4568- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill allowed="0">
4569- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
4570+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,price)" typename="*" nill-allowed="0">
4571+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill-allowed="0">
4572 <ElementIterator copyInputNodes="false">
4573 <SingletonIterator value="xs:QName(,,books)"/>
4574 <FnConcatIterator>
4575
4576=== modified file 'test/iterplans/zorba/w3c/ForExpr010.iter'
4577--- test/iterplans/zorba/w3c/ForExpr010.iter 2014-02-24 20:08:54 +0000
4578+++ test/iterplans/zorba/w3c/ForExpr010.iter 2014-02-25 00:37:05 +0000
4579@@ -4,7 +4,7 @@
4580 <FLWORIterator>
4581 <ForVariable name="folder">
4582 <NodeSortIterator distinct="true" ascending="true">
4583- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">
4584+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
4585 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4586 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
4587 </TreatIterator>
4588@@ -14,14 +14,14 @@
4589 <LetVariable name="$$opt_temp_0" materialize="true">
4590 <HoistIterator>
4591 <FnDataIterator>
4592- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FolderName)" typename="*" nill allowed="0">
4593+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FolderName)" typename="*" nill-allowed="0">
4594 <ForVarIterator varname="folder"/>
4595 </ChildAxisIterator>
4596 </FnDataIterator>
4597 </HoistIterator>
4598 </LetVariable>
4599 <ForVariable name="file">
4600- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">
4601+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
4602 <ForVarIterator varname="folder"/>
4603 </DescendantAxisIterator>
4604 </ForVariable>
4605@@ -37,7 +37,7 @@
4606 </AttributeIterator>
4607 <EnclosedIterator attr_cont="false">
4608 <FnStringIterator>
4609- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill allowed="0" target_position="0">
4610+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill-allowed="0" target_position="0">
4611 <ForVarIterator varname="file"/>
4612 </ChildAxisIterator>
4613 </FnStringIterator>
4614
4615=== modified file 'test/iterplans/zorba/w3c/ForExpr025.iter'
4616--- test/iterplans/zorba/w3c/ForExpr025.iter 2014-02-24 20:08:54 +0000
4617+++ test/iterplans/zorba/w3c/ForExpr025.iter 2014-02-25 00:37:05 +0000
4618@@ -4,10 +4,10 @@
4619 <FLWORIterator>
4620 <LetVariable name="$$opt_temp_0" materialize="true">
4621 <HoistIterator>
4622- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">
4623+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
4624 <SequencePointAccessIterator>
4625 <NodeSortIterator distinct="true" ascending="true">
4626- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">
4627+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
4628 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4629 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
4630 </TreatIterator>
4631@@ -19,10 +19,10 @@
4632 </HoistIterator>
4633 </LetVariable>
4634 <ForVariable name="file">
4635- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">
4636+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
4637 <SequencePointAccessIterator>
4638 <NodeSortIterator distinct="true" ascending="true">
4639- <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill allowed="0">
4640+ <DescendantAxisIterator test-kind="match_name_test" qname="xs:QName(,,Folder)" typename="*" nill-allowed="0">
4641 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4642 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
4643 </TreatIterator>
4644@@ -38,7 +38,7 @@
4645 </UnhoistIterator>
4646 </ForVariable>
4647 <ReturnClause>
4648- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill allowed="0">
4649+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,FileName)" typename="*" nill-allowed="0">
4650 <ForVarIterator varname="file"/>
4651 </ChildAxisIterator>
4652 </ReturnClause>
4653
4654=== modified file 'test/iterplans/zorba/w3c/WhereExpr001.iter'
4655--- test/iterplans/zorba/w3c/WhereExpr001.iter 2014-02-24 20:08:54 +0000
4656+++ test/iterplans/zorba/w3c/WhereExpr001.iter 2014-02-25 00:37:05 +0000
4657@@ -7,7 +7,7 @@
4658 <FLWORIterator>
4659 <ForVariable name="f">
4660 <NodeDistinctIterator allow-atomics="false" check-only="false">
4661- <DescendantAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
4662+ <DescendantAxisIterator test-kind="match_name_test" qname="*" typename="*" nill-allowed="0">
4663 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4664 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
4665 </TreatIterator>
4666@@ -16,13 +16,13 @@
4667 </ForVariable>
4668 <WhereClause>
4669 <FnBooleanIterator>
4670- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0">
4671+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0">
4672 <ForVarIterator varname="f"/>
4673 </ChildAxisIterator>
4674 </FnBooleanIterator>
4675 </WhereClause>
4676 <ReturnClause>
4677- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0" target_position="0">
4678+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0" target_position="0">
4679 <ForVarIterator varname="f"/>
4680 </ChildAxisIterator>
4681 </ReturnClause>
4682@@ -33,7 +33,7 @@
4683 <FLWORIterator>
4684 <ForVariable name="$$context-item">
4685 <NodeDistinctIterator allow-atomics="false" check-only="false">
4686- <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
4687+ <DescendantSelfAxisIterator test-kind="match_anykind_test" qname="*" typename="*" nill-allowed="0">
4688 <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4689 <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
4690 </TreatIterator>
4691@@ -41,7 +41,7 @@
4692 </NodeDistinctIterator>
4693 </ForVariable>
4694 <ReturnClause>
4695- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill allowed="0" target_position="0">
4696+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,File)" typename="*" nill-allowed="0" target_position="0">
4697 <ForVarIterator varname="$$context-item"/>
4698 </ChildAxisIterator>
4699 </ReturnClause>
4700
4701=== modified file 'test/iterplans/zorba/w3c/nodeexpression47.iter'
4702--- test/iterplans/zorba/w3c/nodeexpression47.iter 2014-02-24 20:08:54 +0000
4703+++ test/iterplans/zorba/w3c/nodeexpression47.iter 2014-02-25 00:37:05 +0000
4704@@ -22,227 +22,227 @@
4705 </NodeDistinctIterator>
4706 </ForVariable>
4707 <ReturnClause>
4708- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">
4709- <ForVarIterator varname="$$context-item"/>
4710- </ChildAxisIterator>
4711- </ReturnClause>
4712- </FLWORIterator>
4713- </NodeDistinctIterator>
4714- </ForVariable>
4715- <ReturnClause>
4716- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="0">
4717- <ForVarIterator varname="$$context-item"/>
4718- </ChildAxisIterator>
4719- </ReturnClause>
4720- </FLWORIterator>
4721- </NodeDistinctIterator>
4722- </ForVariable>
4723- <ReturnClause>
4724- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4725- <ForVarIterator varname="$$context-item"/>
4726- </ChildAxisIterator>
4727- </ReturnClause>
4728- </FLWORIterator>
4729- </NodeDistinctIterator>
4730- </TreatIterator>
4731- <TreatIterator quant="?">
4732- <NodeDistinctIterator allow-atomics="false" check-only="false">
4733- <FLWORIterator>
4734- <ForVariable name="$$context-item">
4735- <NodeDistinctIterator allow-atomics="false" check-only="false">
4736- <FLWORIterator>
4737- <ForVariable name="$$context-item">
4738- <NodeDistinctIterator allow-atomics="false" check-only="false">
4739- <FLWORIterator>
4740- <ForVariable name="$$context-item">
4741- <NodeDistinctIterator allow-atomics="false" check-only="false">
4742- <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4743- <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
4744- </TreatIterator>
4745- </NodeDistinctIterator>
4746- </ForVariable>
4747- <ReturnClause>
4748- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">
4749- <ForVarIterator varname="$$context-item"/>
4750- </ChildAxisIterator>
4751- </ReturnClause>
4752- </FLWORIterator>
4753- </NodeDistinctIterator>
4754- </ForVariable>
4755- <ReturnClause>
4756- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="0">
4757- <ForVarIterator varname="$$context-item"/>
4758- </ChildAxisIterator>
4759- </ReturnClause>
4760- </FLWORIterator>
4761- </NodeDistinctIterator>
4762- </ForVariable>
4763- <ReturnClause>
4764- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4765- <ForVarIterator varname="$$context-item"/>
4766- </ChildAxisIterator>
4767- </ReturnClause>
4768- </FLWORIterator>
4769- </NodeDistinctIterator>
4770- </TreatIterator>
4771- </NodeAfterIterator>
4772- <NodeAfterIterator>
4773- <TreatIterator quant="?">
4774- <NodeDistinctIterator allow-atomics="false" check-only="false">
4775- <FLWORIterator>
4776- <ForVariable name="$$context-item">
4777- <NodeDistinctIterator allow-atomics="false" check-only="false">
4778- <FLWORIterator>
4779- <ForVariable name="$$context-item">
4780- <NodeDistinctIterator allow-atomics="false" check-only="false">
4781- <FLWORIterator>
4782- <ForVariable name="$$context-item">
4783- <NodeDistinctIterator allow-atomics="false" check-only="false">
4784- <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4785- <CtxVarIterator varid="4" varname="input-context1" varkind="global"/>
4786- </TreatIterator>
4787- </NodeDistinctIterator>
4788- </ForVariable>
4789- <ReturnClause>
4790- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">
4791- <ForVarIterator varname="$$context-item"/>
4792- </ChildAxisIterator>
4793- </ReturnClause>
4794- </FLWORIterator>
4795- </NodeDistinctIterator>
4796- </ForVariable>
4797- <ReturnClause>
4798- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="1">
4799- <ForVarIterator varname="$$context-item"/>
4800- </ChildAxisIterator>
4801- </ReturnClause>
4802- </FLWORIterator>
4803- </NodeDistinctIterator>
4804- </ForVariable>
4805- <ReturnClause>
4806- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4807- <ForVarIterator varname="$$context-item"/>
4808- </ChildAxisIterator>
4809- </ReturnClause>
4810- </FLWORIterator>
4811- </NodeDistinctIterator>
4812- </TreatIterator>
4813- <TreatIterator quant="?">
4814- <NodeDistinctIterator allow-atomics="false" check-only="false">
4815- <FLWORIterator>
4816- <ForVariable name="$$context-item">
4817- <NodeDistinctIterator allow-atomics="false" check-only="false">
4818- <FLWORIterator>
4819- <ForVariable name="$$context-item">
4820- <NodeDistinctIterator allow-atomics="false" check-only="false">
4821- <FLWORIterator>
4822- <ForVariable name="$$context-item">
4823- <NodeDistinctIterator allow-atomics="false" check-only="false">
4824- <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4825- <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
4826- </TreatIterator>
4827- </NodeDistinctIterator>
4828- </ForVariable>
4829- <ReturnClause>
4830- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">
4831- <ForVarIterator varname="$$context-item"/>
4832- </ChildAxisIterator>
4833- </ReturnClause>
4834- </FLWORIterator>
4835- </NodeDistinctIterator>
4836- </ForVariable>
4837- <ReturnClause>
4838- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="1">
4839- <ForVarIterator varname="$$context-item"/>
4840- </ChildAxisIterator>
4841- </ReturnClause>
4842- </FLWORIterator>
4843- </NodeDistinctIterator>
4844- </ForVariable>
4845- <ReturnClause>
4846- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4847- <ForVarIterator varname="$$context-item"/>
4848- </ChildAxisIterator>
4849- </ReturnClause>
4850- </FLWORIterator>
4851- </NodeDistinctIterator>
4852- </TreatIterator>
4853- </NodeAfterIterator>
4854- <NodeAfterIterator>
4855- <TreatIterator quant="?">
4856- <NodeDistinctIterator allow-atomics="false" check-only="false">
4857- <FLWORIterator>
4858- <ForVariable name="$$context-item">
4859- <NodeDistinctIterator allow-atomics="false" check-only="false">
4860- <FLWORIterator>
4861- <ForVariable name="$$context-item">
4862- <NodeDistinctIterator allow-atomics="false" check-only="false">
4863- <FLWORIterator>
4864- <ForVariable name="$$context-item">
4865- <NodeDistinctIterator allow-atomics="false" check-only="false">
4866- <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4867- <CtxVarIterator varid="4" varname="input-context1" varkind="global"/>
4868- </TreatIterator>
4869- </NodeDistinctIterator>
4870- </ForVariable>
4871- <ReturnClause>
4872- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill allowed="0" target_position="0">
4873- <ForVarIterator varname="$$context-item"/>
4874- </ChildAxisIterator>
4875- </ReturnClause>
4876- </FLWORIterator>
4877- </NodeDistinctIterator>
4878- </ForVariable>
4879- <ReturnClause>
4880- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="2">
4881- <ForVarIterator varname="$$context-item"/>
4882- </ChildAxisIterator>
4883- </ReturnClause>
4884- </FLWORIterator>
4885- </NodeDistinctIterator>
4886- </ForVariable>
4887- <ReturnClause>
4888- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4889- <ForVarIterator varname="$$context-item"/>
4890- </ChildAxisIterator>
4891- </ReturnClause>
4892- </FLWORIterator>
4893- </NodeDistinctIterator>
4894- </TreatIterator>
4895- <TreatIterator quant="?">
4896- <NodeDistinctIterator allow-atomics="false" check-only="false">
4897- <FLWORIterator>
4898- <ForVariable name="$$context-item">
4899- <NodeDistinctIterator allow-atomics="false" check-only="false">
4900- <FLWORIterator>
4901- <ForVariable name="$$context-item">
4902- <NodeDistinctIterator allow-atomics="false" check-only="false">
4903- <FLWORIterator>
4904- <ForVariable name="$$context-item">
4905- <NodeDistinctIterator allow-atomics="false" check-only="false">
4906- <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4907- <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
4908- </TreatIterator>
4909- </NodeDistinctIterator>
4910- </ForVariable>
4911- <ReturnClause>
4912- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill allowed="0" target_position="0">
4913- <ForVarIterator varname="$$context-item"/>
4914- </ChildAxisIterator>
4915- </ReturnClause>
4916- </FLWORIterator>
4917- </NodeDistinctIterator>
4918- </ForVariable>
4919- <ReturnClause>
4920- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill allowed="0" target_position="2">
4921- <ForVarIterator varname="$$context-item"/>
4922- </ChildAxisIterator>
4923- </ReturnClause>
4924- </FLWORIterator>
4925- </NodeDistinctIterator>
4926- </ForVariable>
4927- <ReturnClause>
4928- <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill allowed="0" target_position="0">
4929+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,works)" typename="*" nill-allowed="0" target_position="0">
4930+ <ForVarIterator varname="$$context-item"/>
4931+ </ChildAxisIterator>
4932+ </ReturnClause>
4933+ </FLWORIterator>
4934+ </NodeDistinctIterator>
4935+ </ForVariable>
4936+ <ReturnClause>
4937+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill-allowed="0" target_position="0">
4938+ <ForVarIterator varname="$$context-item"/>
4939+ </ChildAxisIterator>
4940+ </ReturnClause>
4941+ </FLWORIterator>
4942+ </NodeDistinctIterator>
4943+ </ForVariable>
4944+ <ReturnClause>
4945+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill-allowed="0" target_position="0">
4946+ <ForVarIterator varname="$$context-item"/>
4947+ </ChildAxisIterator>
4948+ </ReturnClause>
4949+ </FLWORIterator>
4950+ </NodeDistinctIterator>
4951+ </TreatIterator>
4952+ <TreatIterator quant="?">
4953+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4954+ <FLWORIterator>
4955+ <ForVariable name="$$context-item">
4956+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4957+ <FLWORIterator>
4958+ <ForVariable name="$$context-item">
4959+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4960+ <FLWORIterator>
4961+ <ForVariable name="$$context-item">
4962+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4963+ <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
4964+ <CtxVarIterator varid="5" varname="input-context2" varkind="global"/>
4965+ </TreatIterator>
4966+ </NodeDistinctIterator>
4967+ </ForVariable>
4968+ <ReturnClause>
4969+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,staff)" typename="*" nill-allowed="0" target_position="0">
4970+ <ForVarIterator varname="$$context-item"/>
4971+ </ChildAxisIterator>
4972+ </ReturnClause>
4973+ </FLWORIterator>
4974+ </NodeDistinctIterator>
4975+ </ForVariable>
4976+ <ReturnClause>
4977+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,employee)" typename="*" nill-allowed="0" target_position="0">
4978+ <ForVarIterator varname="$$context-item"/>
4979+ </ChildAxisIterator>
4980+ </ReturnClause>
4981+ </FLWORIterator>
4982+ </NodeDistinctIterator>
4983+ </ForVariable>
4984+ <ReturnClause>
4985+ <ChildAxisIterator test-kind="match_name_test" qname="xs:QName(,,empnum)" typename="*" nill-allowed="0" target_position="0">
4986+ <ForVarIterator varname="$$context-item"/>
4987+ </ChildAxisIterator>
4988+ </ReturnClause>
4989+ </FLWORIterator>
4990+ </NodeDistinctIterator>
4991+ </TreatIterator>
4992+ </NodeAfterIterator>
4993+ <NodeAfterIterator>
4994+ <TreatIterator quant="?">
4995+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4996+ <FLWORIterator>
4997+ <ForVariable name="$$context-item">
4998+ <NodeDistinctIterator allow-atomics="false" check-only="false">
4999+ <FLWORIterator>
5000+ <ForVariable name="$$context-item">
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches