Merge pull request #58 from chrisws/0_12_10

0 12 10

Author: chrisws

ChangeLog

@@ -1,3 +1,9 @@
+2017-11-28 (0.12.10)
+	COMMON: Fix some coverty warnings
+
+2017-11-17 (0.12.10)
+	SDL: Fix debugger display issue
+
 2017-11-08 (0.12.10)
 	UI: Added ALT+= command
 	UI: Update ALT+. to work with error handling

Makefile.am

@@ -19,6 +19,31 @@ leak-test:
 cppcheck:
 	(cppcheck --quiet --enable=all src/common src/ui src/platform/android/jni src/platform/sdl)
 
+covcheck:
+	(make clean -s && \
+   cov-build --dir cov-int ./configure --enable-sdl && \
+   cov-build --dir cov-int make -s && \
+   tar czvf smallbasic.tgz cov-int)
+
+covcheck-android:
+	(make clean -s && \
+   cov-build --dir cov-int ./configure --enable-android && \
+   cov-build --dir cov-int make check -s && \
+   tar czvf smallbasic.tgz cov-int)
+
+clangcheck:
+	(make clean -s && \
+   scan-build ./configure --enable-sdl && \
+   scan-build -o scan make -s)
+
+clangcheck-android:
+	(make clean -s && \
+   scan-build ./configure --enable-android && \
+   scan-build -o scan make check -s)
+
+check:
+	(cd $(SUBDIRS) && make check)
+
 release:
 	(cd $(SUBDIRS) && make release)
 

configure.ac

