Changeset: 484a4cdc5d28 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=484a4cdc5d28 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh Branch: default Log Message:
Realign 01_batcalc.mal.sh and 01_batcalc.mal. diffs (truncated from 2092 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -21383,22 +21383,6 @@ pattern batcalc.bte(b:bat[:oid,:bit]):ba address CMDconvertsignal_bte; comment cast from bit to bte, signal error on overflow -pattern batcalc.bte_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvert_bte; -comment cast from void to bte with candidates list - -pattern batcalc.bte_noerror(b:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvert_bte; -comment cast from void to bte - -pattern batcalc.bte(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvertsignal_bte; -comment cast from void to bte with candidates list, signal error on overflow - -pattern batcalc.bte(b:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvertsignal_bte; -comment cast from void to bte, signal error on overflow - pattern batcalc.bit_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvert_bit; comment cast from str to bit with candidates list @@ -21559,22 +21543,6 @@ pattern batcalc.bit(b:bat[:oid,:bit]):ba address CMDconvertsignal_bit; comment cast from bit to bit, signal error on overflow -pattern batcalc.bit_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvert_bit; -comment cast from void to bit with candidates list - -pattern batcalc.bit_noerror(b:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvert_bit; -comment cast from void to bit - -pattern batcalc.bit(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvertsignal_bit; -comment cast from void to bit with candidates list, signal error on overflow - -pattern batcalc.bit(b:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvertsignal_bit; -comment cast from void to bit, signal error on overflow - pattern batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:any_1,s:bat[:oid,:oid]):bat[:oid,:bit] address CMDbatBETWEENsymmetric; comment B between V1 and V2 (or vice versa) inclusive with candidates list @@ -23138,22 +23106,6 @@ pattern batcalc.dbl(b:bat[:oid,:bit]):ba address CMDconvertsignal_dbl; comment cast from bit to dbl, signal error on overflow -pattern batcalc.dbl_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvert_dbl; -comment cast from void to dbl with candidates list - -pattern batcalc.dbl_noerror(b:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvert_dbl; -comment cast from void to dbl - -pattern batcalc.dbl(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvertsignal_dbl; -comment cast from void to dbl with candidates list, signal error on overflow - -pattern batcalc.dbl(b:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvertsignal_dbl; -comment cast from void to dbl, signal error on overflow - pattern batcalc.div_noerror(v:dbl,b:bat[:oid,:dbl],s:bat[:oid,:oid]):bat[:oid,:dbl] address CMDbatDIV; comment Return V / B with candidates list, overflow causes NIL value @@ -24556,22 +24508,6 @@ pattern batcalc.flt(b:bat[:oid,:bit]):ba address CMDconvertsignal_flt; comment cast from bit to flt, signal error on overflow -pattern batcalc.flt_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:flt] -address CMDconvert_flt; -comment cast from void to flt with candidates list - -pattern batcalc.flt_noerror(b:bat[:oid,:oid]):bat[:oid,:flt] -address CMDconvert_flt; -comment cast from void to flt - -pattern batcalc.flt(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:flt] -address CMDconvertsignal_flt; -comment cast from void to flt with candidates list, signal error on overflow - -pattern batcalc.flt(b:bat[:oid,:oid]):bat[:oid,:flt] -address CMDconvertsignal_flt; -comment cast from void to flt, signal error on overflow - command batcalc.hash(b:bat[:oid,:any_1]):bat[:oid,:wrd] address MKEYbathash; command batcalc.hash(b:bat[:oid,:dbl]):bat[:oid,:wrd] @@ -24870,22 +24806,6 @@ pattern batcalc.int(b:bat[:oid,:bit]):ba address CMDconvertsignal_int; comment cast from bit to int, signal error on overflow -pattern batcalc.int_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:int] -address CMDconvert_int; -comment cast from void to int with candidates list - -pattern batcalc.int_noerror(b:bat[:oid,:oid]):bat[:oid,:int] -address CMDconvert_int; -comment cast from void to int - -pattern batcalc.int(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:int] -address CMDconvertsignal_int; -comment cast from void to int with candidates list, signal error on overflow - -pattern batcalc.int(b:bat[:oid,:oid]):bat[:oid,:int] -address CMDconvertsignal_int; -comment cast from void to int, signal error on overflow - pattern batcalc.isnil(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDbatISNIL; comment Unary check for nil over the tail of the bat with candidates list @@ -25290,22 +25210,6 @@ pattern batcalc.lng(b:bat[:oid,:bit]):ba address CMDconvertsignal_lng; comment cast from bit to lng, signal error on overflow -pattern batcalc.lng_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:lng] -address CMDconvert_lng; -comment cast from void to lng with candidates list - -pattern batcalc.lng_noerror(b:bat[:oid,:oid]):bat[:oid,:lng] -address CMDconvert_lng; -comment cast from void to lng - -pattern batcalc.lng(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:lng] -address CMDconvertsignal_lng; -comment cast from void to lng with candidates list, signal error on overflow - -pattern batcalc.lng(b:bat[:oid,:oid]):bat[:oid,:lng] -address CMDconvertsignal_lng; -comment cast from void to lng, signal error on overflow - pattern batcalc.lsh_noerror(v:lng,b:bat[:oid,:lng],s:bat[:oid,:oid]):bat[:oid,:lng] address CMDbatLSH; comment Return V << B with candidates list, out of range second operand causes NIL value @@ -28469,22 +28373,6 @@ pattern batcalc.oid(b:bat[:oid,:bit]):ba address CMDconvertsignal_oid; comment cast from bit to oid, signal error on overflow -pattern batcalc.oid_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:oid] -address CMDconvert_oid; -comment cast from void to oid with candidates list - -pattern batcalc.oid_noerror(b:bat[:oid,:oid]):bat[:oid,:oid] -address CMDconvert_oid; -comment cast from void to oid - -pattern batcalc.oid(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:oid] -address CMDconvertsignal_oid; -comment cast from void to oid with candidates list, signal error on overflow - -pattern batcalc.oid(b:bat[:oid,:oid]):bat[:oid,:oid] -address CMDconvertsignal_oid; -comment cast from void to oid, signal error on overflow - pattern batcalc.or(v:lng,b:bat[:oid,:lng],s:bat[:oid,:oid]):bat[:oid,:lng] address CMDbatOR; comment Return V OR B with candidates list @@ -29490,22 +29378,6 @@ pattern batcalc.str(b:bat[:oid,:bit]):ba address CMDconvertsignal_str; comment cast from bit to str, signal error on overflow -pattern batcalc.str_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:str] -address CMDconvert_str; -comment cast from void to str with candidates list - -pattern batcalc.str_noerror(b:bat[:oid,:oid]):bat[:oid,:str] -address CMDconvert_str; -comment cast from void to str - -pattern batcalc.str(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:str] -address CMDconvertsignal_str; -comment cast from void to str with candidates list, signal error on overflow - -pattern batcalc.str(b:bat[:oid,:oid]):bat[:oid,:str] -address CMDconvertsignal_str; -comment cast from void to str, signal error on overflow - pattern batcalc.sht_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:sht] address CMDconvert_sht; comment cast from str to sht with candidates list @@ -29666,22 +29538,6 @@ pattern batcalc.sht(b:bat[:oid,:bit]):ba address CMDconvertsignal_sht; comment cast from bit to sht, signal error on overflow -pattern batcalc.sht_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:sht] -address CMDconvert_sht; -comment cast from void to sht with candidates list - -pattern batcalc.sht_noerror(b:bat[:oid,:oid]):bat[:oid,:sht] -address CMDconvert_sht; -comment cast from void to sht - -pattern batcalc.sht(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:sht] -address CMDconvertsignal_sht; -comment cast from void to sht with candidates list, signal error on overflow - -pattern batcalc.sht(b:bat[:oid,:oid]):bat[:oid,:sht] -address CMDconvertsignal_sht; -comment cast from void to sht, signal error on overflow - pattern batcalc.sub_noerror(v:dbl,b:bat[:oid,:dbl],s:bat[:oid,:oid]):bat[:oid,:dbl] address CMDbatSUB; comment Return V - B with candidates list, overflow causes NIL value @@ -31184,22 +31040,6 @@ pattern batcalc.wrd(b:bat[:oid,:bit]):ba address CMDconvertsignal_wrd; comment cast from bit to wrd, signal error on overflow -pattern batcalc.wrd_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:wrd] -address CMDconvert_wrd; -comment cast from void to wrd with candidates list - -pattern batcalc.wrd_noerror(b:bat[:oid,:oid]):bat[:oid,:wrd] -address CMDconvert_wrd; -comment cast from void to wrd - -pattern batcalc.wrd(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:wrd] -address CMDconvertsignal_wrd; -comment cast from void to wrd with candidates list, signal error on overflow - -pattern batcalc.wrd(b:bat[:oid,:oid]):bat[:oid,:wrd] -address CMDconvertsignal_wrd; -comment cast from void to wrd, signal error on overflow - pattern batcalc.xor(v:lng,b:bat[:oid,:lng],s:bat[:oid,:oid]):bat[:oid,:lng] address CMDbatXOR; comment Return V XOR B with candidates list diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -27486,22 +27486,6 @@ pattern batcalc.bte(b:bat[:oid,:bit]):ba address CMDconvertsignal_bte; comment cast from bit to bte, signal error on overflow -pattern batcalc.bte_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvert_bte; -comment cast from void to bte with candidates list - -pattern batcalc.bte_noerror(b:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvert_bte; -comment cast from void to bte - -pattern batcalc.bte(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvertsignal_bte; -comment cast from void to bte with candidates list, signal error on overflow - -pattern batcalc.bte(b:bat[:oid,:oid]):bat[:oid,:bte] -address CMDconvertsignal_bte; -comment cast from void to bte, signal error on overflow - pattern batcalc.bit_noerror(b:bat[:oid,:str],s:bat[:oid,:oid]):bat[:oid,:bit] address CMDconvert_bit; comment cast from str to bit with candidates list @@ -27662,22 +27646,6 @@ pattern batcalc.bit(b:bat[:oid,:bit]):ba address CMDconvertsignal_bit; comment cast from bit to bit, signal error on overflow -pattern batcalc.bit_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvert_bit; -comment cast from void to bit with candidates list - -pattern batcalc.bit_noerror(b:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvert_bit; -comment cast from void to bit - -pattern batcalc.bit(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvertsignal_bit; -comment cast from void to bit with candidates list, signal error on overflow - -pattern batcalc.bit(b:bat[:oid,:oid]):bat[:oid,:bit] -address CMDconvertsignal_bit; -comment cast from void to bit, signal error on overflow - pattern batcalc.between_symmetric(b:bat[:oid,:any_1],v1:any_1,v2:any_1,s:bat[:oid,:oid]):bat[:oid,:bit] address CMDbatBETWEENsymmetric; comment B between V1 and V2 (or vice versa) inclusive with candidates list @@ -29677,22 +29645,6 @@ pattern batcalc.dbl(b:bat[:oid,:bit]):ba address CMDconvertsignal_dbl; comment cast from bit to dbl, signal error on overflow -pattern batcalc.dbl_noerror(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvert_dbl; -comment cast from void to dbl with candidates list - -pattern batcalc.dbl_noerror(b:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvert_dbl; -comment cast from void to dbl - -pattern batcalc.dbl(b:bat[:oid,:oid],s:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvertsignal_dbl; -comment cast from void to dbl with candidates list, signal error on overflow - -pattern batcalc.dbl(b:bat[:oid,:oid]):bat[:oid,:dbl] -address CMDconvertsignal_dbl; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
