Merge pull request #27 from chrisws/0_11_19

0 11 19

Author: chrisws

ChangeLog

@@ -1,3 +1,12 @@
+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
+	Added IDE editor sdl/android
+	Made a few minor performance improvements (SDL)
+
 2015-06-07
 	Fixed PRINT 1/1000 and other floating point rounding issues
 	Fixed problem with 59 char INPUT prompt

Makefile.am

@@ -14,40 +14,14 @@ EXTRA_DIST =                                    \
     NEWS                                        \
     README                                      \
     autogen.sh                                  \
-    src/platform/gtk/sbgtk.glade                \
-    src/platform/gtk/sbgtk.gladep               \
-    src/platform/gtk/debian/changelog           \
-    src/platform/gtk/debian/control             \
-    src/platform/gtk/debian/copyright           \
-    src/platform/gtk/debian/rules               \
-    src/platform/gtk/debian/sbasic.links        \
-    src/platform/sdl/fonts/BI1.c                \
-    src/platform/sdl/fonts/BI2.c                \
-    src/platform/sdl/fonts/BI5.c                \
-    src/platform/sdl/fonts/BI7.c                \
-    src/platform/sdl/fonts/psf2c.c              \
     documentation/export_csv.bas                \
     documentation/sbasic_ref.csv                \
     documentation/HOWTO/HOWTO-DOCUMENT.TXT      \
     documentation/HOWTO/HOWTO-PORT.TXT          \
     documentation/HOWTO/DEVELOP.TXT             \
     documentation/LICENSE                       \
     documentation/README                        \
-    documentation/README.BCC                    \
-    documentation/README.DEV                    \
-    documentation/README.DOS                    \
-    documentation/README.HELIO                  \
-    documentation/README.PALM                   \
     documentation/README.UNIX                   \
-    plugins/publish.bas                         \
-    plugins/comment_in.bas                      \
-    plugins/comment_out.bas                     \
-    plugins/dos2unix.bas                        \
-    plugins/indent.bas                          \
-    plugins/help.bas                            \
-    translator/SB.g                             \
-    translator/Makefile                         \
-    translator/Translator.java                  \
     images/logo.gif                             \
     images/sb16x16.png                          \
     images/sb32x32.png                          \

configure.ac

@@ -140,26 +140,28 @@ function buildFLTK() {
    esac
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk2-config --cxxflags` -fno-exceptions"
-   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk2-config --ldflags --use-images`"
+   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk2-config --ldstaticflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build
    case "${host_os}" in
      *mingw* | cygwin*)
-     FLTK_CXXFLAGS="-I`cygpath -m /usr/local/include` ${FLTK_CXXFLAGS} -mms-bitfields"
-     PACKAGE_LIBS="-L`cygpath -m /usr/local/lib` ${PACKAGE_LIBS} -lwsock32 -static-libgcc"
+     FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
      AC_DEFINE(_Win32, 1, [Windows build])
+     ;;
+
+     *)
+     dnl check for sdl2-config for sound output
+     AC_CHECK_PROG(have_sdl, sdl2-config, [yes], [no])
+     if test "${have_sdl}" = "yes" ; then
+       FLTK_CXXFLAGS="${FLTK_CXXFLAGS} `sdl2-config --cflags`"
+       PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs`"
+       AC_DEFINE(HAVE_SDL, 1, [Windows build])
+     fi
    esac
 
    defaultConditionals
 
-   dnl check for sdl-config for sound output
-   AC_CHECK_PROG(have_sdl, sdl-config, [yes], [no])
-   if test "${have_sdl}" = "yes" ; then
-     FLTK_CXXFLAGS="${FLTK_CXXFLAGS} `sdl-config --cflags`"
-     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl-config --libs`"
-     AC_DEFINE(HAVE_SDL, 1, [Windows build])
-   fi
-
    dnl preconfigured values for FLTK build
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_FLTK, 1, [Defined for FLTK build.])
@@ -200,8 +202,8 @@ function buildSDL() {
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
 
      dnl do not depend on cygwin.dll under cygwin build
-     PACKAGE_CFLAGS="-I`cygpath -m /usr/local/include` ${PACKAGE_CFLAGS} -mms-bitfields"
-     PACKAGE_LIBS="-L`cygpath -m /usr/local/lib` ${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
+     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 
@@ -218,7 +220,7 @@ function buildSDL() {
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
    esac
 
-   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags`"
+   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags` -fno-exceptions"
    case "${host_os}" in
      *mingw*)
      PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"

documentation/build_kwp.cpp

@@ -80,6 +80,19 @@ bool isKeyword(const char *keyword) {
       result = true;
     }
   }
