Merge pull request #126 from chrisws/12_22

12 22

Author: chrisws

ChangeLog

@@ -1,3 +1,54 @@
+2021-08-22 (12.23)
+	SDL: Validate window dimensions on loading to prevent hidden window
+
+2021-08-16 (12.23)
+	COMMON: Fix array append regression #122
+	UI: added window hideKeypad #125
+
+2021-08-16 (12.23)
+	ANDROID: Hide keypad on run. Show keypad for INPUT, then re-hide on completion.
+
+2021-07-28 (12.22)
+	UI: Allow RGB to be used with image array passed to IMAGE
+
+2021-07-27 (12.22)
+	FLTK: Fix PSET display of extra pixel
+
+2021-07-04 (12.22)
+	SDL: Fix Live edit when start path contains unicode characters
+
+2021-07-02 (12.22)
+	UI: Fix to make image save and load compatible
+
+2021-06-25 (12.22)
+	ANDROID: Unified file listing includes bas files from sub-folders
+
+2021-06-23 (12.22)
+	FLTK: Implemented image opacity handling
+	UI: Implemented image.clip(left,top,right,bottom)
+
+2021-06-12 (12.22)
+	UI: Fix potential memory leak using IMAGE
+	UI: Fix RGB handling with IMAGE
+	ANDROID: restore home directory when resuming from run
+	ANDROID: removed samsung keypad warning
+
+2021-06-06 (12.22)
+	UI: implemented image.draw(), fix image.save in andoid #115
+
+2021-06-05 (12.22)
+	COMMON: Fixes 'Socket Client doesn't receive byte with value 13' #112
+	COMMON: Fixes TSAVE of arrays includes extra null character. #119
+
+2021-05-03 (12.22)
+	COMMON: Fix array access regression
+
+2021-05-03 (12.22)
+	ANDROID: Removes path navigation to show unified view of available folder
+
+2021-04-02 (12.22)
+	SDL: Update editor to handle unit errors
+
 2021-04-02 (12.21)
 	ANDROID: Added range checking for the web services port
 

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.21])
+AC_INIT([smallbasic], [12.22])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

documentation/sbasic_ref.csv

@@ -95,7 +95,7 @@ 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,SHOWPAGE,1429,"SHOWPAGE","This command is used to display pending graphics operations allowing for smooth animations."
 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. WINDOW is also overloaded as a function, returning a system object providing access to the following sub-commands: graphicsScreen1, graphicsScreen2, textScreen, alert, ask, menu, message, showKeypad, insetTextScreen"
+Graphics,command,WINDOW,624,"WINDOW [x1,y2,x2,y1]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates. WINDOW is also overloaded as a function, returning a system object providing access to the following sub-commands: graphicsScreen1, graphicsScreen2, textScreen, alert, ask, menu, message, showKeypad, insetTextScreen"
 Graphics,constant,XMAX,1526,"XMAX","Holds the screen width in pixels"
 Graphics,constant,YMAX,1527,"YMAX","Holds the screen height in pixels."
 Graphics,function,PEN,627,"PEN (0..14)","Returns the PEN/MOUSE data."

samples/distro-examples/tests/all.bas

@@ -198,7 +198,7 @@ print "RIGHT:" + RIGHT (s,2)
 print "RIGHTOF:" + RIGHTOF (s1, s2)
 print "RIGHTOFLAST:" + RIGHTOFLAST (s1, s2)
 print "RINSTR:" + RINSTR (2, s1, s2)
-print "RND:" + RND
+print "RND:" + iff(RND>=0 && RND<=1.0,1,0)
 print "ROUND:" + ROUND (x,22)
 print "RTRIM:" + RTRIM (s)
 print "RUN:" '+ RUN cmdstr

samples/distro-examples/tests/array.bas

@@ -327,3 +327,12 @@ sub xfunc(argx)
 end
 z=anims[0].framePoses[0, 0].translation
 xfunc(anims[0].framePoses[0, 0].translation)
