Changeset: 200d83a0a653 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/200d83a0a653 Modified Files: monetdb5/modules/kernel/batstr.c Branch: txtsim Log Message:
for the prefix_or* only set candidate bat if enough arguments (5) or no case flag is passed (with 4 arguments) diffs (21 lines): diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c --- a/monetdb5/modules/kernel/batstr.c +++ b/monetdb5/modules/kernel/batstr.c @@ -1766,7 +1766,7 @@ prefix_or_suffix_cst(Client cntxt, MalBl oid off1; bat *res = getArgReference_bat(stk, pci, 0), *bid = getArgReference_bat(stk, pci, 1), *sid1 = NULL; int ynil, ylen; - if (pci->argc == 4 || pci->argc == 5) { + if ((icase && pci->argc == 4) || pci->argc == 5) { assert(getArgType(mb, pci, icase?4:3) == TYPE_bat); sid1 = getArgReference_bat(stk, pci, icase?4:3); } @@ -1889,7 +1889,7 @@ prefix_or_suffix_strcst(Client cntxt, Ma oid off1; bat *res = getArgReference_bat(stk, pci, 0), *bid = getArgReference_bat(stk, pci, 2), *sid1 = NULL; int xnil; - if (pci->argc == 4 || pci->argc == 5) { + if ((!icase && pci->argc == 4) || pci->argc == 5) { assert(getArgType(mb, pci, icase?4:3) == TYPE_bat); sid1 = getArgReference_bat(stk, pci, icase?4:3); } _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org