+
+  for (int i = 0; !result && opr_table[i].name[0] != '\0'; i++) {
+    if (strcasecmp(opr_table[i].name, keyword) == 0) {
+      result = true;
+    }
+  }
+
+  for (int i = 0; !result && spopr_table[i].name[0] != '\0'; i++) {
+    if (strcasecmp(spopr_table[i].name, keyword) == 0) {
+      result = true;
+    }
+  }
+
   return result;
 }
 

documentation/sbasic_ref.csv

@@ -20,10 +20,7 @@ Math,function,DETERM,729,"DETERM (A[, toler])","Determinant of A. toler = tolera
 Math,function,ASECH,714,"ASECH (x)","Inverse secant."
 Console,command,AT,521,"AT x, y","Moves the console cursor to the specified position. x,y are in pixels."
 Console,command,BEEP,522,"BEEP","Generates a beep sound."
-Console,command,BUTTON,523,"BUTTON x, y, w, h, variable, caption [,type]","Creates a button widget for display on a FORM. Possible types are radio, checkbox, button, label, listbox and dropdown. The variable is for data transfer to set or retrieve the button state. Set w+h to a negative value to use the caption width plus the absolute amount. Pass a negtive x+y value to offset from the previous widget. listbox and dropdown can be initialised using an array variable or by passing a vertical bar (|) character separated list of values in varible or caption."
 Console,command,CLS,524,"CLS ","Clears the screen."
-Console,command,DOFORM,525,"DOFORM FLAG|VAR","Runs the form created with the BUTTON and TEXT commands. Must be called from within a loop to keep the form active. Pass a control variable to receive the value of the selected or clicked form control. Pass 0 to close the form."
-Console,command,HTML,526,"HTML, [title,] [x,y,w,h]","Display HTML text."
 Console,command,INPUT,527,"INPUT [prompt,|;] var[, var [, ...]]","Reads from ""keyboard"" text and stores it to a variable."
 Console,command,LINEINPUT,528,"LINEINPUT [#fileN] var","Reads a whole text line from file or console."
 Console,command,LINPUT,529,"LINPUT [#fileN] var","Reads a whole text line from file or console."
@@ -34,7 +31,6 @@ Console,command,PEN,533,"PEN ON|OFF","Enables/Disables the PEN/MOUSE mechanism."
 Console,command,PLAY,534,"PLAY string","Play musical notes."
 Console,command,PRINT,535,"PRINT [USING [format];] [expr|str [,|; [expr|str]] ...","Display text or the value of an expression."
 Console,command,SOUND,536,"SOUND freq, dur_ms [, vol] [BG]","Plays a sound."
-Console,command,TEXT,537,"TEXT x, y, w, h, variable","Create an input text widget for display using FORM. See BUTTON for special values for x, y, w, h"
 Console,function,CAT,538,"CAT (x)","Returns a console code. 0 = reset, 1 = bold, -1 bold-off, 2 = underline, -2 = underline-off, 3 = reverse, -3 = reverse-off."
 Console,function,INKEY,539,"INKEY","Returns the last key-code in keyboard buffer, or an empty string if there are no keys. Special key-codes like the function-keys (PC) or the hardware-buttons (PalmOS) are returned as 2-byte string."
 Console,function,TAB,540,"TAB (n)","Moves cursor position to the nth column."
@@ -119,8 +115,6 @@ Graphics,command,PSET,621,"PSET [STEP] x,y [, color| COLOR color]","Draw a pixel
 Graphics,command,RECT,622,"RECT [STEP] x,y [,|STEP x2,y2] [, color| COLOR color] [FILLED]","Draws a rectangular parallelogram."
 Graphics,command,VIEW,623,"VIEW [x1,y1,x2,y2 [,color [,border-color]]]","Defines a viewport. The viewport defined by VIEW is disabled by a VIEW command with no parameters."
 Graphics,command,WINDOW,624,"WINDOW [x1,y1,x2,y2]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates."
