Changeset: bed354a93907 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bed354a93907
Modified Files:
monetdb5/modules/atoms/Tests/xml00.mal
monetdb5/modules/atoms/Tests/xml00.stable.out
monetdb5/modules/atoms/Tests/xml01.mal
monetdb5/modules/atoms/Tests/xml01.stable.out
monetdb5/modules/atoms/Tests/xml02.mal
monetdb5/modules/atoms/Tests/xml02.stable.out
monetdb5/modules/atoms/Tests/xml03.mal
monetdb5/modules/atoms/Tests/xml03.stable.out
monetdb5/modules/atoms/Tests/xml04.mal
monetdb5/modules/atoms/Tests/xml04.stable.out
monetdb5/modules/atoms/Tests/xml05.mal
monetdb5/modules/atoms/Tests/xml05.stable.out
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
Branch: Feb2013
Log Message:
fix test for revert of xml to batxml
diffs (truncated from 307 to 300 lines):
diff --git a/monetdb5/modules/atoms/Tests/xml00.mal
b/monetdb5/modules/atoms/Tests/xml00.mal
--- a/monetdb5/modules/atoms/Tests/xml00.mal
+++ b/monetdb5/modules/atoms/Tests/xml00.mal
@@ -4,6 +4,6 @@ bat.insert(b,1@0,"Annie Chapman");
io.print(b);
-bc:= xml.comment(b);
-bj:= xml.str(bc);
+bc:= batxml.comment(b);
+bj:= batxml.str(bc);
io.print(bj);
diff --git a/monetdb5/modules/atoms/Tests/xml00.stable.out
b/monetdb5/modules/atoms/Tests/xml00.stable.out
--- a/monetdb5/modules/atoms/Tests/xml00.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml00.stable.out
@@ -19,8 +19,8 @@ function user.main():void;
bat.insert(b,0@0,"Mary Ann Walker");
bat.insert(b,1@0,"Annie Chapman");
io.print(b);
- bc := xml.comment(b);
- bj := xml.str(bc);
+ bc := batxml.comment(b);
+ bj := batxml.str(bc);
io.print(bj);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml01.mal
b/monetdb5/modules/atoms/Tests/xml01.mal
--- a/monetdb5/modules/atoms/Tests/xml01.mal
+++ b/monetdb5/modules/atoms/Tests/xml01.mal
@@ -4,6 +4,6 @@ bat.insert(b,1@0,"Annie Chapman");
io.print(b);
-bc:= xml.attribute("name",b);
-bj:= xml.str(bc);
+bc:= batxml.attribute("name",b);
+bj:= batxml.str(bc);
io.print(bj);
diff --git a/monetdb5/modules/atoms/Tests/xml01.stable.out
b/monetdb5/modules/atoms/Tests/xml01.stable.out
--- a/monetdb5/modules/atoms/Tests/xml01.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml01.stable.out
@@ -22,8 +22,8 @@ function user.main():void;
bat.insert(b,0@0,"Mary Ann Walker");
bat.insert(b,1@0,"Annie Chapman");
io.print(b);
- bc := xml.attribute("name",b);
- bj := xml.str(bc);
+ bc := batxml.attribute("name",b);
+ bj := batxml.str(bc);
io.print(bj);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml02.mal
b/monetdb5/modules/atoms/Tests/xml02.mal
--- a/monetdb5/modules/atoms/Tests/xml02.mal
+++ b/monetdb5/modules/atoms/Tests/xml02.mal
@@ -7,13 +7,13 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bc:= xml.attribute("name",b);
-hc:= xml.attribute("hair",h);
-bj:= xml.str(bc);
-hj:= xml.str(hc);
+bc:= batxml.attribute("name",b);
+hc:= batxml.attribute("hair",h);
+bj:= batxml.str(bc);
+hj:= batxml.str(hc);
io.print(bj);
io.print(hj);
-aa:= xml.concat(bc,hc);
-as:= xml.str(aa);
+aa:= batxml.concat(bc,hc);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml02.stable.out
b/monetdb5/modules/atoms/Tests/xml02.stable.out
--- a/monetdb5/modules/atoms/Tests/xml02.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml02.stable.out
@@ -22,14 +22,14 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bc := xml.attribute("name",b);
- hc := xml.attribute("hair",h);
- bj := xml.str(bc);
- hj := xml.str(hc);
+ bc := batxml.attribute("name",b);
+ hc := batxml.attribute("hair",h);
+ bj := batxml.str(bc);
+ hj := batxml.str(hc);
io.print(bj);
io.print(hj);
- aa := xml.concat(bc,hc);
- as := xml.str(aa);
+ aa := batxml.concat(bc,hc);
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml03.mal
b/monetdb5/modules/atoms/Tests/xml03.mal
--- a/monetdb5/modules/atoms/Tests/xml03.mal
+++ b/monetdb5/modules/atoms/Tests/xml03.mal
@@ -7,17 +7,17 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bs:= xml.xml(b);
-bc:= xml.element("name",bs);
-bj:= xml.str(bc);
+bs:= batxml.xml(b);
+bc:= batxml.element("name",bs);
+bj:= batxml.str(bc);
io.print(bj);
-hs:= xml.xml(h);
-hc:= xml.element("hair",hs);
-hj:= xml.str(hc);
+hs:= batxml.xml(h);
+hc:= batxml.element("hair",hs);
+hj:= batxml.str(hc);
io.print(hj);
-hh:= xml.concat(bc,hc);
+hh:= batxml.concat(bc,hc);
-aa:= xml.element("victim",hh);
-as:= xml.str(aa);
+aa:= batxml.element("victim",hh);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml03.stable.out
b/monetdb5/modules/atoms/Tests/xml03.stable.out
--- a/monetdb5/modules/atoms/Tests/xml03.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml03.stable.out
@@ -22,17 +22,17 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bs := xml.xml(b);
- bc := xml.element("name",bs);
- bj := xml.str(bc);
+ bs := batxml.xml(b);
+ bc := batxml.element("name",bs);
+ bj := batxml.str(bc);
io.print(bj);
- hs := xml.xml(h);
- hc := xml.element("hair",hs);
- hj := xml.str(hc);
+ hs := batxml.xml(h);
+ hc := batxml.element("hair",hs);
+ hj := batxml.str(hc);
io.print(hj);
- hh := xml.concat(bc,hc);
- aa := xml.element("victim",hh);
- as := xml.str(aa);
+ hh := batxml.concat(bc,hc);
+ aa := batxml.element("victim",hh);
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml04.mal
b/monetdb5/modules/atoms/Tests/xml04.mal
--- a/monetdb5/modules/atoms/Tests/xml04.mal
+++ b/monetdb5/modules/atoms/Tests/xml04.mal
@@ -7,15 +7,15 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bs:= xml.xml(b);
-bc:= xml.element("name",bs);
-bj:= xml.str(bc);
+bs:= batxml.xml(b);
+bc:= batxml.element("name",bs);
+bj:= batxml.str(bc);
io.print(bj);
-hs:= xml.xml(h);
-hc:= xml.element("hair",hs);
-hj:= xml.str(hc);
+hs:= batxml.xml(h);
+hc:= batxml.element("hair",hs);
+hj:= batxml.str(hc);
io.print(hj);
-aa:= xml.forest(bc,hc);
-as:= xml.str(aa);
+aa:= batxml.forest(bc,hc);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml04.stable.out
b/monetdb5/modules/atoms/Tests/xml04.stable.out
--- a/monetdb5/modules/atoms/Tests/xml04.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml04.stable.out
@@ -22,16 +22,16 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bs := xml.xml(b);
- bc := xml.element("name",bs);
- bj := xml.str(bc);
+ bs := batxml.xml(b);
+ bc := batxml.element("name",bs);
+ bj := batxml.str(bc);
io.print(bj);
- hs := xml.xml(h);
- hc := xml.element("hair",hs);
- hj := xml.str(hc);
+ hs := batxml.xml(h);
+ hc := batxml.element("hair",hs);
+ hj := batxml.str(hc);
io.print(hj);
- aa := xml.forest(bc,hc);
- as := xml.str(aa);
+ aa := batxml.forest(bc,hc);
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml05.mal
b/monetdb5/modules/atoms/Tests/xml05.mal
--- a/monetdb5/modules/atoms/Tests/xml05.mal
+++ b/monetdb5/modules/atoms/Tests/xml05.mal
@@ -7,9 +7,9 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bs:= xml.xml(b);
-bc:= xml.element("name",bs);
+bs:= batxml.xml(b);
+bc:= batxml.element("name",bs);
-aa:= xml.root(bc,"1.0","no");
-as:= xml.str(aa);
+aa:= batxml.root(bc,"1.0","no");
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml05.stable.out
b/monetdb5/modules/atoms/Tests/xml05.stable.out
--- a/monetdb5/modules/atoms/Tests/xml05.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml05.stable.out
@@ -22,10 +22,10 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bs := xml.xml(b);
- bc := xml.element("name",bs);
- aa := xml.root(bc,"1.0","no");
- as := xml.str(aa);
+ bs := batxml.xml(b);
+ bc := batxml.element("name",bs);
+ aa := batxml.root(bc,"1.0","no");
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml10.mal
b/monetdb5/modules/atoms/Tests/xml10.mal
--- a/monetdb5/modules/atoms/Tests/xml10.mal
+++ b/monetdb5/modules/atoms/Tests/xml10.mal
@@ -27,9 +27,9 @@ bat.insert(t,2@0,"autum");
# ) )
# every nesting implies a groupby
-ax:= xml.xml(a);
-tx:= xml.xml(t);
-te:= xml.element("title",tx);
+ax:= batxml.xml(a);
+tx:= batxml.xml(t);
+te:= batxml.element("title",tx);
g:= bat.new(:oid,:oid);
bat.insert(g,0@0,0@0);
bat.insert(g,1@0,0@0);
@@ -47,10 +47,10 @@ gr:= bat.reverse(g);
j2:= algebra.join(gr,ax);
k2:=algebra.kunique(j2);
io.print(k2);
-cc:= xml.concat(k2,ag);
+cc:= batxml.concat(k2,ag);
io.print(cc);
io.print("author construction");
-ae:= xml.element("author",cc);
+ae:= batxml.element("author",cc);
io.print(ae);
io.print("book construction");
diff --git a/monetdb5/modules/atoms/Tests/xml10.stable.out
b/monetdb5/modules/atoms/Tests/xml10.stable.out
--- a/monetdb5/modules/atoms/Tests/xml10.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml10.stable.out
@@ -41,9 +41,9 @@ function user.main():void;
# xmlagg(xmlelement('title',t))
# ) )
# every nesting implies a groupby
- ax := xml.xml(a);
- tx := xml.xml(t);
- te := xml.element("title",tx);
+ ax := batxml.xml(a);
+ tx := batxml.xml(t);
+ te := batxml.element("title",tx);
g := bat.new(:oid,:oid);
bat.insert(g,0@0,0@0);
bat.insert(g,1@0,0@0);
@@ -58,10 +58,10 @@ function user.main():void;
j2 := algebra.join(gr,ax);
k2 := algebra.kunique(j2);
io.print(k2);
- cc := xml.concat(k2,ag);
+ cc := batxml.concat(k2,ag);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
