COMMON: Fix LET command problem found in 32bit linux

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2015-08-02
 	Fix display output before DELAY
+	Fix LET command problem found in 32bit linux
 	Removed obsolete/unimplemented keywords WSPLIT, PLOT2, UNLOADLIB
 
 2015-07-18

src/common/fmt.c

@@ -27,7 +27,7 @@
 // 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         7             // rounding on x digits
+#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)
 #endif
@@ -81,14 +81,15 @@ void fptoa(var_num_t x, char *dest) {
 }
 
 /*
- * remove rightest zeroes from the number
+ * Convert to text then remove righmost zeroes from the string
  */
-var_num_t rmzeros(var_num_t n) {
-  var_int_t i = fint(n);
-  while (i > 0 && i % 10 == 0) {
-    i /= 10;
+void fptoa_rmzeros(var_num_t x, char *dest) {
+  fptoa(x, dest);
+  int end = strlen(dest);
+  while (end > 0 && dest[end - 1] == '0') {
+    end--;
   }
-  return i;
+  dest[end] = '\0';
 }
 
 /*
@@ -192,7 +193,7 @@ void bestfta_p(var_num_t x, char *dest, var_num_t minx, var_num_t maxx) {
       *d++ = '0';
     }
 
-    fptoa(rmzeros(fpart), buf);
+    fptoa_rmzeros(fpart, buf);
     strcpy(d, buf);
     d += strlen(buf);
   }

src/common/scan.c

@@ -2634,20 +2634,30 @@ void comp_text_line(char *text) {
       return;
     }
   }
-  if (idx == kwLET) {           // old-style keyword LET
-    char *p;
+  if (idx == kwLET) {
+    // old-style keyword LET
     idx = -1;
-    p = (char *)comp_next_word(comp_bc_parm, comp_bc_name);
-    strcpy(comp_bc_parm, p);
-  } else if (idx == kwDECLARE) {  // declaration
-    char *p;
+    char *p = (char *)comp_next_word(comp_bc_parm, comp_bc_name);
+    if (p > comp_bc_parm) {
+      // p is an offset of comp_bc_parm
+      int len = strlen(p);
+      memmove(comp_bc_parm, p, len);
+      comp_bc_parm[len] = '\0';
+    }
+  } else if (idx == kwDECLARE) {
+    // declaration
     decl = 1;
-    p = (char *)comp_next_word(comp_bc_parm, comp_bc_name);
+    char *p = (char *)comp_next_word(comp_bc_parm, comp_bc_name);
     idx = comp_is_keyword(comp_bc_name);
     if (idx == -1) {
       idx = comp_is_proc(comp_bc_name);
     }
-    strcpy(comp_bc_parm, p);
+    if (p > comp_bc_parm) {
+      // p is an offset of comp_bc_parm
+      int len = strlen(p);
+      memmove(comp_bc_parm, p, len);
+      comp_bc_parm[len] = '\0';
+    }
     if (idx != kwPROC && idx != kwFUNC) {
       sc_raise(MSG_USE_DECL);
       return;

src/common/sys.h

@@ -47,17 +47,10 @@ typedef unsigned int bcip_t;
 #endif
 
 #define DBL_EPSILON 0.00000000000001
-#define FLT_EPSILON 0.0000002
-
-#if UINT_MAX != 0xffffffffU
-#define OS_PREC64
-typedef double var_num_t;
 #define EPSILON DBL_EPSILON
-#else
-typedef float var_num_t;
-#define EPSILON FLT_EPSILON
-#endif
+#define OS_PREC64
 
+typedef double var_num_t;
 typedef long int var_int_t;
 #define VAR_NUM_FMT     "%f"
 #define VAR_INT_FMT     "%ld"