Update of /cvsroot/monetdb/MonetDB5/src/mal/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13193/src/mal/Tests
Modified Files:
tst3000.stable.out tst3010.stable.out tst3030.stable.out
tst3050.stable.out tst3060.stable.out
Log Message:
implemented a new property scheme
Index: tst3030.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3030.stable.out,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tst3030.stable.out 15 Dec 2006 08:27:45 -0000 1.23
+++ tst3030.stable.out 9 Dec 2007 16:21:07 -0000 1.24
@@ -34,10 +34,10 @@
#Parsing properties and keeping them around # 1 (_1:str)
# note the use of the first parameter to obtain property set # 2 (_2:str)
z := bat.new(:int,:int); # 3 CMDBATnew
(z:bat[:int,:int])<-(_4:int)(_4:int)
- w:bat[:int,:int]{dense=true,sorted=true} := bat.new(:int,:int); # 4
CMDBATnew (w:bat[:int,:int])<-(_4:int)(_4:int)
- w:bat[:int,:int]{dense=true,sorted=true} := bat.new(:int,:int); # 5
CMDBATnew (w:bat[:int,:int])<-(_4:int)(_4:int)
+ w:bat[:int,:int]{sorted=true,dense=true} := bat.new(:int,:int); # 4
CMDBATnew (w:bat[:int,:int])<-(_4:int)(_4:int)
+ w:bat[:int,:int]{sorted=true,dense=true} := bat.new(:int,:int); # 5
CMDBATnew (w:bat[:int,:int])<-(_4:int)(_4:int)
y:int{sorted=true} := algebra.sort(w); # 6 unknown
(y:int)<-(w:bat[:int,:int])
- io.print(1); # 7 IOprint_val (_7:void)<-(_8:int)
+ io.print(1); # 7 IOprint_val (_8:void)<-(_9:int)
y:int{sorted=true} := algebra.sort(w); # 8 unknown
(y:int)<-(w:bat[:int,:int])
end main; # 9
Index: tst3060.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3060.stable.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tst3060.stable.out 3 Dec 2006 22:42:07 -0000 1.2
+++ tst3060.stable.out 9 Dec 2007 16:21:08 -0000 1.3
@@ -18,7 +18,7 @@
# return tst:=a;
#end tst;
function user.tst(a:any_1{type="int,flt"}):any_1; # 0 dynamic
(tst:any_1)<-(a:any_1)
- io.print(a); # 1 IOprint_val (_2:void)<-(a:any_1)
+ io.print(a); # 1 IOprint_val (_3:void)<-(a:any_1)
return tst := a; # 2 (tst:any_1)<-(a:any_1)
end tst; # 3
#
Index: tst3050.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3050.stable.out,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- tst3050.stable.out 24 Jul 2006 05:56:01 -0000 1.16
+++ tst3050.stable.out 9 Dec 2007 16:21:08 -0000 1.17
@@ -16,12 +16,12 @@
#function
dummy(a:int{unsafe=true,sorted=true},b:int{sequence=true}):int{dense=true};
# return dummy:=1;
#end dummy;
-function
user.dummy{dense=true}(a:int{sorted=true,unsafe=true},b:int{sequence=true}):int;
# 0 (dummy:int)<-(a:int)(b:int)
- return dummy{dense=true} := 1; # 1 (dummy:int)<-(_3:int)
+function
user.dummy{dense=true}(a:int{unsafe=true,sorted=true},b:int{sequence=true}):int;
# 0 (dummy:int)<-(a:int)(b:int)
+ return dummy{dense=true} := 1; # 1 (dummy:int)<-(_4:int)
end dummy; # 2
#function myprint{unsafe,optimizer}():void;
#end myprint;
-function user.myprint{optimizer,unsafe}():void; # 0 (myprint:void)
+function user.myprint{unsafe,optimizer}():void; # 0 (myprint:void)
end myprint; # 1
#
#a:= 0;
@@ -36,7 +36,7 @@
a{sorted=true} := 0; # 2 (a:int)<-(_3:int)
b{sequence=true} := 2; # 3 (b:int)<-(_5:int)
t := user.dummy(a,b); # 4 (t:int)<-(a:int)(b:int)
- mdb.var("user","myprint"); # 5 MDBvar3 (_7:void)<-(_8:str)(_9:str)
+ mdb.var("user","myprint"); # 5 MDBvar3 (_8:void)<-(_9:str)(_10:str)
end main; # 6
#[0] myprint = nil:void {optimizer,unsafe}
Index: tst3000.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3000.stable.out,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tst3000.stable.out 15 Dec 2006 08:27:45 -0000 1.23
+++ tst3000.stable.out 9 Dec 2007 16:21:07 -0000 1.24
@@ -30,21 +30,21 @@
#
function user.main():void; # 0 (main:void)
# testing simple property assignments # 1 (_1:str)
- i{constant=true} := 1; # 2 (i:int)<-(_3:int)
- j{blah=3} := "kk"; # 3 (j:str)<-(_5:str)
- k{freeze=1,blah=4} := "whatever"; # 4 (k:str)<-(_7:str)
- n{cost=12} := bat.new(:int,:int); # 5 CMDBATnew
(n:bat[:int,:int])<-(_9:int)(_10:int)
- m{grp="person"} := bbp.take("person_name"); # 6 CMDbbptake
(m:bat[:any,:any])<-(_12:str)
- j{blah=3} := "ll"; # 7 (j:str)<-(_13:str)
-# second one overwrites first # 8 (_14:str)
- z{sorted} := bat.new(:int,:int); # 9 CMDBATnew
(z:bat[:int,:int])<-(_16:int)(_17:int)
-#q:= 1:int{frozen}; # 10 (_18:str)
-#Alternative format using post-predicates # 11 (_19:str)
-#default interpretation for i.prop is boolean value true # 12 (_20:str)
-# i:= 1; {i.constant:=true;} # 13 (_21:str)
-# j:= "kk"; {j.constant:=true;} # 14 (_22:str)
-# k:= "whatever"; {k.blah:=true;k.freeze:=true;} # 15 (_23:str)
-# n:= bat.new(int,int);{n.cost:=12;} # 16 (_24:str)
+ i{constant=true} := 1; # 2 (i:int)<-(_4:int)
+ j{blah=3} := "kk"; # 3 (j:str)<-(_7:str)
+ k{blah=4,freeze=1} := "whatever"; # 4 (k:str)<-(_10:str)
+ n{cost=12} := bat.new(:int,:int); # 5 CMDBATnew
(n:bat[:int,:int])<-(_13:int)(_14:int)
+ m{grp="person"} := bbp.take("person_name"); # 6 CMDbbptake
(m:bat[:any,:any])<-(_17:str)
+ j{blah=3} := "ll"; # 7 (j:str)<-(_19:str)
+# second one overwrites first # 8 (_20:str)
+ z{sorted} := bat.new(:int,:int); # 9 CMDBATnew
(z:bat[:int,:int])<-(_22:int)(_23:int)
+#q:= 1:int{frozen}; # 10 (_24:str)
+#Alternative format using post-predicates # 11 (_25:str)
+#default interpretation for i.prop is boolean value true # 12 (_26:str)
+# i:= 1; {i.constant:=true;} # 13 (_27:str)
+# j:= "kk"; {j.constant:=true;} # 14 (_28:str)
+# k:= "whatever"; {k.blah:=true;k.freeze:=true;} # 15 (_29:str)
+# n:= bat.new(int,int);{n.cost:=12;} # 16 (_30:str)
end main; # 17
!MALException:bbp.take:failed to take object from box
Index: tst3010.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3010.stable.out,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tst3010.stable.out 24 Jul 2006 05:56:01 -0000 1.14
+++ tst3010.stable.out 9 Dec 2007 16:21:07 -0000 1.15
@@ -17,7 +17,7 @@
# j:= j+i;
# return j;
#end add;
-function user.add{safe,writeable}(i:int{readonly},j:int{readonly}):int;
# 0 (add:int)<-(i:int)(j:int)
+function user.add{writeable,safe}(i:int{readonly},j:int{readonly}):int;
# 0 (add:int)<-(i:int)(j:int)
j{readonly} := calc.+(j,i); # 1 CALCbinaryADDintint
(j:int)<-(j:int)(i:int)
return j{readonly}; # 2 (j:int)
end add; # 3
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
