Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10857/src/modules/kernel
Modified Files:
calc.mx
Log Message:
fixed bugs in ifthenelse (return a proper nil value) and cast (don't free
old value (is done by the interpreter))
Index: calc.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/calc.mx,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- calc.mx 24 Dec 2007 12:28:24 -0000 1.67
+++ calc.mx 30 Dec 2007 18:10:13 -0000 1.68
@@ -764,7 +764,8 @@
throw(MAL, "ifthenelse", "types should match\n");
if (b == bit_nil) {
- p = ATOMnilptr(t1);
+ *(ptr**)retval = p = ATOMnilptr(t1);
+ return MAL_SUCCEED;
} else if (b) {
p = getArgReference(stk,P,2);
} else {
@@ -1293,7 +1294,7 @@
if( *val == @1_nil)
*ret= GDKstrdup(str_nil);
else {
- if(*ret) l=strlen(*ret);
+ *ret = NULL;
(void) @1ToStr(ret,&l,val);
}
return MAL_SUCCEED;
-------------------------------------------------------------------------
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
