Changeset: 3b9cab1016bf for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b9cab1016bf Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 gdk/gdk_calc.c monetdb5/modules/mal/batcalc.c Branch: unlock Log Message:
merged with default diffs (truncated from 3095 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -1034,6 +1034,10 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:sht] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:dbl], X_2:dbl, X_3:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:flt], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:flt], X_2:flt, X_3:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] @@ -1118,6 +1122,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:sht] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:dbl, X_2:bat[:dbl], X_3:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:flt, X_2:bat[:flt], X_3:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:bte] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] @@ -4551,6 +4557,10 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:sht] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:dbl], X_2:dbl, X_3:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:flt], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:flt], X_2:flt, X_3:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:int], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] @@ -4635,6 +4645,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:sht] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:dbl, X_2:bat[:dbl], X_3:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:flt, X_2:bat[:flt], X_3:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:bte] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:int, X_2:bat[:bte], X_3:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -1267,6 +1267,10 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:sht] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:dbl], X_2:dbl, X_3:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:flt], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:bat[:flt], X_2:flt, X_3:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:hge] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] @@ -1432,6 +1436,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:lng] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:sht] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:dbl, X_2:bat[:dbl], X_3:bat[:oid]):bat[:dbl] ", "CMDbatMODsignal;", "" ] +[ "batcalc", "%", "pattern batcalc.%(X_1:flt, X_2:bat[:flt], X_3:bat[:oid]):bat[:flt] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:bte] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:hge] ", "CMDbatMODsignal;", "" ] [ "batcalc", "%", "pattern batcalc.%(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:int] ", "CMDbatMODsignal;", "" ] @@ -6475,6 +6481,10 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:bte], X_2:sht, X_3:bat[:oid]):bat[:sht] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:dbl], X_2:dbl, X_3:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:flt], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:flt], X_2:flt, X_3:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:hge] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bat[:hge], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] @@ -6640,6 +6650,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:lng] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:bte, X_2:bat[:sht], X_3:bat[:oid]):bat[:sht] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:dbl, X_2:bat[:dbl], X_3:bat[:oid]):bat[:dbl] ", "CMDbatMOD;", "" ] +[ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:flt, X_2:bat[:flt], X_3:bat[:oid]):bat[:flt] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:bte] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:hge] ", "CMDbatMOD;", "" ] [ "batcalc", "mod_noerror", "pattern batcalc.mod_noerror(X_1:hge, X_2:bat[:bte], X_3:bat[:oid]):bat[:int] ", "CMDbatMOD;", "" ] 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 @@ -1835,7 +1826,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 @@ -1843,133 +1833,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) @@ -1977,70 +1938,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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list