Changeset: 8eab69820848 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8eab69820848
Modified Files:
monetdb5/modules/kernel/batcalc.c
monetdb5/modules/kernel/calc.c
Branch: gdk-calc
Log Message:
Use correct type (bat instead of int).
diffs (truncated from 700 to 300 lines):
diff --git a/monetdb5/modules/kernel/batcalc.c
b/monetdb5/modules/kernel/batcalc.c
--- a/monetdb5/modules/kernel/batcalc.c
+++ b/monetdb5/modules/kernel/batcalc.c
@@ -56,7 +56,7 @@ mythrow(enum malexception type, const ch
}
static str
-CMDbatUNARY(int *ret, int *bid, BAT *(*batfunc)(BAT *), const char *malfunc)
+CMDbatUNARY(bat *ret, bat *bid, BAT *(*batfunc)(BAT *), const char *malfunc)
{
BAT *bn, *b;
@@ -71,7 +71,7 @@ CMDbatUNARY(int *ret, int *bid, BAT *(*b
}
static str
-CMDbatUNARY1(int *ret, int *bid, int accum,
+CMDbatUNARY1(bat *ret, bat *bid, int accum,
BAT *(*batfunc)(BAT *, int), const char *malfunc)
{
BAT *bn, *b;
@@ -87,7 +87,7 @@ CMDbatUNARY1(int *ret, int *bid, int acc
}
static str
-CMDbatUNARY2(int *ret, int *bid, int accum, int abort_on_error,
+CMDbatUNARY2(bat *ret, bat *bid, int accum, int abort_on_error,
BAT *(*batfunc)(BAT *, int, int), const char *malfunc)
{
BAT *bn, *b;
@@ -102,106 +102,106 @@ CMDbatUNARY2(int *ret, int *bid, int acc
return MAL_SUCCEED;
}
-batcalc_export str CMDbatISZERO(int *ret, int *bid);
+batcalc_export str CMDbatISZERO(bat *ret, bat *bid);
str
-CMDbatISZERO(int *ret, int *bid)
+CMDbatISZERO(bat *ret, bat *bid)
{
return CMDbatUNARY(ret, bid, BATcalciszero, "batcalc.iszero");
}
-batcalc_export str CMDbatISNIL(int *ret, int *bid);
+batcalc_export str CMDbatISNIL(bat *ret, bat *bid);
str
-CMDbatISNIL(int *ret, int *bid)
+CMDbatISNIL(bat *ret, bat *bid)
{
return CMDbatUNARY(ret, bid, BATcalcisnil, "batcalc.isnil");
}
-batcalc_export str CMDbatNOT(int *ret, int *bid);
+batcalc_export str CMDbatNOT(bat *ret, bat *bid);
str
-CMDbatNOT(int *ret, int *bid)
+CMDbatNOT(bat *ret, bat *bid)
{
return CMDbatUNARY1(ret, bid, 0, BATcalcnot, "batcalc.not");
}
-batcalc_export str CMDbatNOTaccum(int *ret, int *bid, int *accum);
+batcalc_export str CMDbatNOTaccum(bat *ret, bat *bid, int *accum);
str
-CMDbatNOTaccum(int *ret, int *bid, int *accum)
+CMDbatNOTaccum(bat *ret, bat *bid, int *accum)
{
return CMDbatUNARY1(ret, bid, *accum, BATcalcnot, "batcalc.not");
}
-batcalc_export str CMDbatABS(int *ret, int *bid);
+batcalc_export str CMDbatABS(bat *ret, bat *bid);
str
-CMDbatABS(int *ret, int *bid)
+CMDbatABS(bat *ret, bat *bid)
{
return CMDbatUNARY1(ret, bid, 0, BATcalcabsolute, "batcalc.abs");
}
-batcalc_export str CMDbatABSaccum(int *ret, int *bid, int *accum);
+batcalc_export str CMDbatABSaccum(bat *ret, bat *bid, int *accum);
str
-CMDbatABSaccum(int *ret, int *bid, int *accum)
+CMDbatABSaccum(bat *ret, bat *bid, int *accum)
{
return CMDbatUNARY1(ret, bid, *accum, BATcalcabsolute, "batcalc.abs");
}
-batcalc_export str CMDbatINCR(int *ret, int *bid);
+batcalc_export str CMDbatINCR(bat *ret, bat *bid);
str
-CMDbatINCR(int *ret, int *bid)
+CMDbatINCR(bat *ret, bat *bid)
{
return CMDbatUNARY2(ret, bid, 0, 1, BATcalcincr, "batcalc.incr");
}
-batcalc_export str CMDbatINCRaccum(int *ret, int *bid, int *accum);
+batcalc_export str CMDbatINCRaccum(bat *ret, bat *bid, int *accum);
str
-CMDbatINCRaccum(int *ret, int *bid, int *accum)
+CMDbatINCRaccum(bat *ret, bat *bid, int *accum)
{
return CMDbatUNARY2(ret, bid, *accum, 1, BATcalcincr, "batcalc.incr");
}
-batcalc_export str CMDbatDECR(int *ret, int *bid);
+batcalc_export str CMDbatDECR(bat *ret, bat *bid);
str
-CMDbatDECR(int *ret, int *bid)
+CMDbatDECR(bat *ret, bat *bid)
{
return CMDbatUNARY2(ret, bid, 0, 1, BATcalcdecr, "batcalc.decr");
}
-batcalc_export str CMDbatDECRaccum(int *ret, int *bid, int *accum);
+batcalc_export str CMDbatDECRaccum(bat *ret, bat *bid, int *accum);
str
-CMDbatDECRaccum(int *ret, int *bid, int *accum)
+CMDbatDECRaccum(bat *ret, bat *bid, int *accum)
{
return CMDbatUNARY2(ret, bid, *accum, 1, BATcalcdecr, "batcalc.decr");
}
-batcalc_export str CMDbatNEG(int *ret, int *bid);
+batcalc_export str CMDbatNEG(bat *ret, bat *bid);
str
-CMDbatNEG(int *ret, int *bid)
+CMDbatNEG(bat *ret, bat *bid)
{
return CMDbatUNARY1(ret, bid, 0, BATcalcnegate, "batcalc.neg");
}
-batcalc_export str CMDbatNEGaccum(int *ret, int *bid, int *accum);
+batcalc_export str CMDbatNEGaccum(bat *ret, bat *bid, int *accum);
str
-CMDbatNEGaccum(int *ret, int *bid, int *accum)
+CMDbatNEGaccum(bat *ret, bat *bid, int *accum)
{
return CMDbatUNARY1(ret, bid, *accum, BATcalcnegate, "batcalc.neg");
}
-batcalc_export str CMDbatSIGN(int *ret, int *bid);
+batcalc_export str CMDbatSIGN(bat *ret, bat *bid);
str
-CMDbatSIGN(int *ret, int *bid)
+CMDbatSIGN(bat *ret, bat *bid)
{
return CMDbatUNARY(ret, bid, BATcalcsign, "batcalc.sign");
}
@@ -283,7 +283,7 @@ calcmodtype(int tp1, int tp2)
}
static str
-CMDbatBINARY3(int *ret, int *bid1, int *bid2,
+CMDbatBINARY3(bat *ret, bat *bid1, bat *bid2,
BAT *(*batfunc)(BAT *, BAT *, int, int, int),
int (*typefunc)(int, int),
int accum, int abort_on_error,
@@ -351,7 +351,7 @@ CMDbatBINARY3cst(MalStkPtr stk, InstrPtr
}
static str
-CMDbatBINARY2(int *ret, int *bid1, int *bid2,
+CMDbatBINARY2(bat *ret, bat *bid1, bat *bid2,
BAT *(*batfunc)(BAT *, BAT *, int, int),
int accum, int abort_on_error,
const char *malfunc)
@@ -416,7 +416,7 @@ CMDbatBINARY2cst(MalStkPtr stk, InstrPtr
}
static str
-CMDbatBINARY1(int *ret, int *bid1, int *bid2,
+CMDbatBINARY1(bat *ret, bat *bid1, bat *bid2,
BAT *(*batfunc)(BAT *, BAT *, int),
int accum,
const char *malfunc)
@@ -481,7 +481,7 @@ CMDbatBINARY1cst(MalStkPtr stk, InstrPtr
}
static str
-CMDbatBINARY0(int *ret, int *bid1, int *bid2,
+CMDbatBINARY0(bat *ret, bat *bid1, bat *bid2,
BAT *(*batfunc)(BAT *, BAT *),
const char *malfunc)
{
@@ -543,37 +543,37 @@ CMDbatBINARY0cst(MalStkPtr stk, InstrPtr
return MAL_SUCCEED;
}
-batcalc_export str CMDbatADD(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatADD(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatADD(int *ret, int *bid1, int *bid2)
+CMDbatADD(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcadd,
calctype, 0, 0,
"batcalc.add_noerror");
}
-batcalc_export str CMDbatADDsignal(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatADDsignal(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatADDsignal(int *ret, int *bid1, int *bid2)
+CMDbatADDsignal(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcadd,
calctype, 0, 1, "batcalc.+");
}
-batcalc_export str CMDbatADDsignalaccum(int *ret, int *bid1, int *bid2, int
*accum);
+batcalc_export str CMDbatADDsignalaccum(bat *ret, bat *bid1, bat *bid2, int
*accum);
str
-CMDbatADDsignalaccum(int *ret, int *bid1, int *bid2, int *accum)
+CMDbatADDsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcadd,
calctype, *accum, 1,
"batcalc.+");
}
-batcalc_export str CMDbatADDenlarge(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatADDenlarge(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatADDenlarge(int *ret, int *bid1, int *bid2)
+CMDbatADDenlarge(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcadd,
calctypeenlarge, 0, 1,
"batcalc.add_enlarge");
@@ -617,37 +617,37 @@ CMDbatADDcstenlarge(Client cntxt, MalBlk
calctypeenlarge, 0, 1,
"batcalc.add_enlarge");
}
-batcalc_export str CMDbatSUB(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatSUB(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatSUB(int *ret, int *bid1, int *bid2)
+CMDbatSUB(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcsub,
calctype, 0, 0,
"batcalc.sub_noerror");
}
-batcalc_export str CMDbatSUBsignal(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatSUBsignal(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatSUBsignal(int *ret, int *bid1, int *bid2)
+CMDbatSUBsignal(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcsub,
calctype, 0, 1, "batcalc.-");
}
-batcalc_export str CMDbatSUBsignalaccum(int *ret, int *bid1, int *bid2, int
*accum);
+batcalc_export str CMDbatSUBsignalaccum(bat *ret, bat *bid1, bat *bid2, int
*accum);
str
-CMDbatSUBsignalaccum(int *ret, int *bid1, int *bid2, int *accum)
+CMDbatSUBsignalaccum(bat *ret, bat *bid1, bat *bid2, int *accum)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcsub,
calctype, *accum, 1,
"batcalc.-");
}
-batcalc_export str CMDbatSUBenlarge(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatSUBenlarge(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatSUBenlarge(int *ret, int *bid1, int *bid2)
+CMDbatSUBenlarge(bat *ret, bat *bid1, bat *bid2)
{
return CMDbatBINARY3(ret, bid1, bid2, BATcalcsub,
calctypeenlarge, 0, 1,
"batcalc.sub_enlarge");
@@ -691,37 +691,37 @@ CMDbatSUBcstenlarge(Client cntxt, MalBlk
calctypeenlarge, 0, 1,
"batcalc.sub_enlarge");
}
-batcalc_export str CMDbatMUL(int *ret, int *bid1, int *bid2);
+batcalc_export str CMDbatMUL(bat *ret, bat *bid1, bat *bid2);
str
-CMDbatMUL(int *ret, int *bid1, int *bid2)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
