Added C APIs: BM_bvector_rshift1(), BM_bvector_merge(), int BM_bvector_set_bits()

Author: tlk00

lang-maps/libbm/include/libbm.h

@@ -195,6 +195,13 @@ BM_API_EXPORT int BM_bvector_swap(BM_BVHANDLE h1, BM_BVHANDLE h2);
 */
 BM_API_EXPORT int BM_bvector_set_bit(BM_BVHANDLE h, unsigned int i, int val);
 
+/* set list of bits to 1
+   idx - index of bits to set
+   idx_size - size of the array to set
+*/ 
+BM_API_EXPORT int BM_bvector_set_bits(BM_BVHANDLE h, unsigned int* idx, unsigned int idx_size);
+
+
 /* set bit to 1 without extra checks (faster).
    Use of this function requires full initialization by BM_bvector_init(); 
    i - index of a bit to set
@@ -404,6 +411,17 @@ BM_API_EXPORT int BM_bvector_combine_SUB(BM_BVHANDLE hdst, BM_BVHANDLE hsrc);
 */
 BM_API_EXPORT int BM_bvector_combine_XOR(BM_BVHANDLE hdst, BM_BVHANDLE hsrc);
 
+/* perform logical OR operation on two bit vectors
+   hdst = hdst OR hsrc
+   merge operation is faster than just OR, but it destroys the
+   source vector (by borrowing its memory)
+*/
+BM_API_EXPORT int BM_bvector_merge(BM_BVHANDLE hdst, BM_BVHANDLE hsrc);
+
+
+/* Logical shift right by 1
+*/
+BM_API_EXPORT int BM_bvector_rshift1(BM_BVHANDLE hdst);
 
 /* -------------------------------------------- */
 /* bvector operations with arrays               */

lang-maps/libbm/src/libbm_impl.cpp

@@ -331,6 +331,23 @@ int BM_bvector_set_bit(BM_BVHANDLE h, unsigned int i, int val)
     return BM_OK;
 }
 
+// -----------------------------------------------------------------
+
+int BM_bvector_set_bits(BM_BVHANDLE h, unsigned int* idx, unsigned int idx_size)
+{
+    if (!h || !idx)
+        return BM_ERR_BADARG;
+    BM_TRY
+    {
+        TBM_bvector* bv = (TBM_bvector*)h;
+        bv->set(idx, idx_size);
+    }
+    BM_CATCH_ALL
+    ETRY;
+    return BM_OK;
+}
+
+
 // -----------------------------------------------------------------
 
 int BM_bvector_flip_bit(BM_BVHANDLE h, unsigned int i)
@@ -762,6 +779,42 @@ int BM_bvector_calc_stat(BM_BVHANDLE h,
 
 // -----------------------------------------------------------------
 
+int BM_bvector_merge(BM_BVHANDLE hdst, BM_BVHANDLE hsrc)
+{
+    if (!hdst || !hsrc)
+        return BM_ERR_BADARG;
+
+    BM_TRY
+    {
+        TBM_bvector* bv1 = (TBM_bvector*)hdst;
+        TBM_bvector* bv2 = (TBM_bvector*)hsrc;
+
+        bv1->merge(*bv2);
+    }
+    BM_CATCH_ALL
+    ETRY;
+    return BM_OK;
+}
+
+// -----------------------------------------------------------------
+
+int BM_bvector_rshift1(BM_BVHANDLE hdst)
+{
+    if (!hdst)
+        return BM_ERR_BADARG;
+
+    BM_TRY
+    {
+        TBM_bvector* bv = (TBM_bvector*)hdst;
+        bv->shift_right();
+    }
+    BM_CATCH_ALL
+    ETRY;
+    return BM_OK;
+}
+
+// -----------------------------------------------------------------
+
 
 int BM_bvector_combine_operation(BM_BVHANDLE hdst, BM_BVHANDLE hsrc, int opcode)
 {