Merge branch 'smallbasic:master' into 12_27

Author: chrisws

samples/distro-examples/tests/all.bas

@@ -140,7 +140,7 @@ print "DETERM:"' + DETERM (A, 1)
 print "DISCLOSE:" + DISCLOSE("{debraceme}", "{}")
 print "ENCLOSE:" + ENCLOSE ("braceme", "{}")
 print "EOF:"' + EOF (fileN)
-print "EXIST:"' + EXIST (file)
+print "EXIST:" + EXIST ("Makefile")
 print "EXP:" + EXP (x)
 print "FILES:"; FILES ("file-not-found")
 print "FIX:" + FIX (x)
@@ -245,3 +245,5 @@ print "VAL:" + VAL (s)
 print "WEEKDAY:" + WEEKDAY(dmy) + " " + WEEKDAY(1,1,2020) + " " + WEEKDAY(JULIAN(d,m,y))
 print "XPOS:" + XPOS
 print "YPOS:" + YPOS
+print "RoundPrecisionBug:"; 32.99999999999999
+print "RoundPrecisionBug2:"; 64.1

samples/distro-examples/tests/output/all.out

@@ -123,7 +123,7 @@ DETERM:
 DISCLOSE:debraceme
 ENCLOSE:{braceme}
 EOF:
-EXIST:
+EXIST:1
 EXP:219695.9886721379
 FILES:[]
 FIX:13
@@ -228,3 +228,5 @@ VAL:0
 WEEKDAY:-1 3 1
 XPOS:0
 YPOS:0
+RoundPrecisionBug:33
+RoundPrecisionBug2:64.1

samples/distro-examples/tests/strings.bas

@@ -209,4 +209,9 @@ 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
+next
+
+REM Bug: RTRIM trimed input string on the right side
+s1 = "   test   "
+s2 = rtrim(s1)
+if(s1 != "   test   ") then throw "err: RTRIM changed input string"

src/common/blib_func.c

@@ -1050,19 +1050,17 @@ void cmd_str1(long funcCode, var_t *arg, var_t *r) {
       break;
     }
     p = arg->v.p.ptr;
+    uint32_t len = strlen(arg->v.p.ptr);
     if (*p != '\0') {
-      while (*p) {
-        p++;
-      }
-      p--;
-      while (p >= arg->v.p.ptr && (is_wspace(*p))) {
+      p = p + len - 1; 
+      while (p >= arg->v.p.ptr && is_wspace(*p)) {
+        len--;      
         p--;
       }
-      p++;
-      *p = '\0';
     }
-    r->v.p.ptr = (char *)malloc(strlen(arg->v.p.ptr) + 1);
-    strcpy(r->v.p.ptr, arg->v.p.ptr);
+    r->v.p.ptr = (char *)malloc(len + 1);
+    strncpy(r->v.p.ptr, arg->v.p.ptr, len);
+    r->v.p.ptr[len] = '\0';
     r->v.p.length = strlen(r->v.p.ptr) + 1;
 
     // alltrim

src/common/blib_math.c

@@ -121,7 +121,7 @@ void mat_gauss_jordan(var_num_t *a, var_num_t *b, int n, double toler) {
     indxr[i] = irow;
     indxc[i] = icol;
 
-    if (a[icol * n + icol] < toler) {
+    if (fabs(a[icol * n + icol]) < toler) {
       err_matsig();
       free(indxc);
       free(indxr);

src/common/fmt.c

@@ -20,16 +20,12 @@
 #define FMT_xMIN          1e-8
 #define FMT_xMAX          1e+14
 #define FMT_RND           14
-#define FMT_xRND          1e+14
-#define FMT_xRND2         1e+13
 #define FMT_MANTISSA_BITS 52
 #else
 // limits for use with 32bit integer algorithm
 #define FMT_xMIN          1e-8          // lowest limit to use the exp. format
 #define FMT_xMAX          1e+9          // highest limit to use the exp. format
 #define FMT_RND           9             // rounding on x digits
-#define FMT_xRND          1e+9          // 1 * 10 ^ FMT_RND
-#define FMT_xRND2         1e+8          // 1 * 10 ^ (FMT_RND-1)
 #define FMT_MANTISSA_BITS 23            // Bits of mantissa for 32bit float
 #endif
 
@@ -183,7 +179,7 @@ void bestfta_p(var_num_t x, char *dest, var_num_t minx, var_num_t maxx) {
   }
   fpart = fround(frac(x), precision) * pow(10, precision);
 
-  if (fpart >= FMT_xRND) {      // rounding bug
+  if (fpart >= pow(10, precision)) {      // rounding bug, i.e: print 32.99999999999999 -> Output: 32.1
     ipart = ipart + 1.0;
     if (ipart >= maxx) {
       ipart = ipart / 10.0;
@@ -195,18 +191,13 @@ void bestfta_p(var_num_t x, char *dest, var_num_t minx, var_num_t maxx) {
   fptoa(ipart, buf);
   strcpy(d, buf);
   d += strlen(buf);
-
+  
   if (fpart > 0.0) {
     // format right part
     *d++ = '.';
+    fdif = fpart;
 
-    fdif = frac(x) * FMT_xRND;
-    if (fdif < fpart) {
-      // rounded value has greater precision
-      fdif = fpart;
-    }
-
-    while (fdif < FMT_xRND2) {
+    while (fdif < pow(10, precision - 1)) {
       fdif *= 10;
       *d++ = '0';
     }

src/platform/console/main.cpp

@@ -449,7 +449,7 @@ int main(int argc, char *argv[]) {
   return gsb_last_error ? gsb_last_line : 0;
 }
 
-#if defined(__GNUC__) && !defined(__MACH__) && !defined(_Win32)
+#if defined(__GNUC__) && !defined(__MACH__) && !defined(_Win32) && !defined(__CYGWIN__)
 // for analysing excessive malloc calls using kdbg
 extern "C" void *__libc_malloc(size_t size);
 void *malloc(size_t size) {