Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13472/src/modules/mal/Tests
Modified Files:
Tag: GDK-2
inspect05.stable.out xml00.stable.out xml01.stable.out
xml02.stable.out xml03.stable.out xml04.stable.out
xml05.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: inspect05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/inspect05.stable.out,v
retrieving revision 1.319.2.5
retrieving revision 1.319.2.6
diff -u -d -r1.319.2.5 -r1.319.2.6
--- inspect05.stable.out 3 Sep 2007 13:08:19 -0000 1.319.2.5
+++ inspect05.stable.out 6 Sep 2007 13:52:38 -0000 1.319.2.6
@@ -45,7 +45,7 @@
[ "concat", "command", "xml",
"(left:bat[:oid,:xml],right:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLconcat;"
]
[ "comment", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLcomment;"
]
[ "content", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLcontent;" ]
-[ "concat", "pattern", "xml",
"(val:xml...):xml ",
"XMLconcat;"
]
+[ "concat", "command", "xml",
"(val1:xml,val2:xml):xml ",
"XMLconcat;"
]
[ "content", "command", "xml",
"(val:str):xml ",
"XMLcontent;"
]
[ "comment", "command", "xml",
"(val:str):xml ",
"XMLcomment;"
]
[ "document", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLdocument;" ]
@@ -53,14 +53,16 @@
[ "element", "command", "xml",
"(name:str,ns:xml,attr:xml,s:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLelement;"
]
[ "element", "command", "xml",
"(name:str,s:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLtag;"
]
[ "element", "command", "xml",
"(name:str,s:xml):xml ",
"XMLelementSmall;"
]
-[ "element", "command", "xml",
"(name:str,ns:str,attr:str,s:xml):xml ",
"XMLelement;"
]
+[ "element", "command", "xml",
"(name:str,ns:str,attr:xml,s:xml):xml ",
"XMLelement;"
]
[ "forest", "pattern", "xml",
"(val:bat[:oid,:xml]...):bat[:oid,:xml] ",
"BATXMLforest;"
]
[ "forest", "pattern", "xml",
"(val:xml...):xml ",
"XMLforest;"
]
+[ "#fromstr", "command", "xml",
"():xml ",
"XMLfromString;"
]
[ "isdocument", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:bit] ",
"BATXMLisdocument;"
]
[ "isdocument", "command", "xml",
"(val:str):bit ",
"XMLisdocument;"
]
[ "options", "command", "xml",
"(tag:str,option:str,left:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLoptions;"
]
[ "pi", "command", "xml",
"(operator:str,ret:bat[:oid,:xml]):bat[:oid,:xml] ",
"XMLpi;"
]
[ "parse", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLparse;"
]
+[ "prelude", "command", "xml",
"():void ",
"XMLprelude;"
]
[ "pi", "command", "xml",
"(nme:str,val:str):xml ",
"XMLpi;"
]
[ "parse", "command", "xml",
"(val:str,option:str):xml ",
"XMLparse;"
]
[ "root", "command", "xml",
"(val:bat[:oid,:xml],version:str,standalone:str):bat[:oid,:xml] ",
"BATXMLroot;"
]
@@ -70,6 +72,7 @@
[ "str", "command", "xml",
"(src:xml):str ",
"XMLxml2str;"
]
[ "text", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLxml2str;"
]
[ "tag", "command", "xml",
"(nme:str,val:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLtag;"
]
+[ "#tostr", "command", "xml",
"():str ",
"XMLtoString;"
]
[ "xquery", "command", "xml",
"(val:bat[:oid,:str],expr:str):bat[:oid,:xml] ",
"BATXMLxquery;"
]
[ "xml", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLstr2xml;"
]
[ "xml", "command", "xml",
"(src:str):xml ",
"XMLstr2xml;"
]
@@ -1030,6 +1033,8 @@
[ "exit", "command", "clients",
"():void ",
"CLTexit;"
]
[ "getUsers", "command", "clients",
"(s:bat[:str,:any_1]):bat[:oid,:str] ",
"CLTgetUsers;"
]
[ "getUsers", "command", "clients",
"():bat[:int,:str] ",
"CLTusers;"
]
+[ "getTime", "command", "clients",
"():bat[:int,:lng] ",
"CLTTime;"
]
+[ "getActions", "command", "clients",
"():bat[:int,:int] ",
"CLTActions;"
]
[ "getLogins", "command", "clients",
"():bat[:int,:str] ",
"CLTLogin;"
]
[ "getScenario", "command", "clients",
"():str ",
"CLTgetScenario;"
]
[ "getInfo", "command", "clients",
"():bat[:str,:str] ",
"CLTInfo;"
]
@@ -1038,6 +1043,7 @@
[ "removeScenario", "command", "clients",
"(usr:str,sc:str):void ",
"CLTremoveScenario;"
]
[ "removeUser", "command", "clients",
"(nme:str):void ",
"CLTremoveUser;"
]
[ "setPassword", "command", "clients",
"(user:str,pass:str):void ",
"CLTsetPassword;"
]
+[ "shutdown", "command", "clients",
"(forced:bit):void ",
"CLTshutdown;"
]
[ "suspend", "command", "clients",
"(id:int):void ",
"CLTsuspend;"
]
[ "setScenario", "command", "clients",
"(msg:str):str ",
"CLTsetScenario;"
]
[ "setHistory", "command", "clients",
"(s:str):void ",
"CLTsetHistory;"
]
@@ -2024,6 +2030,7 @@
[ "toLower", "command", "batcalc",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLower;"
]
[ "unicodeAt", "command", "batcalc",
"(s:bat[:oid,:str],index:int):bat[:oid,:int] ",
"STRbatWChrAtcst;"
]
[ "unicodeAt", "command", "batcalc",
"(s:bat[:oid,:str],index:bat[:oid,:int]):bat[:oid,:int] ",
"STRbatWChrAt;"
]
+[ "xml", "command", "batcalc",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLstr2xml;"
]
[ "xor", "command", "batcalc",
"(b:bat[:oid,:lng],c:bat[:oid,:lng]):bat[:oid,:lng] ",
"CMDbatXOR_lng_lng_lng;"
]
[ "xor", "command", "batcalc",
"(cst:lng,b:bat[:oid,:lng]):bat[:oid,:lng] ",
"CMDcstXORbat_lng_lng_lng;"
]
[ "xor", "command", "batcalc",
"(b:bat[:oid,:lng],cst:lng):bat[:oid,:lng] ",
"CMDbatXORcst_lng_lng_lng;"
]
@@ -3236,6 +3243,8 @@
[ "void", "command", "calc",
"(v:sht):void ",
"CALCsht2void;"
]
[ "void", "command", "calc",
"(v:int):void ",
"CALCint2void;"
]
[ "void", "command", "calc",
"(v:void):void ",
"CALCnil2void;"
]
+[ "xml", "command", "calc",
"(src:xml):xml ",
"XMLxml2xml;"
]
+[ "xml", "command", "calc",
"(src:str):xml ",
"XMLstr2xml;"
]
[ "xor", "command", "calc",
"(left:lng,right:lng):lng ",
"CALCbinaryXORlnglng;"
]
[ "xor", "command", "calc",
"(left:int,right:int):int ",
"CALCbinaryXORintint;"
]
[ "xor", "command", "calc",
"(left:sht,right:sht):sht ",
"CALCbinaryXORshtsht;"
]
Index: xml00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml00.stable.out,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- xml00.stable.out 23 Aug 2007 13:33:19 -0000 1.2.2.2
+++ xml00.stable.out 6 Sep 2007 13:52:46 -0000 1.2.2.3
@@ -40,8 +40,8 @@
# h t # name
# void str # type
#-----------------------------------------#
-[ [EMAIL PROTECTED], "<!-- Mary Ann Walker -->" ]
-[ [EMAIL PROTECTED], "<!-- Annie Chapman -->" ]
+[ [EMAIL PROTECTED], <!-- Mary Ann Walker --> ]
+[ [EMAIL PROTECTED], <!-- Annie Chapman --> ]
# 22:46:59 >
# 22:46:59 > Done.
Index: xml02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml02.stable.out,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- xml02.stable.out 23 Aug 2007 13:33:30 -0000 1.2.2.2
+++ xml02.stable.out 6 Sep 2007 13:52:46 -0000 1.2.2.3
@@ -59,20 +59,20 @@
# h t # name
# void str # type
#-----------------------------------------#
-[ [EMAIL PROTECTED], " name=\"Mary Ann Walker\"" ]
-[ [EMAIL PROTECTED], " name=\"Annie Chapman\"" ]
+[ [EMAIL PROTECTED], name="Mary Ann Walker" ]
+[ [EMAIL PROTECTED], name="Annie Chapman" ]
#-----------------------------------------#
# h t # name
# void str # type
#-----------------------------------------#
-[ [EMAIL PROTECTED], " hair=\"brown\"" ]
-[ [EMAIL PROTECTED], " hair=\"curly dark brown\"" ]
-#-----------------------------------------------------------------#
+[ [EMAIL PROTECTED], hair="brown" ]
+[ [EMAIL PROTECTED], hair="curly dark brown" ]
+#---------------------------------------------------------#
# h t # name
-# void str # type
-#-----------------------------------------------------------------#
-[ [EMAIL PROTECTED], " name=\"Mary Ann Walker\" hair=\"brown\""
]
-[ [EMAIL PROTECTED], " name=\"Annie Chapman\" hair=\"curly dark brown\""
]
+# void xml # type
+#---------------------------------------------------------#
+[ [EMAIL PROTECTED], name="Mary Ann Walker" hair="brown" ]
+[ [EMAIL PROTECTED], name="Annie Chapman" hair="curly dark brown" ]
# 22:46:59 >
# 22:46:59 > Done.
Index: xml01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml01.stable.out,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- xml01.stable.out 23 Aug 2007 13:33:24 -0000 1.2.2.2
+++ xml01.stable.out 6 Sep 2007 13:52:46 -0000 1.2.2.3
@@ -40,8 +40,8 @@
# h t # name
# void str # type
#-----------------------------------------#
-[ [EMAIL PROTECTED], " name=\"Mary Ann Walker\"" ]
-[ [EMAIL PROTECTED], " name=\"Annie Chapman\"" ]
+[ [EMAIL PROTECTED], name="Mary Ann Walker" ]
+[ [EMAIL PROTECTED], name="Annie Chapman" ]
# 22:46:59 >
# 22:46:59 > Done.
Index: xml04.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml04.stable.out,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- xml04.stable.out 28 Aug 2007 13:15:42 -0000 1.1.2.3
+++ xml04.stable.out 6 Sep 2007 13:52:46 -0000 1.1.2.4
@@ -33,6 +33,7 @@
#as:= xml.str(aa);
#io.print(as);
#
+
function user.main():void; # 0 (main:void)
b := bat.new(:oid,:str); # 1 CMDBATnew
(b:bat[:oid,:str])<-(_2:oid)(_3:str)
bat.insert(b,[EMAIL PROTECTED],"Mary Ann Walker"); # 2 BKCinsert_bun
(_4:void)<-(b:bat[:oid,:str])(_5:oid)(_6:str)
@@ -61,22 +62,22 @@
[ [EMAIL PROTECTED], "Annie Chapman" ]
#-----------------------------------------#
# h t # name
-# void str # type
+# void xml # type
#-----------------------------------------#
-[ [EMAIL PROTECTED], "<name>Mary Ann Walker</name>" ]
-[ [EMAIL PROTECTED], "<name>Annie Chapman</name>" ]
-#-------------------------------------------------#
-# h t # name
-# void str # type
-#-------------------------------------------------#
-[ [EMAIL PROTECTED], "<hair>brown</hair>" ]
-[ [EMAIL PROTECTED], "<hair>curly dark brown</hair>" ]
+[ [EMAIL PROTECTED], <name>Mary Ann Walker</name> ]
+[ [EMAIL PROTECTED], <name>Annie Chapman</name> ]
+#-----------------------------------------#
+# h t # name
+# void xml # type
+#-----------------------------------------#
+[ [EMAIL PROTECTED], <hair>brown</hair> ]
+[ [EMAIL PROTECTED], <hair>curly dark brown</hair> ]
#-------------------------------------------------------------------------#
# h t # name
-# void str # type
+# void xml # type
#-------------------------------------------------------------------------#
-[ [EMAIL PROTECTED], "<name>Mary Ann Walker</name><hair>brown</hair>"
]
-[ [EMAIL PROTECTED], "<name>Annie Chapman</name><hair>curly dark
brown</hair>" ]
+[ [EMAIL PROTECTED], <name>Mary Ann Walker</name><hair>brown</hair>
]
+[ [EMAIL PROTECTED], <name>Annie Chapman</name><hair>curly dark
brown</hair> ]
# 23:16:03 >
# 23:16:03 > Done.
Index: xml03.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml03.stable.out,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- xml03.stable.out 28 Aug 2007 13:15:41 -0000 1.1.2.3
+++ xml03.stable.out 6 Sep 2007 13:52:46 -0000 1.1.2.4
@@ -64,22 +64,22 @@
[ [EMAIL PROTECTED], "Annie Chapman" ]
#-----------------------------------------#
# h t # name
-# void str # type
+# void xml # type
+#-----------------------------------------#
+[ [EMAIL PROTECTED], <name>Mary Ann Walker</name> ]
+[ [EMAIL PROTECTED], <name>Annie Chapman</name> ]
#-----------------------------------------#
-[ [EMAIL PROTECTED], "<name>Mary Ann Walker</name>" ]
-[ [EMAIL PROTECTED], "<name>Annie Chapman</name>" ]
-#-------------------------------------------------#
# h t # name
-# void str # type
-#-------------------------------------------------#
-[ [EMAIL PROTECTED], "<hair>brown</hair>" ]
-[ [EMAIL PROTECTED], "<hair>curly dark brown</hair>" ]
+# void xml # type
+#-----------------------------------------#
+[ [EMAIL PROTECTED], <hair>brown</hair> ]
+[ [EMAIL PROTECTED], <hair>curly dark brown</hair> ]
#-----------------------------------------------------------------------------------------#
# h t
# name
# void str
# type
#-----------------------------------------------------------------------------------------#
-[ [EMAIL PROTECTED], "<victim><name>Mary Ann
Walker</name><hair>brown</hair></victim>" ]
-[ [EMAIL PROTECTED], "<victim><name>Annie Chapman</name><hair>curly dark
brown</hair></victim>" ]
+[ [EMAIL PROTECTED], <victim><name>Mary Ann
Walker</name><hair>brown</hair></victim> ]
+[ [EMAIL PROTECTED], <victim><name>Annie Chapman</name><hair>curly dark
brown</hair></victim> ]
# 22:58:13 >
# 22:58:13 > Done.
Index: xml05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml05.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
--- xml05.stable.out 28 Aug 2007 13:15:46 -0000 1.1.2.2
+++ xml05.stable.out 6 Sep 2007 13:52:47 -0000 1.1.2.3
@@ -49,10 +49,10 @@
[ [EMAIL PROTECTED], "Annie Chapman" ]
#-----------------------------------------------------------------------------------------#
# h t
# name
-# void str
# type
-#-----------------------------------------------------------------------------------------#
-[ [EMAIL PROTECTED], "<? version=\"version1.0\"
stanalone=\"no\"?><name>Mary Ann Walker</name>" ]
-[ [EMAIL PROTECTED], "<? version=\"version1.0\"
stanalone=\"no\"?><name>Annie Chapman</name>" ]
+# void xml
# type
+#---------------------------------------------------------------------------------#
+[ [EMAIL PROTECTED], <? version="version1.0" stanalone="no"?><name>Mary
Ann Walker</name> ]
+[ [EMAIL PROTECTED], <? version="version1.0" stanalone="no"?><name>Annie
Chapman</name> ]
# 07:41:18 >
# 07:41:18 > Done.
-------------------------------------------------------------------------
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
