Update of /cvsroot/monetdb/MonetDB5/src/mal/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32017
Modified Files:
tst019.stable.out tst071.stable.out tst074.stable.out
tst075.stable.out tst077.stable.out tst115.stable.out
tst120b.stable.out tst220.stable.out tst234.stable.out
tst235.stable.out tst236.stable.out tst2500.stable.out
tst2502.stable.out tst2503.stable.out tst2504.stable.out
tst2505.stable.out tst2510.stable.out tst2560.stable.out
tst280.stable.out tst3010.stable.out tst400e.stable.out
tst500.stable.out tst501.stable.out tst606.stable.out
tst802.stable.out tst907.stable.out
Log Message:
Approval of normalized RETURN/YIELD statements
Index: tst2502.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2502.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tst2502.stable.out 3 Dec 2006 22:42:07 -0000 1.12
+++ tst2502.stable.out 25 Dec 2007 13:12:41 -0000 1.13
@@ -29,7 +29,7 @@
barrier always := true; # 2 (always:bit)<-(_4:bit) jump 7
i := calc.*(125,i); # 3 CALCbinaryMULintint (i:int)<-(_5:int)(i:int)
i := calc.%(i,32767); # 4 CALCbinarycheckMODintint
(i:int)<-(i:int)(_6:int)
- yield i; # 5 (i:int)
+ yield random := i; # 5 (random:int)<-(i:int)
redo always; # 6 (always:bit) jump 3
exit always; # 7 (always:bit)
return random := 0; # 8 (random:int)<-(_7:int)
Index: tst115.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst115.stable.out,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tst115.stable.out 15 Dec 2006 08:27:45 -0000 1.18
+++ tst115.stable.out 25 Dec 2007 13:12:41 -0000 1.19
@@ -24,7 +24,7 @@
#end doitOnce;
function user.doitOnce():int; # 0 (doitOnce:int)
z := 12; # 1 (z:int)<-(_2:int)
- return z; # 2 (z:int)
+ return doitOnce := z; # 2 (doitOnce:int)<-(z:int)
end doitOnce; # 3
#
#function doitTwice(i:int):int;
@@ -37,7 +37,7 @@
j := 2; # 1 (j:int)<-(_3:int)
k := 11111; # 2 (k:int)<-(_5:int)
i := calc.+(j,k); # 3 CALCbinaryADDintint (i:int)<-(j:int)(k:int)
- return i; # 4 (i:int)
+ return doitTwice := i; # 4 (doitTwice:int)<-(i:int)
end doitTwice; # 5
#
#
Index: tst501.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst501.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tst501.stable.out 2 Dec 2005 22:57:25 -0000 1.8
+++ tst501.stable.out 25 Dec 2007 13:12:41 -0000 1.9
@@ -21,7 +21,7 @@
#end simple;
function user.simple(i:int):int; # 0 (simple:int)<-(i:int)
i := calc.+(i,1); # 1 CALCbinaryADDintint (i:int)<-(i:int)(_2:int)
- return i; # 2 (i:int)
+ return simple := i; # 2 (simple:int)<-(i:int)
end simple; # 3
#
#k:= 0;
Index: tst400e.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst400e.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tst400e.stable.out 6 May 2007 11:57:30 -0000 1.4
+++ tst400e.stable.out 25 Dec 2007 13:12:41 -0000 1.5
@@ -19,7 +19,7 @@
#end simple;
function user.simple(z:lng):lng; # 0 (simple:lng)<-(z:lng)
z := calc.+(z,1:lng); # 1 CALCbinaryADDlnglng (z:lng)<-(z:lng)(_2:lng)
- return z; # 2 (z:lng)
+ return simple := z; # 2 (simple:lng)<-(z:lng)
end simple; # 3
#
# k:= 0:lng;
Index: tst907.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst907.stable.out,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- tst907.stable.out 9 Dec 2006 18:32:08 -0000 1.24
+++ tst907.stable.out 25 Dec 2007 13:12:41 -0000 1.25
@@ -18,7 +18,7 @@
#end one;
function user.one(base:int):int; # 0 (one:int)<-(base:int)
io.print(base); # 1 IOprint_val (_2:void)<-(base:int)
- return base; # 2 (base:int)
+ return one := base; # 2 (one:int)<-(base:int)
end one; # 3
#
#function three(base:int,x:int,y:int):int;
@@ -27,7 +27,7 @@
#end three;
function user.three(base:int,x:int,y:int):int; # 0
(three:int)<-(base:int)(x:int)(y:int)
io.print(base); # 1 IOprint_val (_4:void)<-(base:int)
- return base; # 2 (base:int)
+ return three := base; # 2 (three:int)<-(base:int)
end three; # 3
#function pow(base:int,raise:int):int;
# mg_a := calc.dbl(base);
@@ -41,7 +41,7 @@
ng_a := calc.dbl(raise); # 2 CALCint2dbl (ng_a:dbl)<-(raise:int)
og_a := calc.*(mg_a,ng_a); # 3 CALCbinaryMULdbldbl
(og_a:dbl)<-(mg_a:dbl)(ng_a:dbl)
pg_a := calc.int(og_a); # 4 CALCdbl2int (pg_a:int)<-(og_a:dbl)
- return pg_a; # 5 (pg_a:int)
+ return pow := pg_a; # 5 (pow:int)<-(pg_a:int)
end pow; # 6
#k:=one(1);
#l:=three(1,2,3);
Index: tst235.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst235.stable.out,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tst235.stable.out 14 May 2007 16:39:42 -0000 1.7
+++ tst235.stable.out 25 Dec 2007 13:12:41 -0000 1.8
@@ -45,7 +45,7 @@
# now res should have 3 lrefs # 5 (_7:str)
z := bbp.getLRefCount(res); # 6 CMDgetBATlrefcnt
(z:int)<-(res:bat[:int,:int])
io.print(z); # 7 IOprint_val (_9:void)<-(z:int)
- return i; # 8 (i:BAT)
+ return createBAT := i; # 8 (createBAT:BAT)<-(i:BAT)
end createBAT; # 9
#
#dir();
Index: tst802.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst802.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tst802.stable.out 14 May 2007 17:00:23 -0000 1.8
+++ tst802.stable.out 25 Dec 2007 13:12:41 -0000 1.9
@@ -17,7 +17,7 @@
# return b;
#end tst;
function user.tst(b:bat[:any_1,:any_2]):BAT; # 0
(tst:BAT)<-(b:bat[:any_1,:any_2])
- return b; # 1 (b:bat[:any_1,:any_2])
+ return tst := b; # 1 (tst:BAT)<-(b:bat[:any_1,:any_2])
end tst; # 2
#
#z:= bat.new(:int,:int);
Index: tst071.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst071.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tst071.stable.out 15 Dec 2006 08:27:45 -0000 1.12
+++ tst071.stable.out 25 Dec 2007 13:12:40 -0000 1.13
@@ -21,7 +21,7 @@
function user.swap(x:int,y:int) (a:int,b:int); # 0
(a:int)(b:int)<-(x:int)(y:int)
a := y; # 1 (a:int)<-(y:int)
b := x; # 2 (b:int)<-(x:int)
- return (a,b); # 3 (a:int)(b:int)
+ return (a,b):= (a,b); # 3 (a:int)(b:int)<-(a:int)(b:int)
end swap; # 4
#
#(x,y):= swap(1,2);
Index: tst220.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst220.stable.out,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- tst220.stable.out 14 May 2007 16:39:41 -0000 1.33
+++ tst220.stable.out 25 Dec 2007 13:12:41 -0000 1.34
@@ -29,7 +29,7 @@
loc := bb; # 3 (loc:bat[:any_1,:any_2])<-(bb:bat[:any_1,:any_2])
i := bbp.getLRefCount(bb); # 4 CMDgetBATlrefcnt
(i:int)<-(bb:bat[:any_1,:any_2])
io.printf("local in function refcount =%d[3,4]\n",i); # 5
IOprint_formatted_int (_6:void)<-(_7:str)(i:int)
- return bb; # 6 (bb:bat[:any_1,:any_2])
+ return steal := bb; # 6
(steal:bat[:any_1,:any_2])<-(bb:bat[:any_1,:any_2])
end steal; # 7
#
#function createone():bat[:int,:str];
@@ -38,7 +38,7 @@
#end createone;
function user.createone():bat[:int,:str]; # 0 (createone:bat[:int,:str])
b := bat.new(:int,:str); # 1 CMDBATnew
(b:bat[:int,:str])<-(_2:int)(_3:str)
- return b; # 2 (b:bat[:int,:str])
+ return createone := b; # 2
(createone:bat[:int,:str])<-(b:bat[:int,:str])
end createone; # 3
#
# b:= bbp.new(:int,:str);
Index: tst500.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst500.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tst500.stable.out 3 Dec 2006 22:42:07 -0000 1.11
+++ tst500.stable.out 25 Dec 2007 13:12:41 -0000 1.12
@@ -34,7 +34,7 @@
z := user.simple(i,lim,s); # 6 (z:flt)<-(i:int)(lim:int)(s:str)
exit v; # 7 (v:bit)
r := 3.1400001:flt; # 8 (r:flt)<-(_14:flt)
- return r; # 9 (r:flt)
+ return simple := r; # 9 (simple:flt)<-(r:flt)
end simple; # 10
#
#r:= simple(0,2,"hello");
Index: tst234.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst234.stable.out,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tst234.stable.out 14 May 2007 16:39:42 -0000 1.7
+++ tst234.stable.out 25 Dec 2007 13:12:41 -0000 1.8
@@ -40,7 +40,7 @@
io.print("inside tmp1"); # 2 IOprint_val (_2:void)<-(_3:str)
i := bbp.getLRefCount(b); # 3 CMDgetBATlrefcnt
(i:int)<-(b:bat[:any_1,:any_2])
io.print(i); # 4 IOprint_val (_5:void)<-(i:int)
- return tmp1; # 5 (tmp1:bat[:any_1,:any_2])
+ return tmp1 := tmp1; # 5
(tmp1:bat[:any_1,:any_2])<-(tmp1:bat[:any_1,:any_2])
end tmp1; # 6
#
#b:= bat.new(:int,:int);
Index: tst077.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst077.stable.out,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tst077.stable.out 3 Dec 2006 22:42:06 -0000 1.18
+++ tst077.stable.out 25 Dec 2007 13:12:41 -0000 1.19
@@ -20,7 +20,7 @@
#end swap;
function user.swap(x:bat[:any_1,:int],y:bat[:int,:int])
(a:str,b:bat[:any_1,:int]); # 0
(a:str)(b:bat[:any_1,:int])<-(x:bat[:any_1,:int])(y:bat[:int,:int])
a := "done"; # 1 (a:str)<-(_5:str)
- return (a,x); # 2 (a:str)(x:bat[:any_1,:int])
+ return (a,b):= (a,x); # 2
(a:str)(b:bat[:any_1,:int])<-(a:str)(x:bat[:any_1,:int])
end swap; # 3
#
#X:= new(:int,:int);
Index: tst236.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst236.stable.out,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- tst236.stable.out 14 May 2007 16:39:42 -0000 1.16
+++ tst236.stable.out 25 Dec 2007 13:12:41 -0000 1.17
@@ -35,7 +35,7 @@
res := bat.new(:int,:int); # 1 CMDBATnew
(res:bat[:int,:int])<-(_3:int)(_3:int)
bat.setName(res,name); # 2 BKCsetName
(_4:void)<-(res:bat[:int,:int])(name:str)
i := calc.getBATidentifier(res); # 3 CALCbat2batid
(i:BAT)<-(res:bat[:int,:int])
- return i; # 4 (i:BAT)
+ return createBAT := i; # 4 (createBAT:BAT)<-(i:BAT)
end createBAT; # 5
#m:= bat.new(:oid,:str);
#bat.insert(m,10:oid,"ten");
Index: tst2504.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2504.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tst2504.stable.out 3 Dec 2006 22:42:07 -0000 1.10
+++ tst2504.stable.out 25 Dec 2007 13:12:41 -0000 1.11
@@ -30,10 +30,10 @@
i := seed; # 2 (i:int)<-(seed:int)
i := calc.*(125,i); # 3 CALCbinaryMULintint (i:int)<-(_3:int)(i:int)
i := calc.%(i,32767); # 4 CALCbinarycheckMODintint
(i:int)<-(i:int)(_4:int)
- yield i; # 5 (i:int)
+ yield random := i; # 5 (random:int)<-(i:int)
i := calc.*(125,i); # 6 CALCbinaryMULintint (i:int)<-(_3:int)(i:int)
i := calc.%(i,32767); # 7 CALCbinarycheckMODintint
(i:int)<-(i:int)(_4:int)
- yield i; # 8 (i:int)
+ yield random := i; # 8 (random:int)<-(i:int)
end random; # 9
#
#r1:= random(1);
Index: tst2500.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2500.stable.out,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tst2500.stable.out 13 Sep 2007 06:32:23 -0000 1.13
+++ tst2500.stable.out 25 Dec 2007 13:12:41 -0000 1.14
@@ -30,7 +30,7 @@
barrier always := true; # 3 (always:bit)<-(_3:bit) jump 8
i := calc.*(125,i); # 4 CALCbinaryMULintint (i:int)<-(_6:int)(i:int)
i := calc.%(i,32767); # 5 CALCbinarycheckMODintint
(i:int)<-(i:int)(_7:int)
- yield i; # 6 (i:int)
+ yield random := i; # 6 (random:int)<-(i:int)
redo always; # 7 (always:bit) jump 4
exit always; # 8 (always:bit)
return random := 0; # 9 (random:int)<-(_8:int)
Index: tst3010.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst3010.stable.out,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- tst3010.stable.out 9 Dec 2007 16:21:07 -0000 1.15
+++ tst3010.stable.out 25 Dec 2007 13:12:41 -0000 1.16
@@ -19,7 +19,7 @@
#end add;
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)
+ return add{writeable,safe} := j; # 2 (add:int)<-(j:int)
end add; # 3
#
#function add2(i:int,j:int):int{safe};
@@ -28,7 +28,7 @@
#end ;
function user.add2{safe}(i:int,j:int):int; # 0 (add2:int)<-(i:int)(j:int)
k := calc.+(j,i); # 1 CALCbinaryADDintint (k:int)<-(j:int)(i:int)
- return k; # 2 (k:int)
+ return add2{safe} := k; # 2 (add2:int)<-(k:int)
end add2; # 3
#
#i{cost=23}:= 23;
Index: tst120b.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst120b.stable.out,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tst120b.stable.out 25 Aug 2005 21:51:49 -0000 1.5
+++ tst120b.stable.out 25 Dec 2007 13:12:41 -0000 1.6
@@ -16,7 +16,7 @@
#function first(i:str):int; c:=1; return c; end first;
function bottom.first(i:str):int; # 0 (first:int)<-(i:str)
c := 1; # 1 (c:int)<-(_3:int)
- return c; # 2 (c:int)
+ return first := c; # 2 (first:int)<-(c:int)
end first; # 3
#function second(i:str):int; return second:=1; end second;
function bottom.second(i:str):int; # 0 (second:int)<-(i:str)
Index: tst2510.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2510.stable.out,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tst2510.stable.out 15 Dec 2006 08:27:45 -0000 1.25
+++ tst2510.stable.out 25 Dec 2007 13:12:41 -0000 1.26
@@ -29,7 +29,7 @@
factory user.tryme():bit; # 0 (tryme:bit)
bat.setWriteMode(b); # 1 BKCsetWriteMode
(_1:bat[:any,:any])<-(b:bat[:any_1,:any_2])
barrier always := true; # 2 (always:bit)<-(_4:bit) jump 5
- yield always; # 3 (always:bit)
+ yield tryme := always; # 3 (tryme:bit)<-(always:bit)
redo always; # 4 (always:bit) jump 3
exit always; # 5 (always:bit)
#catch MALException; # 6 (_5:str)
Index: tst2560.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2560.stable.out,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tst2560.stable.out 12 Oct 2007 17:40:05 -0000 1.6
+++ tst2560.stable.out 25 Dec 2007 13:12:41 -0000 1.7
@@ -57,7 +57,7 @@
c := algebra.select(a,l,h); # 7 ALGselect
(c:bat[:oid,:int])<-(a:bat[:oid,:int])(l:int)(h:int)
d := algebra.semijoin(b,c); # 8 ALGsemijoin
(d:bat[:oid,:str])<-(b:bat[:oid,:str])(c:bat[:oid,:int])
barrier available := true; # 9 (available:bit)<-(_9:bit) jump 15
- yield d; # 10 (d:bat[:oid,:str])
+ yield view1 := d; # 10 (view1:bat[:oid,:str])<-(d:bat[:oid,:str])
leave available := calc.!=(lOld,l); # 11 CALCcompNEQintint
(available:bit)<-(lOld:int)(l:int) jump 15
leave available := calc.!=(hOld,h); # 12 CALCcompNEQintint
(available:bit)<-(hOld:int)(h:int) jump 15
io.print("reuse"); # 13 IOprint_val (_17:void)<-(_18:str)
Index: tst280.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst280.stable.out,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tst280.stable.out 28 Dec 2006 22:16:10 -0000 1.23
+++ tst280.stable.out 25 Dec 2007 13:12:41 -0000 1.24
@@ -20,7 +20,7 @@
function user.pow(i:int,j:int):int; # 0 (pow:int)<-(i:int)(j:int)
z := calc.+(i,j); # 1 CALCbinaryADDintint (z:int)<-(i:int)(j:int)
io.printf("result %d\n",z); # 2 IOprint_formatted_int
(_4:void)<-(_5:str)(z:int)
- return z; # 3 (z:int)
+ return pow := z; # 3 (pow:int)<-(z:int)
end pow; # 4
#function tst(A2:bat[:void,:int],A3:bat[:void,:int]):bat[:void,:int];
# print(A2);
@@ -62,7 +62,7 @@
catch MALException:str ; # 15 (MALException:str) jump 16
exit MALException:str ; # 16 (MALException:str)
exit (mloop,m); # 17 (mloop:bit)(m:lng)
- return resB; # 18 (resB:bat[:oid,:int])
+ return tst := resB; # 18
(tst:bat[:oid,:int])<-(resB:bat[:oid,:int])
end tst; # 19
#
#
Index: tst606.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst606.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tst606.stable.out 15 Dec 2006 08:27:45 -0000 1.12
+++ tst606.stable.out 25 Dec 2007 13:12:41 -0000 1.13
@@ -47,7 +47,7 @@
function constants.take(v:str):any_1; # 0 dynamic (take:any_1)<-(v:str)
io.printf("looking for %s\n",v); # 1 IOprint_formatted_str
(_2:void)<-(_3:str)(v:str)
w := constants.take(v); # 2 (w:any)<-(v:str)
- return w; # 3 (w:any)
+ return take := w; # 3 (take:any_1)<-(w:any)
end take; # 4
#
## release is overloaded for testing only
Index: tst2503.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2503.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tst2503.stable.out 3 Dec 2006 22:42:07 -0000 1.11
+++ tst2503.stable.out 25 Dec 2007 13:12:41 -0000 1.12
@@ -28,7 +28,7 @@
barrier always := true; # 2 (always:bit)<-(_4:bit) jump 7
i := calc.*(125,i); # 3 CALCbinaryMULintint (i:int)<-(_5:int)(i:int)
i := calc.%(i,32767); # 4 CALCbinarycheckMODintint
(i:int)<-(i:int)(_6:int)
- yield i; # 5 (i:int)
+ yield random := i; # 5 (random:int)<-(i:int)
redo always; # 6 (always:bit) jump 3
exit always; # 7 (always:bit)
return random := 0; # 8 (random:int)<-(_7:int)
Index: tst075.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst075.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tst075.stable.out 3 Dec 2006 22:42:06 -0000 1.9
+++ tst075.stable.out 25 Dec 2007 13:12:40 -0000 1.10
@@ -21,7 +21,7 @@
function user.swap(x:str,y:str) (a:str,b:str); # 0
(a:str)(b:str)<-(x:str)(y:str)
a := y; # 1 (a:str)<-(y:str)
b := x; # 2 (b:str)<-(x:str)
- return (a,b); # 3 (a:str)(b:str)
+ return (a,b):= (a,b); # 3 (a:str)(b:str)<-(a:str)(b:str)
end swap; # 4
#
#(x,y):= swap("world","hello");
Index: tst019.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst019.stable.out,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- tst019.stable.out 15 Dec 2006 08:59:19 -0000 1.21
+++ tst019.stable.out 25 Dec 2007 13:12:40 -0000 1.22
@@ -17,13 +17,12 @@
# w:="hello";
# return w; # should produce a type error
#end welcome;
-!TypeException:user.welcome[3]:RETURN type mismatch at type 13
function user.welcome(lim:int):void; # 0 (welcome:void)<-(lim:int)
i := 2; # 1 (i:int)<-(_3:int)
w := "hello"; # 2 (w:str)<-(_5:str)
- return w; # 3 (w:str)
-# should produce a type error # 4 (_7:str)
+ return welcome := w; # 3 unknown (welcome:void)<-(w:str)
+# should produce a type error # 4 (_6:str)
end welcome; # 5
#
#function welcome0(lim:int):str;
@@ -36,8 +35,8 @@
function user.welcome0(lim:int):str; # 0 (welcome0:str)<-(lim:int)
i := 2; # 1 (i:int)<-(_3:int)
w := "hello"; # 2 (w:str)<-(_5:str)
- return (w,i); # 3 (w:str)(i:int)
-# should produce a type error # 4 (_7:str)
+ return (welcome0,lim):= (w,i); # 3
(welcome0:str)(lim:int)<-(w:str)(i:int)
+# should produce a type error # 4 (_6:str)
end welcome0; # 5
#
#function welcome1(lim:int):str;
@@ -57,7 +56,7 @@
function user.welcome2(lim:int):str; # 0 (welcome2:str)<-(lim:int)
i := 2; # 1 (i:int)<-(_3:int)
w := "hello"; # 2 (w:str)<-(_5:str)
- return w; # 3 (w:str)
+ return welcome2 := w; # 3 (welcome2:str)<-(w:str)
end welcome2; # 4
#
#function welcome3(lim:int)(w:str,i:int);
Index: tst074.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst074.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tst074.stable.out 3 Dec 2006 22:42:06 -0000 1.9
+++ tst074.stable.out 25 Dec 2007 13:12:40 -0000 1.10
@@ -17,7 +17,7 @@
# return x;
#end swap;
function user.swap(x:str):str; # 0 (swap:str)<-(x:str)
- return x; # 1 (x:str)
+ return swap := x; # 1 (swap:str)<-(x:str)
end swap; # 2
#
#x:= swap("world hello");
Index: tst2505.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst2505.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tst2505.stable.out 3 Dec 2006 22:42:07 -0000 1.10
+++ tst2505.stable.out 25 Dec 2007 13:12:41 -0000 1.11
@@ -28,10 +28,10 @@
i := seed; # 1 (i:int)<-(seed:int)
i := calc.*(125,i); # 2 CALCbinaryMULintint (i:int)<-(_3:int)(i:int)
i := calc.%(i,32767); # 3 CALCbinarycheckMODintint
(i:int)<-(i:int)(_4:int)
- yield i; # 4 (i:int)
+ yield random := i; # 4 (random:int)<-(i:int)
i := calc.*(125,i); # 5 CALCbinaryMULintint (i:int)<-(_3:int)(i:int)
i := calc.%(i,32767); # 6 CALCbinarycheckMODintint
(i:int)<-(i:int)(_4:int)
- return i; # 7 (i:int)
+ return random := i; # 7 (random:int)<-(i:int)
end random; # 8
#
#r1:= random(1);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
