Changeset: 260b1cf76741 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=260b1cf76741
Modified Files:
monetdb5/mal/Tests/tst013.stable.out
monetdb5/mal/Tests/tst036.stable.out
monetdb5/mal/Tests/tst050.stable.out
monetdb5/mal/Tests/tst070.stable.out
monetdb5/mal/Tests/tst105.stable.out
monetdb5/mal/Tests/tst106.stable.out
monetdb5/mal/Tests/tst150.stable.out
monetdb5/mal/Tests/tst2504.mal
monetdb5/mal/Tests/tst2504.stable.out
monetdb5/mal/Tests/tst611.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
Branch: Jan2014
Log Message:
Approve output after change of handling MAL errors
diffs (190 lines):
diff --git a/monetdb5/mal/Tests/tst013.stable.out
b/monetdb5/mal/Tests/tst013.stable.out
--- a/monetdb5/mal/Tests/tst013.stable.out
+++ b/monetdb5/mal/Tests/tst013.stable.out
@@ -34,7 +34,7 @@ stdout of test 'tst013` in directory 'mo
function user.main():void;
# incomplete barrier blocks. Resolve them when unambigous
barrier z := true;
- leave X_4;
+ leave ;
exit z;
barrier i := 1;
i := calc.+(i,1);
diff --git a/monetdb5/mal/Tests/tst036.stable.out
b/monetdb5/mal/Tests/tst036.stable.out
--- a/monetdb5/mal/Tests/tst036.stable.out
+++ b/monetdb5/mal/Tests/tst036.stable.out
@@ -16,8 +16,6 @@ stdout of test 'tst036` in directory 'mo
# MonetDB/SQL module v2.39.0 loaded
# MonetDB/GIS module v0.19.0 loaded
!TypeException:user.main[6]:Multiple assignment mismatch
-!TypeException:user.main[7]:Multiple assignment mismatch
-!TypeException:user.main[8]:Multiple assignment mismatch
function user.main():void;
# test for proper use of list assignments
(z0,z1) := (1,"help");
diff --git a/monetdb5/mal/Tests/tst050.stable.out
b/monetdb5/mal/Tests/tst050.stable.out
--- a/monetdb5/mal/Tests/tst050.stable.out
+++ b/monetdb5/mal/Tests/tst050.stable.out
@@ -28,10 +28,6 @@ stdout of test 'tst050` in directory 'mo
#f:flt := "wrong";
#
!TypeException:user.main[9]:type mismatch sht := lng
-
-!TypeException:user.main[10]:type mismatch lng := sht
-!TypeException:user.main[11]:'bat.new' undefined in: y:bat[:oid,:str] :=
bat.new(_11:oid, _12:int)
-!TypeException:user.main[12]:type mismatch flt := str
function user.main():void;
# Variables names may be tagged with a type upfront.
# They may be initialized with a lexical constant using
diff --git a/monetdb5/mal/Tests/tst070.stable.out
b/monetdb5/mal/Tests/tst070.stable.out
--- a/monetdb5/mal/Tests/tst070.stable.out
+++ b/monetdb5/mal/Tests/tst070.stable.out
@@ -12,7 +12,6 @@ stdout of test 'tst070` in directory 'mo
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33085/
!TypeException:user.foo[1]:'user.point' undefined in: (x:any, y:any) :=
user.point(_3:int)
-!TypeException:user.foo[2]:'user.getName' undefined in: (initial:str,
surname:str) := user.getName()
function user.foo():void;
(x,y) := user.point(1);
(initial:str ,surname:str ) := user.getName();
diff --git a/monetdb5/mal/Tests/tst105.stable.out
b/monetdb5/mal/Tests/tst105.stable.out
--- a/monetdb5/mal/Tests/tst105.stable.out
+++ b/monetdb5/mal/Tests/tst105.stable.out
@@ -15,8 +15,6 @@ stdout of test 'tst105` in directory 'mo
command bat2.new(h:any_1,t:any_2):bat[:any_1,:any_2] address GDKbatnew;
!TypeException:user.main[3]:object code for command bat2.new missing
!TypeException:user.main[3]:'bat2.new' undefined in: a:bat[:oid,:int] :=
bat2.new(_4:oid, _5:int)
-!TypeException:user.main[4]:object code for command bat2.new missing
-!TypeException:user.main[4]:'bat2.new' undefined in: b:bat[:oid,:int] :=
bat2.new(_4:oid, _5:int)
function user.main():void;
# check propagation of type variables over bats
# can be checked after bat module has been added
diff --git a/monetdb5/mal/Tests/tst106.stable.out
b/monetdb5/mal/Tests/tst106.stable.out
--- a/monetdb5/mal/Tests/tst106.stable.out
+++ b/monetdb5/mal/Tests/tst106.stable.out
@@ -18,8 +18,6 @@ command user.f(a:any_1,b:any_2,c:any_1):
#a:= f(1,2,1);
#
!TypeException:user.main[2]:'user.f' undefined in: b:any := user.f(_3:int,
_4:int, _5:str)
-!TypeException:user.main[3]:object code for command user.f missing
-!TypeException:user.main[3]:'user.f' undefined in: a:bat[:int,:int] :=
user.f(_3:int, _4:int, _3:int)
function user.main():void;
# check in-compatible polmorphic types
b := user.f(1,2,"help");
diff --git a/monetdb5/mal/Tests/tst150.stable.out
b/monetdb5/mal/Tests/tst150.stable.out
--- a/monetdb5/mal/Tests/tst150.stable.out
+++ b/monetdb5/mal/Tests/tst150.stable.out
@@ -27,8 +27,6 @@ end sample;
#user.sample("hello",1);
#
!TypeException:user.main[1]:'user.sample' undefined in: _1:bit :=
user.sample(_2:str, _3:str)
-
-!TypeException:user.main[2]:'user.sample' undefined in: _4:bit :=
user.sample(_2:str, _5:int)
function user.main():void;
user.sample("hello","world");
user.sample("hello",1);
diff --git a/monetdb5/mal/Tests/tst2504.mal b/monetdb5/mal/Tests/tst2504.mal
--- a/monetdb5/mal/Tests/tst2504.mal
+++ b/monetdb5/mal/Tests/tst2504.mal
@@ -10,6 +10,7 @@ factory random(seed:int):int;
i:= 125 *i;
i:= i % 32767;
yield i;
+ return random:=0;
end random;
r1:= user.random(1);
diff --git a/monetdb5/mal/Tests/tst2504.stable.out
b/monetdb5/mal/Tests/tst2504.stable.out
--- a/monetdb5/mal/Tests/tst2504.stable.out
+++ b/monetdb5/mal/Tests/tst2504.stable.out
@@ -9,10 +9,14 @@ stdout of test 'tst2504` in directory 'm
# Serving database 'mTests_src_mal', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34870/
-!SyntaxException:user.random[0]:RETURN missing
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:34673/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21340/.s.monetdb.34673
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
factory user.random(seed:int):int;
random := seed;
i := seed;
@@ -22,11 +26,8 @@ factory user.random(seed:int):int;
i := calc.*(125,i);
i := calc.%(i,32767);
yield random := i;
+ return random := 0;
end random;
-!TypeException:user.main[3]:'user.random' undefined in: r1:int :=
user.random(_4:int)
-!TypeException:user.main[5]:'user.random' undefined in: r2:int :=
user.random(_4:int)
-!TypeException:user.main[7]:'user.random' undefined in: r2:int :=
user.random(_4:int)
-!TypeException:user.main[9]:'user.random' undefined in: r2:int :=
user.random(_4:int)
function user.main():void;
# The prototypical factory construct
# test factory return and restart
@@ -39,6 +40,10 @@ function user.main():void;
r2 := user.random(1);
io.print(r2);
end main;
+[ 125 ]
+[ 15625 ]
+[ 0 ]
+[ 125 ]
# 08:01:06 >
# 08:01:06 > Done.
diff --git a/monetdb5/mal/Tests/tst611.stable.out
b/monetdb5/mal/Tests/tst611.stable.out
--- a/monetdb5/mal/Tests/tst611.stable.out
+++ b/monetdb5/mal/Tests/tst611.stable.out
@@ -22,7 +22,6 @@ stdout of test 'tst611` in directory 'mo
#setWriteMode(RKB);
#
!TypeException:user.main[7]:'bat.setWriteMode' undefined in: _11:any :=
bat.setWriteMode(RKB:any)
-!TypeException:user.main[7]:'RKB' may not be used before being initialized
function user.main():void;
# initialization of BATs on the stack
# caused a problem when executed in interactve mode
diff --git a/monetdb5/optimizer/Tests/inline08.stable.out
b/monetdb5/optimizer/Tests/inline08.stable.out
--- a/monetdb5/optimizer/Tests/inline08.stable.out
+++ b/monetdb5/optimizer/Tests/inline08.stable.out
@@ -39,8 +39,8 @@ end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
b := bat.new(:oid,:str); # 1 b:bat[:oid,:str] :=
CMDBATnew(_2:oid, _3:str) {G}
bat.insert(b,0@0,1); # 2 _4:any :=
bat.insert(b:bat[:oid,:str], _5:oid, _6:int) {U}
- z:bat[:oid,:str] := mal.multiplex("user","bar",b,b);# 3 z:bat[:oid,:str]
:= OPTremapMultiplex(_8:str, _9:str, b:bat[:oid,:str], b:bat[:oid,:str]) {G}
-end qry; # 4
+ z:bat[:oid,:str] := mal.multiplex("user","bar",b,b);# 3 z:bat[:oid,:str]
:= mal.multiplex(_8:str, _9:str, b:bat[:oid,:str], b:bat[:oid,:str]) {U}
+end qry; # 4 {U}
# 20:02:17 >
# 20:02:17 > Done.
diff --git
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
---
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
+++
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out
@@ -12,8 +12,6 @@ stdout of test 'ADT_not_available.SF-850
#u := url.new(void,url);
#
!TypeException:user.main[1]:'url.new' undefined in: u:any := url.new(void:any,
url:any)
-!TypeException:user.main[1]:'void' may not be used before being initialized
-!TypeException:user.main[1]:'url' may not be used before being initialized
function user.main():void;
u := url.new(void,url);
end main;
diff --git a/monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
b/monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
--- a/monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
+++ b/monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out
@@ -15,7 +15,6 @@ stdout of test 'lngssaretruncated` in di
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33397/
!SyntaxException:convertConstant:integer parse error
!TypeException:user.main[6]:'calc.:' undefined in: l:any := calc.:(s:str,
lng:any)
-!TypeException:user.main[6]:'lng' may not be used before being initialized
function user.main():void;
# observed 14-08-2008: the parser already truncates e in the parsed
# program, additionally, l is not a lng, but a string.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
