Changeset: dcce71bf89fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dcce71bf89fb
Removed Files:
        sql/backends/monet5/sql_cast_impl_down_from_flt.h
        sql/backends/monet5/sql_cast_impl_up_to_flt.h
        sql/test/sysmon/Tests/sys_queue_expand.sql
Modified Files:
        sql/test/sysmon/Tests/All
Branch: userstats
Log Message:

Merged with default


diffs (truncated from 8073 to 300 lines):

diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -12,7 +12,7 @@ if(WIN32)
     license.rtf
     monetdb.ico
     website.html
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION ${CMAKE_INSTALL_DATADIR}
     COMPONENT server)
 endif()
 
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -6,11 +6,15 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
 #]]
 
+# These files have to be installed in the root of the project. But you
+# cannot use the CMAKE_INSTALL_PREFIX variable, because the WIX
+# generator does not allow for absolute install paths. That is why we use
+# the "." as a relative path.
 if(WIN32)
   install(FILES
     mclient.bat
     msqldump.bat
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION "."
     COMPONENT server)
 endif()
 
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
@@ -3485,6 +3485,7 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "bit_noerror",  "pattern 
batcalc.bit_noerror(X_1:bat[:str]):bat[:bit] ",        "CMDconvert_bit;",      
""      ]
 [ "batcalc",   "bit_noerror",  "pattern batcalc.bit_noerror(X_1:bat[:str], 
X_2:bat[:oid]):bat[:bit] ", "CMDconvert_bit;",      ""      ]
 [ "batcalc",   "blob", "command batcalc.blob(X_1:bat[:str]):bat[:blob] ",      
"batstr_2_blob;",       ""      ]
+[ "batcalc",   "blob", "command batcalc.blob(X_1:bat[:str], 
X_2:bat[:oid]):bat[:blob] ",       "batstr_2_blob_cand;",  ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bit]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bte]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
@@ -3504,21 +3505,36 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte]):bat[:bte] 
",       "batbte_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:bte] ",        "batbte_dec2_cand_bte;",        ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:bte] ",     "batbte_dec2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batbte_dec2dec_cand_bte;",  
   ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:bte] ",      "batbte_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batbte_num2dec_cand_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:dbl], X_2:int, 
X_3:int):bat[:bte] ",      "batdbl_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batdbl_num2dec_cand_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:flt], X_2:int, 
X_3:int):bat[:bte] ",      "batflt_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batflt_num2dec_cand_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int]):bat[:bte] 
",       "batint_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:bte] ",        "batint_dec2_cand_bte;",        ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:bte] ",     "batint_dec2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batint_dec2dec_cand_bte;",  
   ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:int], X_2:int, 
X_3:int):bat[:bte] ",      "batint_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batint_num2dec_cand_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng]):bat[:bte] 
",       "batlng_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:bte] ",        "batlng_dec2_cand_bte;",        ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:bte] ",     "batlng_dec2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batlng_dec2dec_cand_bte;",  
   ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:bte] ",      "batlng_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batlng_num2dec_cand_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:oid], X_2:int, 
X_3:int):bat[:bte] ",      "batnil_2dec_bte;",     ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht]):bat[:bte] 
",       "batsht_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:bte] ",        "batsht_dec2_cand_bte;",        ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:bte] ",     "batsht_dec2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batsht_dec2dec_cand_bte;",  
   ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:bte] ",      "batsht_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:str], X_2:int, 
