Changeset: 934f34a68244 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=934f34a68244 Modified Files: monetdb5/modules/mal/batcalc.mal monetdb5/modules/mal/batcalc.mal.sh monetdb5/modules/mal/calc.mal monetdb5/modules/mal/calc.mal.sh Branch: Jan2014 Log Message:
merged diffs (104 lines): diff --git a/monetdb5/modules/mal/batcalc.mal b/monetdb5/modules/mal/batcalc.mal --- a/monetdb5/modules/mal/batcalc.mal +++ b/monetdb5/modules/mal/batcalc.mal @@ -19673,28 +19673,28 @@ comment "Return -1/0/1 if V </==/> B wit pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:bat[:oid,:any_1]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:bat[:oid,:any_1],s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:any_1) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:any_1,s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1],s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:any_1) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:any_1,s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern avg(b:bat[:oid,:bte]) :dbl diff --git a/monetdb5/modules/mal/batcalc.mal.sh b/monetdb5/modules/mal/batcalc.mal.sh --- a/monetdb5/modules/mal/batcalc.mal.sh +++ b/monetdb5/modules/mal/batcalc.mal.sh @@ -530,28 +530,28 @@ echo cat <<EOF pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:bat[:oid,:any_1]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:bat[:oid,:any_1],s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:any_1) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:bat[:oid,:any_1],hi:any_1,s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:bat[:oid,:any_1],s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:any_1) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern between(b:bat[:oid,:any_1],lo:any_1,hi:any_1,s:bat[:oid,:oid]) :bat[:oid,:bit] address CMDbatBETWEEN -comment "B between LO and HI inclusive with candidates list, nil border is (minus) infinity"; +comment "B between LO and HI inclusive with candidates list"; EOF echo 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 @@ -4361,7 +4361,7 @@ comment "Return -1/0/1 if V1 </==/> V2"; pattern between(b:any_1,lo:any_1,hi:any_1) :bit address CMDvarBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; pattern void(v:void) :void address CMDvarCONVERT diff --git a/monetdb5/modules/mal/calc.mal.sh b/monetdb5/modules/mal/calc.mal.sh --- a/monetdb5/modules/mal/calc.mal.sh +++ b/monetdb5/modules/mal/calc.mal.sh @@ -310,7 +310,7 @@ echo cat <<EOF pattern between(b:any_1,lo:any_1,hi:any_1) :bit address CMDvarBETWEEN -comment "B between LO and HI inclusive, nil border is (minus) infinity"; +comment "B between LO and HI inclusive"; EOF _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
