MonetDB: default - Accept void-headed only

[Martin Kersten]

Changeset: ecfe2479bab0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecfe2479bab0
Modified Files:
        monetdb5/modules/mal/calc.c
        monetdb5/modules/mal/calc.mal
        monetdb5/modules/mal/calc.mal.sh
Branch: default
Log Message:

Accept void-headed only


diffs (54 lines):

diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c
--- a/monetdb5/modules/mal/calc.c
+++ b/monetdb5/modules/mal/calc.c
@@ -635,10 +635,10 @@ CMDsetoid(Client cntxt, MalBlkPtr mb, Ma
        return MAL_SUCCEED;
 }
 
-calc_export str CALCbat2batid(int *ret, bat *bid);
+calc_export str CALCbat2int(int *ret, bat *b);
 
 str
-CALCbat2batid(bat *ret, bat *bid)
+CALCbat2int(int *ret, bat *bid)
 {
        BAT *b;
 
diff --git a/monetdb5/modules/mal/calc.mal b/monetdb5/modules/mal/calc.mal
--- a/monetdb5/modules/mal/calc.mal
+++ b/monetdb5/modules/mal/calc.mal
@@ -5009,11 +5009,11 @@ address CMDsetoid;
 pattern setoid(v:lng) :void
 address CMDsetoid;
 
-command getBATidentifier(b:bat[:any_1,:any_2]):bat
-address CALCbat2batid
+command getBATidentifier(b:bat[:any_1,:any_2]):int
+address CALCbat2int
 comment "Coerce bat to BAT identifier";
-command getBAT(b:bat):bat[:any_1,:any_2]
-address CALCbat2batid
+command getBAT(b:int):bat[:any_1,:any_2]
+address CALCbat2int
 comment "Coerce bat to BAT identifier";
 
 pattern ifthenelse(b:bit,t:any_1,f:any_1):any_1
diff --git a/monetdb5/modules/mal/calc.mal.sh b/monetdb5/modules/mal/calc.mal.sh
--- a/monetdb5/modules/mal/calc.mal.sh
+++ b/monetdb5/modules/mal/calc.mal.sh
@@ -356,11 +356,11 @@ address CMDsetoid;
 pattern setoid(v:lng) :void
 address CMDsetoid;
 
-command getBATidentifier(b:bat[:any_1,:any_2]):bat
-address CALCbat2batid
+command getBATidentifier(b:bat[:any_1,:any_2]):int
+address CALCbat2int
 comment "Coerce bat to BAT identifier";
-command getBAT(b:bat):bat[:any_1,:any_2]
-address CALCbat2batid
+command getBAT(b:int):bat[:any_1,:any_2]
+address CALCbat2int
 comment "Coerce bat to BAT identifier";
 
 pattern ifthenelse(b:bit,t:any_1,f:any_1):any_1
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list