X_3:int):bat[:bte] ",      "batstr_2dec_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batsht_num2dec_cand_bte;",     ""      ]
+[ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batstr_2dec_bte;",     ""      ]
+[ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], X_2:int, 
X_3:int):bat[:bte] ",      "batstr_2dec_bte;",     ""      ]
 [ "batcalc",   "bte_noerror",  "pattern 
batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ",        "CMDconvert_bte;",      
""      ]
 [ "batcalc",   "bte_noerror",  "pattern batcalc.bte_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvert_bte;",      ""      ]
 [ "batcalc",   "bte_noerror",  "pattern 
batcalc.bte_noerror(X_1:bat[:bte]):bat[:bte] ",        "CMDconvert_bte;",      
""      ]
@@ -3775,16 +3791,22 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",      
"MTIMEdate_fromstr_bulk;",      ""      ]
 [ "batcalc",   "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date] 
",        "MTIMEtimestamp_extract_date_bulk;",    ""      ]
 [ "batcalc",   "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",      
"batstr_2_date;",       ""      ]
+[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str], 
X_2:bat[:oid]):bat[:date] ",       "batstr_2_date_cand;",  ""      ]
 [ "batcalc",   "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ",      
"nil_2_date;",  ""      ]
 [ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ",    
"MTIMEdaytime_daytime_bulk;",   ""      ]
 [ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ",        
"MTIMEdaytime_fromseconds_bulk;",       ""      ]
 [ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:str]):bat[:daytime] ",        
"MTIMEdaytime_fromstr_bulk;",   ""      ]
 [ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ",  
"MTIMEtimestamp_extract_daytime_bulk;", ""      ]
 [ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:int):bat[:daytime] ",       "batstr_2time_daytime;",        ""      ]
+[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",        "batstr_2time_daytime_cand;",   
""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",    "daytime_2time_daytime;",       ""  
    ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:int):bat[:daytime] ",   "daytime_2time_daytime;",       ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:oid], 
X_2:int):bat[:daytime] ",       "nil_2time_daytime;",   ""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:lng], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",        "second_interval_2_daytime;",   
""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:lng], 
X_2:int):bat[:daytime] ",       "second_interval_2_daytime;",   ""      ]
-[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:int):bat[:daytime] ",   "str_2time_daytimetz;", ""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:bat[:oid], X_3:int, X_4:int):bat[:daytime] ",   "str_2time_daytimetz;", ""  
    ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:int, X_3:int):bat[:daytime] ",  "str_2time_daytimetz;", ""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:timestamp], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",  "timestamp_2_daytime;", ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:timestamp], 
X_2:int):bat[:daytime] ", "timestamp_2_daytime;", ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:bit]):bat[:dbl] ",        
"CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
@@ -3804,17 +3826,29 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:str]):bat[:dbl] ",        
"CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:str], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:dbl] ",        "batbte_dec2_cand_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte]):bat[:dbl] 
",       "batbte_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batbte_dec2dec_cand_dbl;",  
   ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:dbl] ",     "batbte_dec2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batbte_num2dec_cand_dbl;",     ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:dbl] ",      "batbte_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:dbl] ",        "batint_dec2_cand_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int]):bat[:dbl] 
",       "batint_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batint_dec2dec_cand_dbl;",  
   ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:dbl] ",     "batint_dec2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batint_num2dec_cand_dbl;",     ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:int], X_2:int, 
X_3:int):bat[:dbl] ",      "batint_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:dbl] ",        "batlng_dec2_cand_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng]):bat[:dbl] 
",       "batlng_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batlng_dec2dec_cand_dbl;",  
   ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:dbl] ",     "batlng_dec2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batlng_num2dec_cand_dbl;",     ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:dbl] ",      "batlng_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:dbl] ",        "batsht_dec2_cand_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht]):bat[:dbl] 
",       "batsht_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batsht_dec2dec_cand_dbl;",  
   ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:dbl] ",     "batsht_dec2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batsht_num2dec_cand_dbl;",     ""      ]
 [ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:dbl] ",      "batsht_num2dec_dbl;",  ""      ]
 [ "batcalc",   "dbl_noerror",  "pattern 
batcalc.dbl_noerror(X_1:bat[:bit]):bat[:dbl] ",        "CMDconvert_dbl;",      
""      ]
 [ "batcalc",   "dbl_noerror",  "pattern batcalc.dbl_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvert_dbl;",      ""      ]
