Changeset: e5d88a7bd8b0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5d88a7bd8b0 Modified Files: monetdb5/modules/mal/01_batcalc.mal.sh Branch: default Log Message:
Merge with Jul2015 branch. diffs (22 lines): diff --git a/monetdb5/modules/mal/01_batcalc.mal.sh b/monetdb5/modules/mal/01_batcalc.mal.sh --- a/monetdb5/modules/mal/01_batcalc.mal.sh +++ b/monetdb5/modules/mal/01_batcalc.mal.sh @@ -609,6 +609,18 @@ EOF done cat <<EOF +pattern ifthenelse(v:bit, b1:bat[:any_1], b2:bat[:any_1]) :bat[:any_1] +address CMDifthen +comment "If-then-else operation to assemble a conditional result"; + +pattern ifthenelse(v:bit, v1:any_1, b2:bat[:any_1]) :bat[:any_1] +address CMDifthen +comment "If-then-else operation to assemble a conditional result"; + +pattern ifthenelse(v:bit, b1:bat[:any_1], v2:any_1) :bat[:any_1] +address CMDifthen +comment "If-then-else operation to assemble a conditional result"; + pattern ifthenelse(b:bat[:bit], v1:any_1, v2:any_1) :bat[:any_1] address CMDifthen comment "If-then-else operation to assemble a conditional result"; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
