Changeset: 5a3ea3b74498 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a3ea3b74498 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/mal/01_batcalc.mal Branch: Jun2016 Log Message:
Regenerated mal code from script. diffs (66 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 @@ -24434,6 +24434,18 @@ pattern batcalc.ifthenelse(b:bat[:bit],v address CMDifthen; comment If-then-else operation to assemble a conditional result +pattern batcalc.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 batcalc.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 batcalc.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 batcalc.int_noerror(b:bat[:str],s:bat[:oid]):bat[:int] address CMDconvert_int; comment cast from str to int with candidates list 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 @@ -31596,6 +31596,18 @@ pattern batcalc.ifthenelse(b:bat[:bit],v address CMDifthen; comment If-then-else operation to assemble a conditional result +pattern batcalc.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 batcalc.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 batcalc.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 batcalc.int_noerror(b:bat[:str],s:bat[:oid]):bat[:int] address CMDconvert_int; comment cast from str to int with candidates list diff --git a/monetdb5/modules/mal/01_batcalc.mal b/monetdb5/modules/mal/01_batcalc.mal --- a/monetdb5/modules/mal/01_batcalc.mal +++ b/monetdb5/modules/mal/01_batcalc.mal @@ -21075,6 +21075,18 @@ pattern str_noerror(b:bat[:str],s:bat[:o address CMDconvert_str comment "cast from str to str with candidates list"; +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