@@ -4230,17 +4264,29 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "flt",  "pattern batcalc.flt(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:flt] ", "CMDconvertsignal_flt;",        ""      ]
 [ "batcalc",   "flt",  "pattern batcalc.flt(X_1:bat[:str]):bat[:flt] ",        
"CMDconvertsignal_flt;",        ""      ]
 [ "batcalc",   "flt",  "pattern batcalc.flt(X_1:bat[:str], 
X_2:bat[:oid]):bat[:flt] ", "CMDconvertsignal_flt;",        ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:flt] ",        "batbte_dec2_cand_flt;",        ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:bte]):bat[:flt] 
",       "batbte_dec2_flt;",     ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ",      "batbte_dec2dec_cand_flt;",  
   ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:flt] ",     "batbte_dec2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:flt] ",       "batbte_num2dec_cand_flt;",     ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:flt] ",      "batbte_num2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:flt] ",        "batint_dec2_cand_flt;",        ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:int]):bat[:flt] 
",       "batint_dec2_flt;",     ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ",      "batint_dec2dec_cand_flt;",  
   ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:flt] ",     "batint_dec2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:flt] ",       "batint_num2dec_cand_flt;",     ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:int], X_2:int, 
X_3:int):bat[:flt] ",      "batint_num2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:flt] ",        "batlng_dec2_cand_flt;",        ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:lng]):bat[:flt] 
",       "batlng_dec2_flt;",     ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ",      "batlng_dec2dec_cand_flt;",  
   ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:flt] ",     "batlng_dec2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:flt] ",       "batlng_num2dec_cand_flt;",     ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:flt] ",      "batlng_num2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:flt] ",        "batsht_dec2_cand_flt;",        ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:sht]):bat[:flt] 
",       "batsht_dec2_flt;",     ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:flt] ",      "batsht_dec2dec_cand_flt;",  
   ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:flt] ",     "batsht_dec2dec_flt;",  ""      ]
+[ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:flt] ",       "batsht_num2dec_cand_flt;",     ""      ]
 [ "batcalc",   "flt",  "command batcalc.flt(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:flt] ",      "batsht_num2dec_flt;",  ""      ]
 [ "batcalc",   "flt_noerror",  "pattern 
batcalc.flt_noerror(X_1:bat[:bit]):bat[:flt] ",        "CMDconvert_flt;",      
""      ]
 [ "batcalc",   "flt_noerror",  "pattern batcalc.flt_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:flt] ", "CMDconvert_flt;",      ""      ]
@@ -4299,22 +4345,37 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "int",  "pattern batcalc.int(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:int] ", "CMDconvertsignal_int;",        ""      ]
 [ "batcalc",   "int",  "pattern batcalc.int(X_1:bat[:str]):bat[:int] ",        
"CMDconvertsignal_int;",        ""      ]
 [ "batcalc",   "int",  "pattern batcalc.int(X_1:bat[:str], 
X_2:bat[:oid]):bat[:int] ", "CMDconvertsignal_int;",        ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:int] ",        "batbte_dec2_cand_int;",        ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:bte]):bat[:int] 
",       "batbte_dec2_int;",     ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ",      "batbte_dec2dec_cand_int;",  
   ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:int] ",     "batbte_dec2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batbte_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:int] ",      "batbte_num2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batdbl_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:dbl], X_2:int, 
X_3:int):bat[:int] ",      "batdbl_num2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batflt_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:flt], X_2:int, 
X_3:int):bat[:int] ",      "batflt_num2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:int] ",        "batint_dec2_cand_int;",        ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:int]):bat[:int] 
",       "batint_dec2_int;",     ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ",      "batint_dec2dec_cand_int;",  
   ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:int] ",     "batint_dec2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batint_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:int], X_2:int, 
X_3:int):bat[:int] ",      "batint_num2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:int] ",        "batlng_dec2_cand_int;",        ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:lng]):bat[:int] 
",       "batlng_dec2_int;",     ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ",      "batlng_dec2dec_cand_int;",  
   ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:int] ",     "batlng_dec2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batlng_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:int] ",      "batlng_num2dec_int;",  ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:oid], X_2:int, 
