Changeset: 062c348045b4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=062c348045b4 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nogeom.stable.out clients/Tests/exports.stable.out monetdb5/modules/mal/calc.mal monetdb5/modules/mal/calc.mal.sh Branch: default Log Message:
Use correct function for calc.-- and calc.++. diffs (truncated from 346 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 @@ -33310,31 +33310,31 @@ address CMDvarADDsignal; comment Return V1 + V2, guarantee no overflow by returning larger type pattern calc.++(v:dbl):dbl -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:flt):flt -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:lng):lng -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:wrd):wrd -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:int):int -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:sht):sht -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:bte):bte -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.-(v1:dbl,v2:dbl):dbl @@ -33614,31 +33614,31 @@ address CMDvarSUBsignal; comment Return V1 - V2, guarantee no overflow by returning larger type pattern calc.--(v:dbl):dbl -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:flt):flt -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:lng):lng -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:wrd):wrd -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:int):int -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:sht):sht -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:bte):bte -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.-(v:dbl):dbl diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out @@ -33310,31 +33310,31 @@ address CMDvarADDsignal; comment Return V1 + V2, guarantee no overflow by returning larger type pattern calc.++(v:dbl):dbl -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:flt):flt -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:lng):lng -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:wrd):wrd -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:int):int -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:sht):sht -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:bte):bte -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.-(v1:dbl,v2:dbl):dbl @@ -33614,31 +33614,31 @@ address CMDvarSUBsignal; comment Return V1 - V2, guarantee no overflow by returning larger type pattern calc.--(v:dbl):dbl -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:flt):flt -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:lng):lng -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:wrd):wrd -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:int):int -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:sht):sht -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:bte):bte -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.-(v:dbl):dbl diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out b/clients/Tests/MAL-signatures_nogeom.stable.out --- a/clients/Tests/MAL-signatures_nogeom.stable.out +++ b/clients/Tests/MAL-signatures_nogeom.stable.out @@ -33306,31 +33306,31 @@ address CMDvarADDsignal; comment Return V1 + V2, guarantee no overflow by returning larger type pattern calc.++(v:dbl):dbl -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:flt):flt -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:lng):lng -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:wrd):wrd -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:int):int -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:sht):sht -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.++(v:bte):bte -address CMDvarINCR; +address CMDvarINCRsignal; comment Unary V + 1 pattern calc.-(v1:dbl,v2:dbl):dbl @@ -33610,31 +33610,31 @@ address CMDvarSUBsignal; comment Return V1 - V2, guarantee no overflow by returning larger type pattern calc.--(v:dbl):dbl -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:flt):flt -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:lng):lng -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:wrd):wrd -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:int):int -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:sht):sht -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.--(v:bte):bte -address CMDvarDECR; +address CMDvarDECRsignal; comment Unary V - 1 pattern calc.-(v:dbl):dbl diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1159,6 +1159,7 @@ str CMDbatAND(Client cntxt, MalBlkPtr mb str CMDbatBETWEEN(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatCMP(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatDECR(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CMDbatDIV(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatDIVdbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatDIVdblsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDbatDIVflt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/monetdb5/modules/mal/calc.mal b/monetdb5/modules/mal/calc.mal --- a/monetdb5/modules/mal/calc.mal +++ b/monetdb5/modules/mal/calc.mal @@ -259,60 +259,60 @@ comment "Unary negation of V"; pattern ++(v:bte) :bte -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:sht) :sht -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:int) :int -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:wrd) :wrd -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:lng) :lng -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:flt) :flt -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern ++(v:dbl) :dbl -address CMDvarINCR +address CMDvarINCRsignal comment "Unary V + 1"; pattern --(v:bte) :bte -address CMDvarDECR +address CMDvarDECRsignal comment "Unary V - 1"; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
