Changeset: c1c8468d5b9e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1c8468d5b9e Modified Files: MonetDB5/src/mal/Tests/dynamicload.stable.out MonetDB5/src/mal/Tests/tst104.stable.out MonetDB5/src/mal/Tests/tst105.stable.out MonetDB5/src/mal/Tests/tst105a.stable.out MonetDB5/src/mal/Tests/tst106.stable.out MonetDB5/src/mal/Tests/tst150.stable.out MonetDB5/src/mal/mal_interpreter.mx Branch: default Log Message:
Approved output for loader errors diffs (114 lines): diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/dynamicload.stable.out --- a/MonetDB5/src/mal/Tests/dynamicload.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/dynamicload.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -13,7 +13,8 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ command user.wrong():void address UNKOWNaddress; -#WARNING: LoaderException:loadLibrary:UNKNOWlib: file not found +#WARNING: LoaderException:loadLibrary:File not found:UNKNOWlib +!TypeException:user.main[2]:Object code missing !TypeException:user.main[2]:'user.wrong' undefined in: _2:void := user.wrong() function user.main():void; # examples of non-bindable instructions diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/tst104.stable.out --- a/MonetDB5/src/mal/Tests/tst104.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst104.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -13,10 +13,7 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ command user.f(a:any_1,b:bat[:any_2,:any_1],c:any_2):any_3 address dummy; -# -#b:= new(:str,:int); -#a:= f(1,b,"hello"); -# +!TypeException:user.main[4]:Object code missing !TypeException:user.main[4]:'user.f' undefined in: a:any := user.f(_7:int, b:bat[:str,:int], _8:str) function user.main():void; # check propagation of type variables over bats diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/tst105.stable.out --- a/MonetDB5/src/mal/Tests/tst105.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst105.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -13,13 +13,9 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ command bat2.new(h:any_1,t:any_2):bat[:any_1,:any_2] address GDKbatnew; -# -#a:= bat2.new(:str,:int); -#b:= bat2.new(:str,:int); -#c:= new(:str,:int); -# +!TypeException:user.main[3]:Object code missing !TypeException:user.main[3]:'bat2.new' undefined in: a:bat[:str,:int] := bat2.new(_4:str, _5:int) - +!TypeException:user.main[4]:Object code missing !TypeException:user.main[4]:'bat2.new' undefined in: b:bat[:str,:int] := bat2.new(_7:str, _5:int) function user.main():void; # check propagation of type variables over bats diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/tst105a.stable.out --- a/MonetDB5/src/mal/Tests/tst105a.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst105a.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -13,9 +13,7 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ command bbp.new(h:any_1,t:any_2):bat[:any_1,:any_2] address GDKbatnew; -# -#b:= bbp.new(:str,:int); -# +!TypeException:user.main[2]:Object code missing !TypeException:user.main[2]:'bbp.new' undefined in: b:bat[:str,:int] := bbp.new(_3:str, _4:int) function user.main():void; # check classification of functions in the proper module diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/tst106.stable.out --- a/MonetDB5/src/mal/Tests/tst106.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst106.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -18,7 +18,7 @@ #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 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 diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/Tests/tst150.stable.out --- a/MonetDB5/src/mal/Tests/tst150.stable.out Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/Tests/tst150.stable.out Wed Jul 07 16:51:13 2010 +0200 @@ -13,14 +13,7 @@ # Visit http://monetdb.cwi.nl/ for further information # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33388/ command user.lookup(nme:str):bat[:str,:str] address CMDlookup; -#function sample(nme:str, val:any_1):bit; -# b := user.lookup(nme); #find a bat -# h := algebra.select(b,val,val); -# t := aggr.count(h); -# x := io.print(t); -# y := io.print(val); -# return sample:=true; -#end sample; +!TypeException:user.sample[1]:Object code missing function user.sample(nme:str,val:any_1):bit; b := user.lookup(nme); #find a bat diff -r 9f4c1a0473f4 -r c1c8468d5b9e MonetDB5/src/mal/mal_interpreter.mx --- a/MonetDB5/src/mal/mal_interpreter.mx Wed Jul 07 16:42:54 2010 +0200 +++ b/MonetDB5/src/mal/mal_interpreter.mx Wed Jul 07 16:51:13 2010 +0200 @@ -981,7 +981,7 @@ #endif @:performanceVariables@ - if (stk == NULL) + if (stk == NULL || stkpc < 0) throw(MAL, "mal.interpreter", MAL_STACK_FAIL); pci = getInstrPtr(flow->mb, stkpc); @@ -1131,7 +1131,8 @@ } oldfs = fs; #ifdef DEBUG_FLOW - printInstruction(GDKstdout, fs->flow->mb, 0, getInstrPtr(fs->flow->mb,fs->pc), LIST_MAL_STMT); + if ( fs->pc >= 0) + printInstruction(GDKstdout, fs->flow->mb, 0, getInstrPtr(fs->flow->mb,fs->pc), LIST_MAL_STMT); #endif err = DFLOWstep(task, fs); /* restore the instruction and wait in specific cases*/ _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