X_3:int):bat[:int] ",      "batnil_2dec_int;",     ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:int] ",        "batsht_dec2_cand_int;",        ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:sht]):bat[:int] 
",       "batsht_dec2_int;",     ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:int] ",      "batsht_dec2dec_cand_int;",  
   ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:int] ",     "batsht_dec2dec_int;",  ""      ]
+[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batsht_num2dec_cand_int;",     ""      ]
 [ "batcalc",   "int",  "command batcalc.int(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:int] ",      "batsht_num2dec_int;",  ""      ]
-[ "batcalc",   "int",  "command batcalc.int(X_1:bat[:str], X_2:int, 
X_3:int):bat[:int] ",      "batstr_2dec_int;",     ""      ]
+[ "batcalc",   "int",  "pattern batcalc.int(X_1:bat[:str], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:int] ",       "batstr_2dec_int;",     ""      ]
+[ "batcalc",   "int",  "pattern batcalc.int(X_1:bat[:str], X_2:int, 
X_3:int):bat[:int] ",      "batstr_2dec_int;",     ""      ]
 [ "batcalc",   "int_noerror",  "pattern 
batcalc.int_noerror(X_1:bat[:bit]):bat[:int] ",        "CMDconvert_int;",      
""      ]
 [ "batcalc",   "int_noerror",  "pattern batcalc.int_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:int] ", "CMDconvert_int;",      ""      ]
 [ "batcalc",   "int_noerror",  "pattern 
batcalc.int_noerror(X_1:bat[:bte]):bat[:int] ",        "CMDconvert_int;",      
""      ]
@@ -4367,22 +4428,37 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "lng",  "pattern batcalc.lng(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:lng] ", "CMDconvertsignal_lng;",        ""      ]
 [ "batcalc",   "lng",  "pattern batcalc.lng(X_1:bat[:str]):bat[:lng] ",        
"CMDconvertsignal_lng;",        ""      ]
 [ "batcalc",   "lng",  "pattern batcalc.lng(X_1:bat[:str], 
X_2:bat[:oid]):bat[:lng] ", "CMDconvertsignal_lng;",        ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:lng] ",        "batbte_dec2_cand_lng;",        ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:bte]):bat[:lng] 
",       "batbte_dec2_lng;",     ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ",      "batbte_dec2dec_cand_lng;",  
   ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:lng] ",     "batbte_dec2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batbte_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:lng] ",      "batbte_num2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batdbl_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:dbl], X_2:int, 
X_3:int):bat[:lng] ",      "batdbl_num2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batflt_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:flt], X_2:int, 
X_3:int):bat[:lng] ",      "batflt_num2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:lng] ",        "batint_dec2_cand_lng;",        ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:int]):bat[:lng] 
",       "batint_dec2_lng;",     ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ",      "batint_dec2dec_cand_lng;",  
   ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:lng] ",     "batint_dec2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batint_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:int], X_2:int, 
X_3:int):bat[:lng] ",      "batint_num2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:lng] ",        "batlng_dec2_cand_lng;",        ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:lng]):bat[:lng] 
",       "batlng_dec2_lng;",     ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ",      "batlng_dec2dec_cand_lng;",  
   ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:lng] ",     "batlng_dec2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batlng_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:lng] ",      "batlng_num2dec_lng;",  ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:oid], X_2:int, 
X_3:int):bat[:lng] ",      "batnil_2dec_lng;",     ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:lng] ",        "batsht_dec2_cand_lng;",        ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:sht]):bat[:lng] 
",       "batsht_dec2_lng;",     ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:lng] ",      "batsht_dec2dec_cand_lng;",  
   ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:lng] ",     "batsht_dec2dec_lng;",  ""      ]
