Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13472/src/modules/atoms/Tests
Modified Files:
Tag: GDK-2
xml100.mal xml100.stable.out
Log Message:
propagated changes of Monday Sep 03 2007 - Thursday Sep 06 2007
from the development trunk to the GDK-2 branch
Index: xml100.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/Tests/xml100.stable.out,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- xml100.stable.out 28 Aug 2007 13:15:25 -0000 1.1.2.2
+++ xml100.stable.out 6 Sep 2007 13:52:36 -0000 1.1.2.3
@@ -41,20 +41,18 @@
bx := xml.xml(b); # 7 XMLstr2xml (bx:xml)<-(b:str)
cx := xml.xml(c); # 8 XMLstr2xml (cx:xml)<-(c:str)
xp := xml.element("person",bx); # 9 XMLelementSmall
(xp:xml)<-(_13:str)(bx:xml)
- sp := xml.str(xp); # 10 XMLxml2str (sp:str)<-(xp:xml)
- io.print(sp); # 11 IOprint_val (_15:void)<-(sp:str)
- xh := xml.element("hair",nil:str,nil:str,cx); # 12 XMLelement
(xh:xml)<-(_17:str)(_18:str)(_18:str)(cx:xml)
- sp := xml.str(xh); # 13 XMLxml2str (sp:str)<-(xh:xml)
- io.print(sp); # 14 IOprint_val (_19:void)<-(sp:str)
- xx := xml.forest(xp,xh); # 15 XMLforest (xx:xml)<-(xp:xml)(xh:xml)
- xs := xml.str(xx); # 16 XMLxml2str (xs:str)<-(xx:xml)
- io.print(xs); # 17 IOprint_val (_22:void)<-(xs:str)
-end main; # 18
-[ nil ]
+ io.print(xp); # 10 IOprint_val (_14:void)<-(xp:xml)
+ xh := xml.element("hair",nil:str,nil:xml,cx); # 11 XMLelement
(xh:xml)<-(_16:str)(_17:str)(_6:xml)(cx:xml)
+ io.print(xh); # 12 IOprint_val (_18:void)<-(xh:xml)
+ xx := xml.forest(xp,xh); # 13 XMLforest (xx:xml)<-(xp:xml)(xh:xml)
+ xs := xml.str(xx); # 14 XMLxml2str (xs:str)<-(xx:xml)
+ io.print(xs); # 15 IOprint_val (_21:void)<-(xs:str)
+end main; # 16
+[ ]
[ nil ]
-[ "<person>Mary Ann Walker</person>" ]
-[ "<hair>brown</hair" ]
-[ "<person>Mary Ann Walker</person><hair>brown</hair" ]
+[ <person>Mary Ann Walker</person> ]
+[ <hair>brown</hair> ]
+[ "<person>Mary Ann Walker</person><hair>brown</hair>" ]
# 20:59:49 >
# 20:59:49 > Done.
Index: xml100.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/Tests/xml100.mal,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- xml100.mal 28 Aug 2007 13:15:16 -0000 1.1.2.4
+++ xml100.mal 6 Sep 2007 13:52:36 -0000 1.1.2.5
@@ -10,9 +10,9 @@
cx:= xml.xml(c);
xp:= xml.element("person",bx);
-sp:= xml.str(xp); io.print(sp);
-xh:= xml.element("hair",nil:str,nil:str,cx);
-sp:= xml.str(xh); io.print(sp);
+io.print(xp);
+xh:= xml.element("hair",nil:str,nil:xml,cx);
+io.print(xh);
xx:= xml.forest(xp,xh);
xs:= xml.str(xx);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