+
+dim a()
+append a, [1,2],[3,4],[5,6]
+a << [7,8,9]
+if (a[0] != [1,2]) then throw "err1"
+if (a[1] != [3,4]) then throw "err2"
+if (a[2] != [5,6]) then throw "err3"
+if (a[3] != [7,8,9]) then throw "err4"
+

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

@@ -183,7 +183,7 @@ RIGHT:gs
 RIGHTOF:
 RIGHTOFLAST:
 RINSTR:0
-RND:0.75898406142369
+RND:1
 ROUND:12.3
 RTRIM:catsanddogs
 RUN:

src/common/Makefile.am

@@ -54,6 +54,7 @@ libsb_common_a_SOURCES =                  \
     device.c device.h                     \
     screen.c                              \
     system.c                              \
+    random.c                              \
     eval.c                                \
     extlib.c extlib.h                     \
     file.c                                \

src/common/blib.c

@@ -258,11 +258,6 @@ void cmd_append() {
 
   // for each argument to append
   do {
-    // get the value to append
-    var_t arg_p;
-    v_init(&arg_p);
-    eval(&arg_p);
-
     // find the array element
     var_t *elem_p;
     if (var_p->type != V_ARRAY) {
@@ -274,7 +269,8 @@ void cmd_append() {
     }
 
     // set the value onto the element
-    v_move(elem_p, &arg_p);
+    v_init(elem_p);
+    eval(elem_p);
 
     // next parameter
     if (code_peek() != kwTYPE_SEP) {
@@ -288,27 +284,6 @@ void cmd_append() {
   } while (1);
 }
 
-void cmd_append_opt() {
-  var_t *v_left = code_getvarptr();
-
-  // skip kwTYPE_SEP + ","
-  code_skipsep();
-
-  // skip kwTYPE_VAR
-  code_skipnext();
-
-  var_t *elem_p;
-  if (v_left->type != V_ARRAY) {
-    v_toarray1(v_left, 1);
-    elem_p = v_elem(v_left, 0);
-  } else {
-    v_resize_array(v_left, v_asize(v_left) + 1);
-    elem_p = v_elem(v_left, v_asize(v_left) - 1);
-  }
-
-  v_set(elem_p, tvar[code_getaddr()]);
-}
-
 /**
  * INSERT A, index, v1 [, vN]
  */
@@ -530,7 +505,7 @@ void cmd_print(int output) {
     if (code_peek() == kwTYPE_EOC || code_peek() == kwTYPE_LINE) {
       // There are no parameters
       if (dev_fstatus(handle)) {
-        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
+        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, OS_LINESEPARATOR_LEN);
       } else {
         err_fopen();
       }
@@ -2051,18 +2026,18 @@ void cmd_restore() {
  * RANDOMIZE [num]
  */
 void cmd_randomize() {
-  long seed;
+  var_int_t seed;
 
   byte code = code_peek();
   switch (code) {
   case kwTYPE_LINE:
   case kwTYPE_EOC:
-    srand(clock());
+    pcg32_srand(clock());
     break;
   default:
     seed = par_getint();
     if (!prog_error) {
-      srand(seed);
+      pcg32_srand(seed);
     }
   };
 }

src/common/blib.h

@@ -37,7 +37,6 @@ void cmd_packed_let();
 void cmd_dim(int);
 void cmd_redim(void);
 void cmd_append(void);
-void cmd_append_opt(void);
 void cmd_lins(void);
 void cmd_ldel(void);
 void cmd_erase(void);

src/common/blib_db.c

@@ -725,7 +725,7 @@ void cmd_fsaveln() {
     for (int i = 0; i < v_asize(array_p); i++) {
       var_p = v_elem(array_p, i);
       fprint_var(handle, var_p);
-      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
+      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, OS_LINESEPARATOR_LEN);
     }
   } else {
     // parameter is an string