+[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batsht_num2dec_cand_lng;",     ""      ]
 [ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:lng] ",      "batsht_num2dec_lng;",  ""      ]
-[ "batcalc",   "lng",  "command batcalc.lng(X_1:bat[:str], X_2:int, 
X_3:int):bat[:lng] ",      "batstr_2dec_lng;",     ""      ]
+[ "batcalc",   "lng",  "pattern batcalc.lng(X_1:bat[:str], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:lng] ",       "batstr_2dec_lng;",     ""      ]
+[ "batcalc",   "lng",  "pattern batcalc.lng(X_1:bat[:str], X_2:int, 
X_3:int):bat[:lng] ",      "batstr_2dec_lng;",     ""      ]
 [ "batcalc",   "lng_noerror",  "pattern 
batcalc.lng_noerror(X_1:bat[:bit]):bat[:lng] ",        "CMDconvert_lng;",      
""      ]
 [ "batcalc",   "lng_noerror",  "pattern batcalc.lng_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:lng] ", "CMDconvert_lng;",      ""      ]
 [ "batcalc",   "lng_noerror",  "pattern 
batcalc.lng_noerror(X_1:bat[:bte]):bat[:lng] ",        "CMDconvert_lng;",      
""      ]
@@ -5007,22 +5083,37 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "sht",  "pattern batcalc.sht(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:sht] ", "CMDconvertsignal_sht;",        ""      ]
 [ "batcalc",   "sht",  "pattern batcalc.sht(X_1:bat[:str]):bat[:sht] ",        
"CMDconvertsignal_sht;",        ""      ]
 [ "batcalc",   "sht",  "pattern batcalc.sht(X_1:bat[:str], 
X_2:bat[:oid]):bat[:sht] ", "CMDconvertsignal_sht;",        ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:sht] ",        "batbte_dec2_cand_sht;",        ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:bte]):bat[:sht] 
",       "batbte_dec2_sht;",     ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ",      "batbte_dec2dec_cand_sht;",  
   ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:sht] ",     "batbte_dec2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batbte_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:sht] ",      "batbte_num2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batdbl_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:dbl], X_2:int, 
X_3:int):bat[:sht] ",      "batdbl_num2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batflt_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:flt], X_2:int, 
X_3:int):bat[:sht] ",      "batflt_num2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:sht] ",        "batint_dec2_cand_sht;",        ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:int]):bat[:sht] 
",       "batint_dec2_sht;",     ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ",      "batint_dec2dec_cand_sht;",  
   ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:sht] ",     "batint_dec2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batint_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:int], X_2:int, 
X_3:int):bat[:sht] ",      "batint_num2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:sht] ",        "batlng_dec2_cand_sht;",        ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:lng]):bat[:sht] 
",       "batlng_dec2_sht;",     ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ",      "batlng_dec2dec_cand_sht;",  
   ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:sht] ",     "batlng_dec2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batlng_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:sht] ",      "batlng_num2dec_sht;",  ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:oid], X_2:int, 
X_3:int):bat[:sht] ",      "batnil_2dec_sht;",     ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:sht] ",        "batsht_dec2_cand_sht;",        ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:sht]):bat[:sht] 
",       "batsht_dec2_sht;",     ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:sht] ",      "batsht_dec2dec_cand_sht;",  
   ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:sht] ",     "batsht_dec2dec_sht;",  ""      ]