-Graphics,function,IMAGEH,625,"IMAGEH #handle, index","Returns the height of the image in pixels."
-Graphics,function,IMAGEW,626,"IMAGEW #handle, index","Returns the width of the image in pixels."
 Graphics,function,PEN,627,"PEN (0..14)","Returns the PEN/MOUSE data."
 Graphics,function,POINT,628,"POINT (x [, y])","Returns the color of the pixel at x,y."
 Graphics,function,RGB,629,"RGB (r, g, b)","Returns the RGB color codes for the specified values. Takes values 0..255 for each of the color."
@@ -136,7 +130,7 @@ Language,function,IFF,638,"IFF expr","Inline version of IF. eg, animal = ""cat""
 Language,keyword,BYREF,639,"BYREF","Sub/func argument declaration. Changes to the variable will be passed back to the caller.  Equivalent syntax to the @ character."
 Language,keyword,CASE,640,"CASE expr","Branch condition for a SELECT statement."
 Language,keyword,DEF,641,"DEF name[(par1[,...])] = expression","Defines a single line function. eg, DEF MySin(x) = SIN(x): ? MySin(pi/2)"
-Language,keyword,DO,642,"DO","FOR f IN files("*.txt") DO PRINT f"
+Language,keyword,DO,642,"DO","FOR f IN files(""*.txt"") DO PRINT f"
 Language,keyword,ELIF,643,"ELIF","foo = 2: if foo==1: ? ""one"": ELIF foo==2: ? ""two"": fi"
 Language,keyword,ELSE,644,"ELSE","foo = 2: if foo==1: ? ""one"": ELSE: ? ""not one"": fi"
 Language,keyword,ELSEIF,645,"ELSEIF","foo = 2: if foo==1: ? ""one"": ELSEIF foo==2: ? ""two"": fi"
@@ -247,9 +241,9 @@ String,command,SINPUT,768,"SINPUT src; var [, delim] [,var [, delim]] ...","Spli
 String,command,SPLIT,769,"SPLIT string, delimiters, words() [, pairs] [USE expr]","Returns the words of the specified string into array 'words'."
 String,command,SPRINT,770,"SPRINT var; [USING...;] ...","Create formated string and storing it to var. See also: PRINT command."
 String,function,ASC,771,"ASC (s)","Returns the ASCII code of first character of the string s."
-String,function,BCS,772,"BCS (s)","converts (B)ASIC-style strings to (C)-style (S)trings."
+String,function,BCS,772,"BCS (s)","Converts (B)ASIC-style strings to (C)-style (S)trings."
 String,function,BIN,773,"BIN (x)","Returns the binary value of x as string."
-String,function,CBS,774,"CBS (s)","converts (C)-style strings to (B)ASIC-style (S)trings."
+String,function,CBS,774,"CBS (s)","Converts (C)-style strings to (B)ASIC-style (S)trings."
 String,function,CHOP,775,"CHOP (source)","Chops off the last character of the string 'source' and returns the result."
 String,function,CHR,776,"CHR (x)","Returns one-char string of character with ASCII code x."
 String,function,DISCLOSE,777,"DISCLOSE (str[, pairs [, ignore-pairs]])","Discloses a string."
@@ -285,7 +279,6 @@ System,command,DELAY,806,"DELAY ms","Delay for a specified amount of millisecond
 System,command,ENV,807,"ENV expr","See ENVIRON."
 System,command,ENVIRON,808,"ENVIRON expr","Adds a variable to or deletes a variable from the current environment variable-table."
 System,command,PAUSE,809,"PAUSE [secs]","Pauses the execution for a specified length of time, or until user hit the keyboard."
-System,command,RTE,811,"RTE [info [, ...]]","Creates a Run-Time-Error. The parameters will be displayed on error-line."
 System,command,STKDUMP,812,"STKDUMP","Display internal execution stack."
 System,command,TROFF,813,"TROFF","See TRON."
 System,command,TRON,814,"TRON","When trace mechanism is ON, displays each line number as the program is executed."