@@ -164,7 +164,8 @@ function buildSDL() {
      dnl do not depend on cygwin.dll under cygwin build
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -mms-bitfields"
      PACKAGE_LIBS="${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
-     PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
+     PACKAGE_LIBS="${PACKAGE_LIBS} -Wl,-Bstatic -Wl,-Map=output.map"
+     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 
@@ -343,6 +344,10 @@ dnl change default aru setting to avoid warning
 ARFLAGS=cr
 AC_SUBST(ARFLAGS)
 
+dnl check missing functions
+AC_CHECK_FUNC([strlcpy], [AC_DEFINE([HAVE_STRLCPY], [1], [Define if strlcpy exists.])])
+AC_CHECK_FUNC([strlcat], [AC_DEFINE([HAVE_STRLCAT], [1], [Define if strlcat exists.])])
+
 AC_CONFIG_FILES([
 Makefile
 src/common/Makefile

ide/android/assets/main.bas

@@ -7,7 +7,7 @@ const char_w = txtw(".")
 const lineSpacing = 2 + char_h
 const idxEdit = 6
 const idxFiles = 7
-const sizeDateCol = rgb(100,100,100)
+const colGrey = rgb(100,100,100)
 const menu_gap = -(char_w / 2)
 const is_sdl = instr(sbver, "SDL") != 0
 const onlineUrl = "http://smallbasic.github.io/samples/index.bas"
@@ -24,6 +24,7 @@ const filesId = "_files"
 const setupId = "_setup"
 const aboutId = "_about"
 const backId = "_back"
+const scratchId = "_scratch"
 
 func mk_bn(value, lab, fg)
   local bn
@@ -47,23 +48,34 @@ func mk_menu(value, lab, x)
   mk_menu = bn
 end
 
-sub mk_scratch()
+func mk_scratch()
   local text
   local file = "scratch.bas"
+  local result = false
 
   if (not exist(file)) then
     dim text
     text << "rem Welcome to SmallBASIC"
     text << "rem"
-    text << "rem Press F1 for keyword help."
-    text << "rem Press and hold Ctrl then press 'h' for editor help."
-    text << "rem Press and hold Ctrl then press 'r' to RUN this program."
+    if (is_sdl) then
+      text << "rem Press F1 for keyword help."
+      text << "rem Press and hold Ctrl then press 'h' for editor help."
+      text << "rem Press and hold Ctrl then press 'r' to RUN this program."
+      text << "rem Click the right mouse button for menu options."
+    else
+      text << "rem Press the 3 vertical dots for menu options."
+    endif
     try
       tsave file, text
+      result = true
     catch e
-      logprint "Failed to create scratch file: " + e
+      local wnd = window()
+      wnd.alert("Failed to create scratch file: " + e)
     end try
+  else
+    result = true
   endif
+  return result
 end
 
 sub do_okay_button()
@@ -93,14 +105,14 @@ sub do_about()
     print "(_ ._ _  _.|||_) /\ (_ |/ "
     print "__)| | |(_||||_)/--\__)|\_"
   endif
-  print 
+  print
   color 7,0
   print "Version "; sbver
   print
   print "Copyright (c) 2002-2017 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)
   print "https://smallbasic.sourceforge.io" + chr(10)
-  color sizeDateCol,0
+  color colGrey,0
   print "SmallBASIC comes with ABSOLUTELY NO WARRANTY. ";
   print "This program is free software; you can use it ";
   print "redistribute it and/or modify it under the terms of the ";
@@ -285,7 +297,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
   bn.y = -1
   frm.inputs << bn
 
-  abbr = iff(char_w * 65 > xmax, true, false)
+  abbr = iff(char_w * 38 > xmax, true, false)
   if (not abbr) then
     bn = mk_bn(sortSizeId, "[Size]", size_col)
     bn.type = "link"
@@ -322,7 +334,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
 
       gap = 12 - len(str(node.size))
       n = iff(gap > 1, gap, 1)
-      bn = mk_bn(0, node.size + space(n) + timestamp(node.mtime), sizeDateCol)
+      bn = mk_bn(0, node.size + space(n) + timestamp(node.mtime), colGrey)
       bn.type = "label"
       bn.y = -1
       gap = 29 - len(name)
@@ -561,23 +573,21 @@ sub main
   local sortDir = env("sortDir")
   if (len(sortDir) == 0) then sortDir = 0
 
-  if (command == "welcome" && len(files("*.bas")) == 0) then
-    mk_scratch()
-  endif
-
   func makeUI(path, sortDir)
-    local frm, bn_files, bn_online, bn_setup, bn_about, bn_new
+    local frm, bn_files, bn_online, bn_setup, bn_about, bn_new, bn_scratch
     local basList
     dim basList
 
     bn_files = mk_menu(filesId, "File", 0)
     bn_online = mk_menu(onlineUrl, "Online", menu_gap)
+    bn_scratch = mk_menu(scratchId, "Scratch", menu_gap)
     bn_setup = mk_menu(setupId, "Setup", menu_gap)
     bn_about = mk_menu(aboutId, "About", menu_gap)
     bn_online.isExit = true
 
     frm.inputs << bn_files
     frm.inputs << bn_online
+    frm.inputs << bn_scratch
     if (!is_sdl) then
       frm.inputs << bn_setup
     endif
@@ -629,6 +639,10 @@ sub main
         managefiles()
       endif
       frm = makeUI(path, sortDir)
+    elif frm.value == scratchId then
+      if (mk_scratch())
+        frm.close("scratch.bas")
+      endif
     elif frm.value == backId then
       cls
       go_back()

samples/distro-examples/graphics/recherche.bas

@@ -0,0 +1,38 @@
+rem recherche
+Rem reg1s roum1gu1eres 2017
+view (10,470,10,600)
+X=xmax/2
+y=ymax/2
+c=36
+p=2
+d=xmax/4
+d_dir=-1
+while 1
+  cls
+  for a=1 to 1200 'originally 360
+    pset (0.06) (x+d*cos((a/150) -345)*sin(a/c)),  (y+d*sin(360-(a/p))*cos(a/180)) color 3
+    pset (0.06) (x+d*cos((a/147.27)-345)*sin(a/c)),(y+d*sin(360-(a/p))*cos(a/150)) color 3
+    pset (0.06) (x+d*cos((a/144)-345)*sin(a/c)),   (y+d*sin(360-(a/p))*cos(a/147.27)) color 3
+    pset (0.06) (x+d*cos((a/140)-345)*sin(a/c)),   (y+d*sin(360-(a/p))*cos(a/144)) color 3
+    pset (0.06) (x+d*cos((a/135)-345)*sin(a/c)),   (y+d*sin(360-(a/p))*cos(a/140)) color 3
+    pset (0.06) (x+d*cos((a/128.5)-345)*sin(a/c)), (y+d*sin(360-(a/p))*cos(a/135)) color 3
+    'pset (0.06) (x+d*cos((a/120)-345)*sin(a/c)),   (y+d*sin(360-(a/c))*cos(a/120)) color 6
+    pset (0.06) (x+d*cos((a/90)-345)*sin(a/c)),    (y+d*sin(360-(a/p))*cos(a/108)) color 3
+    pset (0.06) (x+d*cos((a/60)-345)*sin(a/c)),    (y+d*sin(360-(a/p))*cos(a/90)) color 3
+    pset x+(d*cos(a/359)*sin(a/c)),  y+(d*sin(a)*cos(a/p)*sin(a/359)) color 7
+    pset x-(d*cos(a/359)),           y+(d*sin(a)*cos(a/359)) color 7
+    'pset x+d*cos(a/359),             y-d*sin(a/c)*cos(a/359) color 2
+    pset x-(d*cos(a/359)*sin(a/32)), y+(d*sin(a)*cos(a/c+c)*sin(a/359)) color 7
+    pset x-d*cos(a/24)*sin(a/32),    y+d*sin(a)*cos(a/8)*sin(a) color 7
+  next a
+  showpage
+  p = 1 + (p + 1) mod 400
+  c = 1 + (c + 1) mod 200
+  d += d_dir
+  if (d < -1200) then 
+    d_dir = 1
+  else if (d > 1200) then
+    d_dir = -1
+  endif
+wend  
+pause

samples/distro-examples/tests/array.bas

@@ -281,3 +281,16 @@ if (stack != [1,2]) then throw "stack err"
 queue=[11,12,13,14,15,16]
 delete queue, 0, 3
 if (queue != [14,15,16]) then throw "queue err"
+
+rem --- handle comments inside JSON block
+camera = {
+ x:        512, rem position on the map
+ y:        800, rem y position on the map
+ height:    78, rem height of the camera
+ angle:      0, rem direction of the camera
+ horizon:  100, rem horizon position (look up and down)
+ distance: 800  rem distance of map
+}
+if (camera.x != 512) then throw "invalid x"
+if (camera.height != 78) then throw "invalid height"
+if (camera.distance != 800) then throw "invalid distance"

samples/distro-examples/tests/eval-test.bas

@@ -362,3 +362,11 @@ moves_called = false
 for i in s.moves()
 next i  
 
+gg = 99
+gosub plus1
+if (gg != 100) then throw "err"
+end
+label plus1
+ gg += 1
+return
+

samples/distro-examples/tests/matrices.bas

@@ -39,3 +39,8 @@ C=LinEqn(a,b)
 print "[x; y; z] = "; C
 ?
 
+rem -- handling for dot product and multiplication of two 1D arrays
+a1=[1,2,4]
+a2=[1,4,5]
+if (a1 * a2 != [1,8,20]) then throw "err"
+if (a1 % a2 != 29) then throw "err"

src/common/Makefile.am

@@ -41,6 +41,7 @@ libsb_common_a_SOURCES =                  \
     ../lib/match.c ../lib/match.h         \
     ../lib/jsmn.c ../lib/jsmn.h           \
     ../lib/lodepng.c ../lib/lodepng.h     \
+    ../lib/str.c ../lib/str.h             \
     ../lib/matrix.c                       \
     ../lib/xpm.c                          \
     bc.c bc.h                             \

src/common/bc.c

@@ -173,17 +173,13 @@ void bc_add_creal(bc_t *bc, var_num_t v) {
  * add one command and one string (see: bc_store_string)
  */
 void bc_add_strn(bc_t *bc, const char *str, int len) {
-  if (len > BC_MAX_STORE_SIZE) {
-    sc_raise("String: buffer size limit exceeded");
-  } else {
-    bc_add_code(bc, kwTYPE_STR);
-    bc_add_dword(bc, len);
-    if (bc->count + len >= bc->size) {
-      bc_resize(bc, bc->size + BC_ALLOC_INCR + len);
-    }
-    memcpy(bc->ptr + bc->count, str, len);
-    bc->count += len;
+  bc_add_code(bc, kwTYPE_STR);
+  bc_add_dword(bc, len);
+  if (bc->count + len >= bc->size) {
+    bc_resize(bc, bc->size + BC_ALLOC_INCR + len);
   }
+  memcpy(bc->ptr + bc->count, str, len);
+  bc->count += len;
 }
 
 /*
@@ -239,6 +235,7 @@ char *bc_store_string(bc_t *bc, char *src) {
     }
     p++;
   }
+  free(np);
   return p;
 }