+[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batsht_num2dec_cand_sht;",     ""      ]
 [ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:sht] ",      "batsht_num2dec_sht;",  ""      ]
-[ "batcalc",   "sht",  "command batcalc.sht(X_1:bat[:str], X_2:int, 
X_3:int):bat[:sht] ",      "batstr_2dec_sht;",     ""      ]
+[ "batcalc",   "sht",  "pattern batcalc.sht(X_1:bat[:str], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:sht] ",       "batstr_2dec_sht;",     ""      ]
+[ "batcalc",   "sht",  "pattern batcalc.sht(X_1:bat[:str], X_2:int, 
X_3:int):bat[:sht] ",      "batstr_2dec_sht;",     ""      ]
 [ "batcalc",   "sht_noerror",  "pattern 
batcalc.sht_noerror(X_1:bat[:bit]):bat[:sht] ",        "CMDconvert_sht;",      
""      ]
 [ "batcalc",   "sht_noerror",  "pattern batcalc.sht_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:sht] ", "CMDconvert_sht;",      ""      ]
 [ "batcalc",   "sht_noerror",  "pattern 
batcalc.sht_noerror(X_1:bat[:bte]):bat[:sht] ",        "CMDconvert_sht;",      
""      ]
@@ -5055,6 +5146,7 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "sign", "pattern batcalc.sign(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:bte] ",        "CMDbatSIGN;",  ""      ]
 [ "batcalc",   "str",  "pattern batcalc.str(X_1:bat[:any]):bat[:str] ",        
"CMDconvertsignal_str;",        ""      ]
 [ "batcalc",   "str",  "pattern batcalc.str(X_1:bat[:any], 
X_2:bat[:oid]):bat[:str] ", "CMDconvertsignal_str;",        ""      ]
+[ "batcalc",   "str",  "pattern batcalc.str(X_1:int, X_2:int, X_3:int, 
X_4:int, X_5:bat[:any_1], X_6:bat[:oid], X_7:int):bat[:str] ",  
"SQLbatstr_cast;",      ""      ]
 [ "batcalc",   "str",  "pattern batcalc.str(X_1:int, X_2:int, X_3:int, 
X_4:int, X_5:bat[:any_1], X_6:int):bat[:str] ", "SQLbatstr_cast;",      ""      
]
 [ "batcalc",   "str_noerror",  "pattern 
batcalc.str_noerror(X_1:bat[:any]):bat[:str] ",        "CMDconvert_str;",      
""      ]
 [ "batcalc",   "str_noerror",  "pattern batcalc.str_noerror(X_1:bat[:any], 
X_2:bat[:oid]):bat[:str] ", "CMDconvert_str;",      ""      ]
@@ -5173,10 +5265,14 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "timestamp",    "command 
batcalc.timestamp(X_1:bat[:str]):bat[:timestamp] ",    
"MTIMEtimestamp_fromstr_bulk;", ""      ]
 [ "batcalc",   "timestamp",    "command 
batcalc.timestamp(X_1:bat[:timestamp]):bat[:timestamp] ",      
"MTIMEtimestamp_timestamp_bulk;",       ""      ]
 [ "batcalc",   "timestamp",    "command batcalc.timestamp(X_1:bat[:str], 
X_2:int):bat[:timestamp] ",   "batstr_2time_timestamp;",      ""      ]
+[ "batcalc",   "timestamp",    "command batcalc.timestamp(X_1:bat[:str], 
X_2:bat[:oid], X_3:int):bat[:timestamp] ",    "batstr_2time_timestamp_cand;", 
""      ]
 [ "batcalc",   "timestamp",    "command batcalc.timestamp(X_1:bat[:str], 
X_2:int, X_3:int):bat[:timestamp] ",  "batstr_2time_timestamptz;",    ""      ]
+[ "batcalc",   "timestamp",    "command batcalc.timestamp(X_1:bat[:str], 
X_2:bat[:oid], X_3:int, X_4:int):bat[:timestamp] ",   
"batstr_2time_timestamptz_cand;",       ""      ]
+[ "batcalc",   "timestamp",    "pattern batcalc.timestamp(X_1:bat[:date], 
X_2:bat[:oid], X_3:int):bat[:timestamp] ",   "date_2_timestamp;",    ""      ]
 [ "batcalc",   "timestamp",    "pattern batcalc.timestamp(X_1:bat[:date], 
X_2:int):bat[:timestamp] ",  "date_2_timestamp;",    ""      ]
 [ "batcalc",   "timestamp",    "pattern batcalc.timestamp(X_1:bat[:oid], 
X_2:int):bat[:timestamp] ",   "nil_2time_timestamp;", ""      ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to