Changeset: 5bb11f10f5e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bb11f10f5e1 Modified Files: gdk/gdk_calc.c Branch: default Log Message:
Layout.
diffs (truncated from 1041 to 300 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -99,7 +99,8 @@ checkbats(BAT *b1, BAT *b2, const char *
nils++; \
((TYPE3 *) dst)[k] = TYPE3##_nil; \
} else { \
- ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *)
lft)[i], ((const TYPE2 *) rgt)[j]); \
+ ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *)
lft)[i], \
+ ((const TYPE2 *)
rgt)[j]); \
} \
} \
CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, end, cnt); \
@@ -110,7 +111,8 @@ checkbats(BAT *b1, BAT *b2, const char *
CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, 0, start); \
for (i = start * incr1, j = start * incr2, k = start; \
k < end; i += incr1, j += incr2, k++) \
- ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *) lft)[i],
((const TYPE2 *) rgt)[j]); \
+ ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *) lft)[i], \
+ ((const TYPE2 *) rgt)[j]); \
CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, end, cnt); \
} while (0)
@@ -131,7 +133,8 @@ checkbats(BAT *b1, BAT *b2, const char *
((TYPE3 *)dst)[k] = TYPE3##_nil; \
nils++; \
} else { \
- ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *)
lft)[i], ((const TYPE2 *) rgt)[j]); \
+ ((TYPE3 *) dst)[k] = FUNC(((const TYPE1 *)
lft)[i], \
+ ((const TYPE2 *)
rgt)[j]); \
} \
} \
CANDLOOP((TYPE3 *) dst, k, TYPE3##_nil, end, cnt); \
@@ -856,60 +859,60 @@ VARcalcisnotnil(ValPtr ret, const ValRec
/* addition (any numeric type) */
#define ADD_3TYPE(TYPE1, TYPE2, TYPE3) \
- static BUN \
- add_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
- const TYPE2 *rgt, int incr2, \
- TYPE3 *dst, BUN cnt, BUN start, \
- BUN end, const oid *cand, \
- const oid *candend, oid candoff, \
- int abort_on_error) \
- { \
- BUN i, j, k; \
- BUN nils = 0; \
+static BUN \
+add_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
+ const TYPE2 *rgt, int incr2, \
+ TYPE3 *dst, BUN cnt, BUN start, \
+ BUN end, const oid *cand, \
+ const oid *candend, oid candoff, \
+ int abort_on_error) \
+{ \
+ BUN i, j, k; \
+ BUN nils = 0; \
\
- CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
- for (i = start * incr1, j = start * incr2, k = start; \
- k < end; i += incr1, j += incr2, k++) { \
- CHECKCAND(dst, k, candoff, TYPE3##_nil); \
- if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
- dst[k] = TYPE3##_nil; \
- nils++; \
- } else { \
- ADD_WITH_CHECK(TYPE1, lft[i], \
- TYPE2, rgt[j], \
- TYPE3, dst[k], \
- return BUN_NONE); \
- } \
+ CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
+ for (i = start * incr1, j = start * incr2, k = start; \
+ k < end; i += incr1, j += incr2, k++) { \
+ CHECKCAND(dst, k, candoff, TYPE3##_nil); \
+ if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ dst[k] = TYPE3##_nil; \
+ nils++; \
+ } else { \
+ ADD_WITH_CHECK(TYPE1, lft[i], \
+ TYPE2, rgt[j], \
+ TYPE3, dst[k], \
+ return BUN_NONE); \
} \
- CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
- return nils; \
- }
+ } \
+ CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
+ return nils; \
+}
#define ADD_3TYPE_enlarge(TYPE1, TYPE2, TYPE3) \
- static BUN \
- add_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
- const TYPE2 *rgt, int incr2, \
- TYPE3 *dst, BUN cnt, BUN start, \
- BUN end, const oid *cand, \
- const oid *candend, oid candoff) \
- { \
- BUN i, j, k; \
- BUN nils = 0; \
+static BUN \
+add_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
+ const TYPE2 *rgt, int incr2, \
+ TYPE3 *dst, BUN cnt, BUN start, \
+ BUN end, const oid *cand, \
+ const oid *candend, oid candoff) \
+{ \
+ BUN i, j, k; \
+ BUN nils = 0; \
\
- CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
- for (i = start * incr1, j = start * incr2, k = start; \
- k < end; i += incr1, j += incr2, k++) { \
- CHECKCAND(dst, k, candoff, TYPE3##_nil); \
- if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
- dst[k] = TYPE3##_nil; \
- nils++; \
- } else { \
- dst[k] = (TYPE3) lft[i] + rgt[j]; \
- } \
+ CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
+ for (i = start * incr1, j = start * incr2, k = start; \
+ k < end; i += incr1, j += incr2, k++) { \
+ CHECKCAND(dst, k, candoff, TYPE3##_nil); \
+ if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ dst[k] = TYPE3##_nil; \
+ nils++; \
+ } else { \
+ dst[k] = (TYPE3) lft[i] + rgt[j]; \
} \
- CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
- return nils; \
- }
+ } \
+ CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
+ return nils; \
+}
ADD_3TYPE(bte, bte, bte)
ADD_3TYPE_enlarge(bte, bte, sht)
@@ -1831,7 +1834,8 @@ add_typeswitchloop(const void *lft, int
return nils;
unsupported:
- GDKerror("%s: type combination (add(%s,%s)->%s) not supported.\n",
func, ATOMname(tp1), ATOMname(tp2), ATOMname(tp));
+ GDKerror("%s: type combination (add(%s,%s)->%s) not supported.\n",
+ func, ATOMname(tp1), ATOMname(tp2), ATOMname(tp));
return BUN_NONE;
}
@@ -1981,7 +1985,8 @@ BATcalccstadd(const ValRecord *v, BAT *b
}
int
-VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, int
abort_on_error)
+VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
+ int abort_on_error)
{
if (add_typeswitchloop(VALptr(lft), lft->vtype, 0,
VALptr(rgt), rgt->vtype, 0,
@@ -2067,73 +2072,73 @@ VARcalcincr(ValPtr ret, const ValRecord
/* subtraction (any numeric type) */
#define SUB_3TYPE(TYPE1, TYPE2, TYPE3) \
- static BUN \
- sub_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
- const TYPE2 *rgt, int incr2, \
- TYPE3 *dst, BUN cnt, BUN start, \
- BUN end, const oid *cand, \
- const oid *candend, oid candoff, \
- int abort_on_error) \
- { \
- BUN i, j, k; \
- BUN nils = 0; \
+static BUN \
+sub_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
+ const TYPE2 *rgt, int incr2, \
+ TYPE3 *dst, BUN cnt, BUN start, \
+ BUN end, const oid *cand, \
+ const oid *candend, oid candoff, \
+ int abort_on_error) \
+{ \
+ BUN i, j, k; \
+ BUN nils = 0; \
\
- CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
- for (i = start * incr1, j = start * incr2, k = start; \
- k < end; i += incr1, j += incr2, k++) { \
- CHECKCAND(dst, k, candoff, TYPE3##_nil); \
- if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
+ for (i = start * incr1, j = start * incr2, k = start; \
+ k < end; i += incr1, j += incr2, k++) { \
+ CHECKCAND(dst, k, candoff, TYPE3##_nil); \
+ if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ dst[k] = TYPE3##_nil; \
+ nils++; \
+ } else if (rgt[j] < 1) { \
+ if (GDK_##TYPE3##_max + rgt[j] < lft[i]) { \
+ if (abort_on_error) \
+ return BUN_NONE; \
dst[k] = TYPE3##_nil; \
nils++; \
- } else if (rgt[j] < 1) { \
- if (GDK_##TYPE3##_max + rgt[j] < lft[i]) { \
- if (abort_on_error) \
- return BUN_NONE; \
- dst[k] = TYPE3##_nil; \
- nils++; \
- } else { \
- dst[k] = (TYPE3) lft[i] - rgt[j]; \
- } \
} else { \
- if (GDK_##TYPE3##_min + rgt[j] >= lft[i]) { \
- if (abort_on_error) \
- return BUN_NONE; \
- dst[k] = TYPE3##_nil; \
- nils++; \
- } else { \
- dst[k] = (TYPE3) lft[i] - rgt[j]; \
- } \
+ dst[k] = (TYPE3) lft[i] - rgt[j]; \
} \
- } \
- CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
- return nils; \
- }
-
-#define SUB_3TYPE_enlarge(TYPE1, TYPE2, TYPE3) \
- static BUN \
- sub_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
- const TYPE2 *rgt, int incr2, \
- TYPE3 *dst, BUN cnt, BUN start, \
- BUN end, const oid *cand, \
- const oid *candend, oid candoff) \
- { \
- BUN i, j, k; \
- BUN nils = 0; \
- \
- CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
- for (i = start * incr1, j = start * incr2, k = start; \
- k < end; i += incr1, j += incr2, k++) { \
- CHECKCAND(dst, k, candoff, TYPE3##_nil); \
- if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ } else { \
+ if (GDK_##TYPE3##_min + rgt[j] >= lft[i]) { \
+ if (abort_on_error) \
+ return BUN_NONE; \
dst[k] = TYPE3##_nil; \
nils++; \
} else { \
dst[k] = (TYPE3) lft[i] - rgt[j]; \
} \
} \
- CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
- return nils; \
- }
+ } \
+ CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
+ return nils; \
+}
+
+#define SUB_3TYPE_enlarge(TYPE1, TYPE2, TYPE3) \
+static BUN \
+sub_##TYPE1##_##TYPE2##_##TYPE3(const TYPE1 *lft, int incr1, \
+ const TYPE2 *rgt, int incr2, \
+ TYPE3 *dst, BUN cnt, BUN start, \
+ BUN end, const oid *cand, \
+ const oid *candend, oid candoff) \
+{ \
+ BUN i, j, k; \
+ BUN nils = 0; \
+ \
+ CANDLOOP(dst, k, TYPE3##_nil, 0, start); \
+ for (i = start * incr1, j = start * incr2, k = start; \
+ k < end; i += incr1, j += incr2, k++) { \
+ CHECKCAND(dst, k, candoff, TYPE3##_nil); \
+ if (lft[i] == TYPE1##_nil || rgt[j] == TYPE2##_nil) { \
+ dst[k] = TYPE3##_nil; \
+ nils++; \
+ } else { \
+ dst[k] = (TYPE3) lft[i] - rgt[j]; \
+ } \
+ } \
+ CANDLOOP(dst, k, TYPE3##_nil, end, cnt); \
+ return nils; \
+}
SUB_3TYPE(bte, bte, bte)
SUB_3TYPE_enlarge(bte, bte, sht)
@@ -2263,7 +2268,8 @@ static BUN
sub_typeswitchloop(const void *lft, int tp1, int incr1,
const void *rgt, int tp2, int incr2,
void *dst, int tp, BUN cnt,
- BUN start, BUN end, const oid *cand, const oid *candend, oid
candoff,
+ BUN start, BUN end, const oid *cand,
+ const oid *candend, oid candoff,
int abort_on_error, const char *func)
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
