Changeset: e13433537b04 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13433537b04
Modified Files:
gdk/gdk_calc.c
Branch: default
Log Message:
Removed compile-time option to have a less than full implementation for
gdk_calc.
diffs (truncated from 2947 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
@@ -11,15 +11,6 @@
#include "gdk_private.h"
#include "gdk_calc_private.h"
-/* Define symbol FULL_IMPLEMENTATION to get implementations for all
- * sensible output types for +, -, *, /. Without the symbol, all
- * combinations of input types are supported, but only output types
- * that are either the largest of the input types or one size larger
- * (if available) for +, -, *. For division the output type can be
- * either input type of flt or dbl. */
-
-#define FULL_IMPLEMENTATION
-
/* Generally, the functions return a new BAT aligned with the input
* BAT(s). If there are multiple input BATs, they must be aligned.
* If there is a candidate list, the calculations are only done for
@@ -1810,7 +1801,6 @@ add_##TYPE1##_##TYPE2##_##TYPE3(const TY
ADD_3TYPE(bte, bte, bte, I)
ADD_3TYPE_enlarge(bte, bte, sht, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(bte, bte, int, I)
ADD_3TYPE_enlarge(bte, bte, lng, I)
#ifdef HAVE_HGE
@@ -1818,133 +1808,104 @@ ADD_3TYPE_enlarge(bte, bte, hge, I)
#endif
ADD_3TYPE_enlarge(bte, bte, flt, F)
ADD_3TYPE_enlarge(bte, bte, dbl, F)
-#endif
ADD_3TYPE(bte, sht, sht, I)
ADD_3TYPE_enlarge(bte, sht, int, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(bte, sht, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(bte, sht, hge, I)
#endif
ADD_3TYPE_enlarge(bte, sht, flt, F)
ADD_3TYPE_enlarge(bte, sht, dbl, F)
-#endif
ADD_3TYPE(bte, int, int, I)
ADD_3TYPE_enlarge(bte, int, lng, I)
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(bte, int, hge, I)
#endif
ADD_3TYPE_enlarge(bte, int, flt, F)
ADD_3TYPE_enlarge(bte, int, dbl, F)
-#endif
ADD_3TYPE(bte, lng, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(bte, lng, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(bte, lng, flt, F)
ADD_3TYPE_enlarge(bte, lng, dbl, F)
-#endif
#ifdef HAVE_HGE
ADD_3TYPE(bte, hge, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(bte, hge, flt, F)
ADD_3TYPE_enlarge(bte, hge, dbl, F)
#endif
-#endif
ADD_3TYPE(bte, flt, flt, F)
ADD_3TYPE_enlarge(bte, flt, dbl, F)
ADD_3TYPE(bte, dbl, dbl, F)
ADD_3TYPE(sht, bte, sht, I)
ADD_3TYPE_enlarge(sht, bte, int, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(sht, bte, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(sht, bte, hge, I)
#endif
ADD_3TYPE_enlarge(sht, bte, flt, F)
ADD_3TYPE_enlarge(sht, bte, dbl, F)
-#endif
ADD_3TYPE(sht, sht, sht, I)
ADD_3TYPE_enlarge(sht, sht, int, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(sht, sht, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(sht, sht, hge, I)
#endif
ADD_3TYPE_enlarge(sht, sht, flt, F)
ADD_3TYPE_enlarge(sht, sht, dbl, F)
-#endif
ADD_3TYPE(sht, int, int, I)
ADD_3TYPE_enlarge(sht, int, lng, I)
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(sht, int, hge, I)
#endif
ADD_3TYPE_enlarge(sht, int, flt, F)
ADD_3TYPE_enlarge(sht, int, dbl, F)
-#endif
ADD_3TYPE(sht, lng, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(sht, lng, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(sht, lng, flt, F)
ADD_3TYPE_enlarge(sht, lng, dbl, F)
-#endif
#ifdef HAVE_HGE
ADD_3TYPE(sht, hge, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(sht, hge, flt, F)
ADD_3TYPE_enlarge(sht, hge, dbl, F)
#endif
-#endif
ADD_3TYPE(sht, flt, flt, F)
ADD_3TYPE_enlarge(sht, flt, dbl, F)
ADD_3TYPE(sht, dbl, dbl, F)
ADD_3TYPE(int, bte, int, I)
ADD_3TYPE_enlarge(int, bte, lng, I)
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(int, bte, hge, I)
#endif
ADD_3TYPE_enlarge(int, bte, flt, F)
ADD_3TYPE_enlarge(int, bte, dbl, F)
-#endif
ADD_3TYPE(int, sht, int, I)
ADD_3TYPE_enlarge(int, sht, lng, I)
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(int, sht, hge, I)
#endif
ADD_3TYPE_enlarge(int, sht, flt, F)
ADD_3TYPE_enlarge(int, sht, dbl, F)
-#endif
ADD_3TYPE(int, int, int, I)
ADD_3TYPE_enlarge(int, int, lng, I)
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(int, int, hge, I)
#endif
ADD_3TYPE_enlarge(int, int, flt, F)
ADD_3TYPE_enlarge(int, int, dbl, F)
-#endif
ADD_3TYPE(int, lng, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(int, lng, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(int, lng, flt, F)
ADD_3TYPE_enlarge(int, lng, dbl, F)
-#endif
#ifdef HAVE_HGE
ADD_3TYPE(int, hge, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(int, hge, flt, F)
ADD_3TYPE_enlarge(int, hge, dbl, F)
#endif
-#endif
ADD_3TYPE(int, flt, flt, F)
ADD_3TYPE_enlarge(int, flt, dbl, F)
ADD_3TYPE(int, dbl, dbl, F)
@@ -1952,70 +1913,50 @@ ADD_3TYPE(lng, bte, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(lng, bte, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(lng, bte, flt, F)
ADD_3TYPE_enlarge(lng, bte, dbl, F)
-#endif
ADD_3TYPE(lng, sht, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(lng, sht, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(lng, sht, flt, F)
ADD_3TYPE_enlarge(lng, sht, dbl, F)
-#endif
ADD_3TYPE(lng, int, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(lng, int, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(lng, int, flt, F)
ADD_3TYPE_enlarge(lng, int, dbl, F)
-#endif
ADD_3TYPE(lng, lng, lng, I)
#ifdef HAVE_HGE
ADD_3TYPE_enlarge(lng, lng, hge, I)
#endif
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(lng, lng, flt, F)
ADD_3TYPE_enlarge(lng, lng, dbl, F)
-#endif
#ifdef HAVE_HGE
ADD_3TYPE(lng, hge, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(lng, hge, flt, F)
ADD_3TYPE_enlarge(lng, hge, dbl, F)
#endif
-#endif
ADD_3TYPE(lng, flt, flt, F)
ADD_3TYPE_enlarge(lng, flt, dbl, F)
ADD_3TYPE(lng, dbl, dbl, F)
#ifdef HAVE_HGE
ADD_3TYPE(hge, bte, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(hge, bte, flt, F)
ADD_3TYPE_enlarge(hge, bte, dbl, F)
-#endif
ADD_3TYPE(hge, sht, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(hge, sht, flt, F)
ADD_3TYPE_enlarge(hge, sht, dbl, F)
-#endif
ADD_3TYPE(hge, int, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(hge, int, flt, F)
ADD_3TYPE_enlarge(hge, int, dbl, F)
-#endif
ADD_3TYPE(hge, lng, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(hge, lng, flt, F)
ADD_3TYPE_enlarge(hge, lng, dbl, F)
-#endif
ADD_3TYPE(hge, hge, hge, I)
-#ifdef FULL_IMPLEMENTATION
ADD_3TYPE_enlarge(hge, hge, flt, F)
ADD_3TYPE_enlarge(hge, hge, dbl, F)
-#endif
ADD_3TYPE(hge, flt, flt, F)
ADD_3TYPE_enlarge(hge, flt, dbl, F)
ADD_3TYPE(hge, dbl, dbl, F)
@@ -2075,7 +2016,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#ifdef FULL_IMPLEMENTATION
case TYPE_int:
nils = add_bte_bte_int(lft, incr1, rgt, incr2,
dst, GDK_int_max,
@@ -2108,7 +2048,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#endif
default:
goto unsupported;
}
@@ -2127,7 +2066,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#ifdef FULL_IMPLEMENTATION
case TYPE_lng:
nils = add_bte_sht_lng(lft, incr1, rgt, incr2,
dst, GDK_lng_max,
@@ -2154,7 +2092,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#endif
default:
goto unsupported;
}
@@ -2173,7 +2110,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#ifdef FULL_IMPLEMENTATION
#ifdef HAVE_HGE
case TYPE_hge:
nils = add_bte_int_hge(lft, incr1, rgt, incr2,
@@ -2194,7 +2130,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#endif
default:
goto unsupported;
}
@@ -2215,7 +2150,6 @@ add_typeswitchloop(const void *lft, int
abort_on_error);
break;
#endif
-#ifdef FULL_IMPLEMENTATION
case TYPE_flt:
nils = add_bte_lng_flt(lft, incr1, rgt, incr2,
dst, GDK_flt_max,
@@ -2228,7 +2162,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
-#endif
default:
goto unsupported;
}
@@ -2242,7 +2175,6 @@ add_typeswitchloop(const void *lft, int
ci1, ci2, candoff1,
candoff2,
abort_on_error);
break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