@@ -296,3 +289,19 @@ System,function,RUN,818,"RUN cmdstr","Loads a secondary copy of system's shell a
 System,function,TICKS,819,"TICKS","Returns the system-ticks. The tick value is depended on operating system."
 System,function,TICKSPERSEC,820,"TICKSPERSEC","Returns the number of ticks per second."
 System,function,TIMER,821,"TIMER","Returns the number of seconds from midnight."
+Language,keyword,DECLARE,0,"DECLARE FUNC xxx","Forward declare SUB or FUNC. Obsolete QB compatibility"
+Language,keyword,TO,0,"FOR t = 1 TO 10","Specifies the loop counter end in a FOR loop"
+Language,keyword,STEP,0,"FOR t = 1 TO 10 STEP 2","Specifies the loop counter increment in a FOR loop"
+Language,keyword,USING,0,"PRINT USING","See PRINT, SPRINT"
+Language,keyword,USG,0,"PRINT USG","Synonym for USING"
+Language,keyword,AS,0,"AS #fileN","See: OPEN"
+Language,keyword,TRY,0,"TRY","The TRY statement introduces a TRY/CATCH BLOCK"
+Language,keyword,CATCH,0,"CATCH [var | expr]","The CATCH statement is used to CATCH an run-time error. This is typically used with errors raised when calling a file system command that cannot be completed, for example attempting to open a non-existent file. The CATCH statement has two modes. You can supply a variable argument to store the error string. Alternatively you can supply an expression. When the raised error matches the (String) expression, the error will be caught. When using the expression mode, you can supply a succession of CATCH statements to handle various error messages separately."
+Language,keyword,END TRY,0,"END TRY","The END TRY statement marks the end of a TRY/CATCH block."
+Language,keyword,BG,0,"SOUND frq, dur [, vol] [BG]","Play sound in the background. This prevent the program from blocking while the sound plays."
+Language,function,THROW,0,"THROW","The THROW command (previously known as RTE) is used to initiate a catch-able error. If there is no surrounding TRY/CATCH block, THROW can be used to abort the program."
+Graphics,command,SHOWPAGE,0,"SHOWPAGE","This command is used to display pending graphics operations allowing for smooth animations."
+Data,function,ISMAP,0,"ISMAP (x)","Returns true if x is an MAP variable type. A MAP provides value-key pair access along with array or dotted notation. The MAP can be initialized from a String variable using the ARRAY command"
+Data,function,ISREF,0,"ISREF (x)","Returns true if x is a reference variable type. The REF variable type is a ""reference"" to another variable (like a pointer in c). You create a reference by assigning a variable with the BYREF keyword (or @ symbol)."
+Data,function,ARRAY,0,"ARRAY [var | expr]","Creates a ARRAY or MAP variable from the given string or expression"
+Console,command,FORM,0,"FORM","Create a form widget. "

src/common/brun.c

@@ -553,9 +553,6 @@ static inline void bc_loop_call_proc() {
   case kwRANDOMIZE:
     cmd_randomize();
     break;
-  case kwWSPLIT:
-    cmd_wsplit();
-    break;
   case kwSPLIT:
     cmd_split();
     break;
@@ -658,9 +655,6 @@ static inline void bc_loop_call_proc() {
   case kwCHMOD:
     cmd_chmod();
     break;
-  case kwPLOT2:
-    cmd_plot2();
-    break;
   case kwPLOT:
     cmd_plot();
     break;

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/kw.h

@@ -199,7 +199,6 @@ enum proc_keywords {
   kwCIRCLE,
   kwRANDOMIZE,
   kwSPLIT,
-  kwWSPLIT,
   kwWJOIN,
   kwPAUSE,
   kwDELAY,
@@ -233,7 +232,6 @@ enum proc_keywords {
   kwRMDIR,
   kwFLOCK,
   kwCHMOD,
-  kwPLOT2,
   kwPLOT,
   kwSTKDUMP,
   kwSWAP,
@@ -243,7 +241,6 @@ enum proc_keywords {
   kwBSAVE,
   kwTIMEHMS,
   kwEXPRSEQ,
-  kwUNLOADLIB,
   kwCALLCP,
   kwDEFINEKEY,
   kwSHOWPAGE,

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"