MonetDB: default - Fix the conversions errors.

[Martin Kersten]

Changeset: 67e25f56805e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67e25f56805e
Modified Files:
        monetdb5/modules/kernel/batstr.c
        monetdb5/modules/kernel/batstr.h
        monetdb5/modules/kernel/mmath.c
Branch: default
Log Message:

Fix the conversions errors.
The compilation process should work again as expected.


diffs (133 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
@@ -573,7 +573,7 @@ str STRbatstrSearch(int *ret, int *l, in
        prepareOperand2(left,l,right,r,"search");
        if( BATcount(left) != BATcount(right) )
                throw(MAL, "batstr.compare##X3", ILLEGAL_ARGUMENT " Requires 
bats of identical size");
-       prepareResult2(bn,left,right,TYPE_bit,"search");
+       prepareResult2(bn,left,right,TYPE_int,"search");
 
        lefti = bat_iterator(left);
        righti = bat_iterator(right);
@@ -611,7 +611,7 @@ str STRbatstrSearchcst(int *ret, int *l,
        int v, *vp= &v;
 
        prepareOperand(left,l,"search");
-       prepareResult(bn,left,TYPE_bit,"search");
+       prepareResult(bn,left,TYPE_int,"search");
 
        lefti = bat_iterator(left);
 
@@ -769,7 +769,7 @@ bunins_failed:
        throw(MAL, "batstr""r_search", OPERATION_FAILED " During bulk 
operation");
 }
 
-str STRbatConCat(int *ret, int *l, int *r)
+str STRbatConcat(int *ret, int *l, int *r)
 {   
        BATiter lefti, righti;
        BAT *bn, *left, *right;
@@ -779,7 +779,7 @@ str STRbatConCat(int *ret, int *l, int *
        prepareOperand2(left,l,right,r,"+");
        if( BATcount(left) != BATcount(right) )
                throw(MAL, "batstr.compare##X3", ILLEGAL_ARGUMENT " Requires 
bats of identical size");
-       prepareResult2(bn,left,right,TYPE_bit,"+");
+       prepareResult2(bn,left,right,TYPE_str,"+");
 
        lefti = bat_iterator(left);
        righti = bat_iterator(right);
@@ -809,7 +809,7 @@ bunins_failed:
        throw(MAL, "batstr." "+", OPERATION_FAILED " During bulk operation");
 }
 
-str STRbatConCatcst(int *ret, int *l, str *cst)
+str STRbatConcatcst(int *ret, int *l, str *cst)
 {   
        BATiter lefti;
        BAT *bn, *left;
@@ -817,7 +817,7 @@ str STRbatConCatcst(int *ret, int *l, st
        str v, *vp= &v;
 
        prepareOperand(left,l,"+");
-       prepareResult(bn,left,TYPE_bit,"+");
+       prepareResult(bn,left,TYPE_str,"+");
 
        lefti = bat_iterator(left);
 
@@ -840,7 +840,7 @@ bunins_failed:
        throw(MAL, "batstr""+", OPERATION_FAILED " During bulk operation");
 }
 
-str STRcstConCatbat(int *ret, str *cst, int *r)
+str STRcstConcatbat(int *ret, str *cst, int *r)
 {   
        BATiter righti;
        BAT *bn, *right;
diff --git a/monetdb5/modules/kernel/batstr.h b/monetdb5/modules/kernel/batstr.h
--- a/monetdb5/modules/kernel/batstr.h
+++ b/monetdb5/modules/kernel/batstr.h
@@ -55,9 +55,9 @@ batstr_export str STRcststrSearchbat(int
 batstr_export str STRbatRstrSearch(int *ret, int *l, int *r);
 batstr_export str STRbatRstrSearchcst(int *ret, int *l, str *cst);
 batstr_export str STRcstRstrSearchbat(int *ret, str *cst, int *r);
-batstr_export str STRbatConCat(int *ret, int *l, int *r);
-batstr_export str STRbatConCatcst(int *ret, int *l, str *cst);
-batstr_export str STRcstConCatbat(int *ret, str *cst, int *r);
+batstr_export str STRbatConcat(int *ret, int *l, int *r);
+batstr_export str STRbatConcatcst(int *ret, int *l, str *cst);
+batstr_export str STRcstConcatbat(int *ret, str *cst, int *r);
 batstr_export str STRbatTail(int *ret, int *l, int *r);
 batstr_export str STRbatTailcst(int *ret, int *l, int *cst);
 batstr_export str STRbatWChrAt(int *ret, int *l, int *r);
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -145,10 +145,7 @@ math_unary_FINITE(bit *res, dbl *a)
 }
 
 #define unopbaseM5(X1,X2,X3)\
-str MATHunary##X1##X3(X3 *res , X3 *a ) {\
-#ifdef DEBUG\
-               printf( "MATHunary##X1##X3\n");\
-#endif\
+str MATHunary##X1##X3 (X3 *res , X3 *a ) {\
        dbl tmp1,tmp2;\
        str msg= MAL_SUCCEED;\
        if (*a == X3##_nil) {\
@@ -163,9 +160,6 @@ str MATHunary##X1##X3(X3 *res , X3 *a ) 
 
 #define unopM5(X1,X2) \
 str MATHunary##X1##dbl(dbl *res , dbl *a ) {\
-#ifdef DEBUG\
-               printf( "MATHunary##X1##dbl\n");\
-#endif\
        dbl tmp1,tmp2;\
        str msg= MAL_SUCCEED;\
        if (*a == dbl_nil) {\
@@ -178,9 +172,6 @@ str MATHunary##X1##dbl(dbl *res , dbl *a
    return msg;\
 }\
 str MATHunary##X1##flt(flt *res , flt *a ) {\
-#ifdef DEBUG\
-               printf( "MATHunary##X1##flt\n");\
-#endif\
        dbl tmp1,tmp2;\
        str msg= MAL_SUCCEED;\
        if (*a == flt_nil) {\
@@ -195,14 +186,11 @@ str MATHunary##X1##flt(flt *res , flt *a
 
 #define binopbaseM5(X1,X2,X3)\
 str MATHbinary##X1##X3(X3 *res, X3 *a, X3 *b ) {\
-#ifdef DEBUG\
-               printf( "MATHbinary##X1\n");\
-#endif\
    if (*a == X3##_nil || *b == X3##_nil) {\
                *res = X3##_nil;\
    } else {\
                dbl r1 ,a1 = *a, b1 = *b;\
-               X2_binary( &a1, &b1, &r1);\
+               X2##_binary( &a1, &b1, &r1);\
                *res= (X3) r1;\
    }\
    return MAL_SUCCEED;\
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list