Small changes for kwBIN and STATMEDIAN.

Author: Joe7M

samples/distro-examples/tests/strings.bas

@@ -202,3 +202,11 @@ REM Only TRIM Strings
 if (trim(10) != 10) then throw "err"
 if (trim(10.1) != 10.1) then throw "err"
 if (trim([1,2,3]) != [1,2,3]) then throw "err"
+
+REM test for integer-to-string conversion
+number_test=[[, "0", "0", "0"], [0, "0", "0", "0"], [7, "111", "7", "7"], [14, "1110", "16", "E"], [2090, "100000101010", "4052", "82A"]]
+for t in number_test
+  if (t[1] != bin(t[0])) then throw "err: bin(" + str(t[0]) + ") <> " + t[1]
+  if (t[2] != oct(t[0])) then throw "err: oct(" + str(t[0]) + ") <> " + t[2]
+  if (t[3] != hex(t[0])) then throw "err: hex(" + str(t[0]) + ") <> " + t[3]
+next

src/common/blib_func.c

@@ -31,6 +31,7 @@ static char *date_m3_table[] = TABLE_MONTH_3C;
 static char *date_mN_table[] = TABLE_MONTH_FULL;
 
 #define BUF_LEN 64
+#define BIN_LEN 32  // Number of max bits (digits) kwBIN creates
 
 /*
  */
@@ -960,32 +961,29 @@ void cmd_str1(long funcCode, var_t *arg, var_t *r) {
     IF_ERR_RETURN;     
 
     if (l == 0) {
-      r->v.p.ptr = (char *)malloc(2);
-      strcpy(r->v.p.ptr, "0");
-      r->v.p.length = strlen(r->v.p.ptr) + 1;
+      v_createstr(r, "0");
       break;
     }
 
-    tb = malloc(33);
-    memset(tb, 0, 33);  
-    
-    for (int i = 0; i < 32; i++) {
+    tb = malloc(BIN_LEN + 1);
+    memset(tb, 0, BIN_LEN + 1);  
+        
+    for (int i = 0; i < BIN_LEN; i++) {
       if (l & (1 << i)) {
-        tb[31 - i] = '1';
+        tb[BIN_LEN - 1 - i] = '1';
       } else {
-        tb[31 - i] = '0';
+        tb[BIN_LEN - 1 - i] = '0';
       }
     }
-    
+        
     // remove preceding zeros
     p = tb;
     while (*p == '0') {
       p++;
     }  
 
-    r->v.p.ptr = (char *)malloc(strlen(p) + 1);
-    strcpy(r->v.p.ptr, p);
-    r->v.p.length = strlen(r->v.p.ptr) + 1;
+    v_createstr(r, p);
+
     break;
   case kwHEX:
     //

src/common/blib_math.c

@@ -235,7 +235,7 @@ var_num_t statmeandev(var_num_t *e, int count) {
 //
 // compare function for median calculation
 //
-int median_compare (const void * a, const void * b) {
+int median_compare(const void * a, const void * b) {
   var_num_t fa = *(var_num_t*) a;
   var_num_t fb = *(var_num_t*) b;
   return (fa > fb) - (fa < fb);
@@ -255,10 +255,12 @@ var_num_t statmedian(var_num_t *e, int count) {
 
   qsort(e, count, sizeof(var_num_t), median_compare);
 
-  if (count % 2 == 0)  
-      return (e[count/2] + e[count/2 - 1]) / 2;  
-  else  
-      return e[count/2];  
+  if (count % 2 == 0) {
+    return (e[count/2] + e[count/2 - 1]) / 2;
+  }
+  else {  
+    return e[count/2];
+  }  
 }
 
 //