Changeset: 5a573da78b2f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a573da78b2f
Modified Files:
monetdb5/mal/Tests/tst267.mal
monetdb5/mal/Tests/tst267.stable.out
monetdb5/modules/kernel/array.c
Branch: default
Log Message:
void-headed array function added
diffs (60 lines):
diff --git a/monetdb5/mal/Tests/tst267.mal b/monetdb5/mal/Tests/tst267.mal
--- a/monetdb5/mal/Tests/tst267.mal
+++ b/monetdb5/mal/Tests/tst267.mal
@@ -10,5 +10,5 @@ bat.append(b,8);
io.print(a);
io.print(b);
-g:= array.product(a,b);
-io.print(g);
+(g,h):= array.product(a,b);
+io.print(g,h);
diff --git a/monetdb5/mal/Tests/tst267.stable.out
b/monetdb5/mal/Tests/tst267.stable.out
--- a/monetdb5/mal/Tests/tst267.stable.out
+++ b/monetdb5/mal/Tests/tst267.stable.out
@@ -40,8 +40,8 @@ function user.main():void;
bat.append(b,8);
io.print(a);
io.print(b);
- g := array.product(a,b);
- io.print(g);
+ (g,h) := array.product(a,b);
+ io.print(g,h);
end main;
#-----------------#
# h tmp_13 # name
@@ -57,14 +57,14 @@ end main;
[ 1@0, 6 ]
[ 2@0, 7 ]
[ 3@0, 8 ]
-#-----------------#
-# h tmp_15 # name
-# void int # type
-#-----------------#
-[ 1, 5 ]
-[ 2, 6 ]
-[ 1, 7 ]
-[ 2, 8 ]
+#--------------------------#
+# h t t # name
+# void int int # type
+#--------------------------#
+[ 0@0, 1, 5 ]
+[ 1@0, 2, 6 ]
+[ 2@0, 1, 7 ]
+[ 3@0, 2, 8 ]
# 20:55:59 >
# 20:55:59 > Done.
diff --git a/monetdb5/modules/kernel/array.c b/monetdb5/modules/kernel/array.c
--- a/monetdb5/modules/kernel/array.c
+++ b/monetdb5/modules/kernel/array.c
@@ -422,7 +422,7 @@ ARRAYproduct(int *ret, int *ret2, int *b
bm->trevsorted = 0;
bm->T->nonil = b->T->nonil & r->T->nonil;
if (!(bm->batDirty&2)) bm = BATsetaccess(bm, BAT_READ); \
- *ret = bm->batCacheid;
+ *ret2 = bm->batCacheid;
BBPkeepref(*ret);
BBPkeepref(*ret2);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
