Changeset: 8d8fac9150b7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d8fac9150b7 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/mal/batcalc.c Branch: default Log Message:
More missing signatures diffs (112 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 @@ -1014,6 +1014,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;", "" ] @@ -1098,6 +1102,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;", "" ] @@ -4531,6 +4537,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;", "" ] @@ -4615,6 +4625,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 @@ -1243,6 +1243,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;", "" ] @@ -1408,6 +1412,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;", "" ] @@ -6451,6 +6457,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;", "" ] @@ -6616,6 +6626,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/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c --- a/monetdb5/modules/mal/batcalc.c +++ b/monetdb5/modules/mal/batcalc.c @@ -1620,12 +1620,16 @@ batcalc_init(void) for(rt = extra-1; rt >= integer && !err; rt--) { if (rt < tp1 && rt < tp2) continue; - if (*rt == TYPE_dbl && *tp1 != TYPE_dbl && *tp2 != TYPE_dbl) - continue; - else if (*rt == TYPE_flt && ((*tp1 != TYPE_flt && *tp2 != TYPE_flt) || *tp1 == TYPE_dbl || *tp2 == TYPE_dbl)) - continue; - else if (*tp1 == TYPE_flt || *tp2 == TYPE_flt || *tp1 == TYPE_dbl || *tp2 == TYPE_dbl) - continue; + if (*rt == TYPE_dbl) { + if (*tp1 != TYPE_dbl || *tp2 != TYPE_dbl) + continue; + } else if (*rt == TYPE_flt) { + if (*tp1 != TYPE_flt || *tp2 != TYPE_flt) + continue; + } else { + if (*tp1 == TYPE_flt || *tp2 == TYPE_flt || *tp1 == TYPE_dbl || *tp2 == TYPE_dbl) + continue; + } mel_func_arg ret = { .type = *rt, .isbat =1 }; mel_func_arg arg1 = { .type = *tp1, .isbat =1 }; mel_func_arg arg2 = { .type = *tp2, .isbat =1 }; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list