Merge pull request #30 from chrisws/0_11_20

0 12 0

Author: chrisws

ChangeLog

@@ -1,3 +1,16 @@
+2015-10-20
+	Fix LET when assigning a value to a MAP/ARRAY field
+
+2015-09-15
+	SDL Update PEN(3) to work more like FLTK
+	Fix display output before PEN
+	Fix BOLD and ITALIC font display
+	Context menu edit keyword completion
+	Updated program icon
+	Editor line number widget can be used for scrolling
+	Updated editor help display
+	Fix TSAVE with try/catch
+
 2015-08-26
 	Editor fixes:
 	- now displays an i-beam/edit cursor

Makefile.am

@@ -1,49 +1,14 @@
 # SmallBASIC
-# Copyright(C) 2001-2012 Chris Warren-Smith.
+# Copyright(C) 2001-2015 Chris Warren-Smith.
 #
 # This program is distributed under the terms of the GPL v2.0 or later
 # Download the GNU Public License (GPL) from www.gnu.org
 # 
 
 SUBDIRS = @BUILD_SUBDIRS@
 
-EXTRA_DIST =                                    \
-    AUTHORS                                     \
-    ChangeLog                                   \
-    configure.in                                \
-    NEWS                                        \
-    README                                      \
-    autogen.sh                                  \
-    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.UNIX                   \
-    images/logo.gif                             \
-    images/sb16x16.png                          \
-    images/sb32x32.png                          \
-    images/sb-desktop-16x16.png                 \
-    images/sb-desktop-32x32.png                 \
-    ide/smallbasic.lang                         \
-    ide/small-basic-mode.el                     \
-    ide/smallbasic.syn                          \
-    rpm/README                                  \
-    rpm/SPECS/opensuse.spec
-
-install-exec-hook:
-	(mkdir -p $(DESTDIR)$(pkgdatadir) &&                        \
-   mkdir -p $(DESTDIR)$(pkgdatadir)/plugins &&                \
-   mkdir -p $(DESTDIR)$(pkgdatadir)/ide &&                    \
-   mkdir -p $(DESTDIR)$(pkgdatadir)/samples &&                \
-   cp documentation/sbasic_ref.csv $(DESTDIR)$(pkgdatadir) && \
-   cp plugins/*.* $(DESTDIR)$(pkgdatadir)/plugins &&          \
-   cp ide/*.* $(DESTDIR)$(pkgdatadir)/ide)
-
 deb:
-	fakeroot dpkg-buildpackage
+	fakeroot dpkg-buildpackage -b
 
 test:
 	(cd @TEST_DIR@ && make test)

README.md

@@ -1,6 +1,15 @@
 SmallBASIC is a fast and easy to learn BASIC language interpreter ideal for everyday calculations, scripts and prototypes. SmallBASIC includes trigonometric, matrices and algebra functions, a built in IDE, a powerful string library, system, sound, and graphic commands along with structured programming syntax
 
 ## Building the SDL version
+
+Initial setup on linux
+```
+ $ sudo apt-get install git autotools-dev automake gcc g++ libsdl2-dev libfreetype6-dev libfontconfig1-dev
+ $ git clone https://github.com/smallbasic/SmallBASIC.git
+ $ cd SmallBASIC
+ $ sh autogen.sh
+```
+Build in linux
 ```
  $ ./configure --enable-sdl
  $ make

configure.ac

@@ -1,13 +1,13 @@
 dnl
 dnl Configure script for SmallBASIC
 dnl
-dnl Copyright(C) 2001-2014 Chris Warren-Smith.
+dnl Copyright(C) 2001-2015 Chris Warren-Smith.
 dnl
 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], [0.11.20])
+AC_INIT([smallbasic], [0.12.0])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -204,9 +204,24 @@ 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`"
      AC_DEFINE(_Win32, 1, [Windows build])
      ;;
 
+     *darwin*)
+     # OSX Check fontconfig configuration
+     PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
+     AC_SUBST(FONTCONFIG_CFLAGS)
+     AC_SUBST(FONTCONFIG_LIBS)
+
+     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
+
+     dnl backlinking support for modules
+     PACKAGE_LIBS="${PACKAGE_LIBS} -ldl"
+     PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
+     PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs` `freetype-config --libs`"
+     ;;
+
      *)
      # Unix - Check fontconfig configuration
      PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
@@ -218,17 +233,10 @@ function buildSDL() {
      dnl backlinking support for modules
      PACKAGE_LIBS="${PACKAGE_LIBS} -ldl"
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
+     PACKAGE_LIBS="-static-libgcc ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"
    esac
 
    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`"
-     ;;
-
-     *)
-      PACKAGE_LIBS="${PACKAGE_LIBS} `sdl2-config --libs` `freetype-config --libs`"
-    esac
 
    dnl preconfigured values for SDL build
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
@@ -339,19 +347,7 @@ function buildConsole() {
    AC_SUBST(BUILD_SUBDIRS)
 }
 
-function buildDist() {
-   TARGET="Building source code release."
-   defaultConditionals
-   BUILD_SUBDIRS="src/common src/platform/gtk/src src/platform/gtk/data src/platform/gtk/icons"
-   BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/fltk"
-   BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/sdl"
-   BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/unix"
-   AC_SUBST(BUILD_SUBDIRS)
-}
-
-if test x$ac_build_dist = xyes; then
-   buildDist
-elif test x$ac_build_fltk = xyes; then
+if test x$ac_build_fltk = xyes; then
    buildFLTK
 elif test x$ac_build_sdl = xyes; then
    buildSDL

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.0) unstable; urgency=low
+  * Various - see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 17 Sept 2015 09:45:25 +1000
+
 smallbasic (0.11.17) unstable; urgency=low
   * Fix compiler ignoring unused assignment values
   * Implement  IMAGE

debian/rules

@@ -28,7 +28,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --enable-fltk
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-sdl
 
 build: build-stamp
 
@@ -69,17 +69,11 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs 
-	dh_installexamples 
-	dh_install --exclude=".git" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
-	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

documentation/build_kwp.cpp

@@ -236,7 +236,7 @@ int main(int argc, char *argv[]) {
   }
 
   fprintf(stdout, "/* automagicaly generated file */\n");
-  fprintf(stdout, "struct KEYWORD_HELP {\n");
+  fprintf(stdout, "static struct KEYWORD_HELP {\n");
   fprintf(stdout, "  const char *package;\n");
   fprintf(stdout, "  const char *keyword;\n");
   fprintf(stdout, "  const char *signature;\n");

documentation/sbasic_ref.csv

@@ -149,7 +149,7 @@ Language,keyword,SUB,657,"SUB foo (a, b)","Declare a sub procedure. Sub's do not
 Language,keyword,THEN,658,"THEN","foo = 1: if foo==1 THEN: ? ""one"": fi"
 Language,keyword,UNIT,659,"UNIT name","Units are a set of procedures, functions and/or variables that can be used by another program or unit."
 Language,keyword,UNTIL,660,"UNTIL","a = 0: repeat: a++: ? a: UNTIL a = 10"
-Language,keyword,USE,661,"USE","Used with various commands for passing a user-defined expression. eg SPLIT s," ",v USE TRIM(x). Trim each element of v."
+Language,keyword,USE,661,"USE","Used with various commands for passing a user-defined expression. eg SPLIT s,"" "",v USE TRIM(x). Trim each element of v."
 Language,operator,AND,662,"a AND b","Logical AND. Right side is not evaluated if left side evaluates to False."
 Language,operator,BAND,663,"a BAND b","Bitwise AND."
 Language,operator,BOR,664,"a BOR b","Bitwise OR."

ide/android/AndroidManifest.xml

@@ -3,7 +3,7 @@
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
           android:versionCode="15"
-          android:versionName="0.11.19">
+          android:versionName="0.12.0">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9"/>
 

ide/android/assets/main.bas

@@ -21,7 +21,6 @@ func mk_bn(value, lab, fg)
   bn.value = value
   bn.label = lab
   bn.color = fg
-  bn.backgroundColor = 0
   mk_bn = bn
 end
 
@@ -56,7 +55,7 @@ sub do_about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.20"
+  print "Version 0.12.0"
   print
   print "Copyright (c) 2002-2015 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)
@@ -82,6 +81,40 @@ sub do_about()
   cls
 end
 
+sub do_newfile()
+  color 3, 0
+  cls
+  print boldOn + "Create new program."
+  print boldOff + "To enable editing, display the menu then select Editor [ON]."
+  print "Press <enter> to leave this screen without making any changes."
+  print
+  local valid_file = false
+  while (!valid_file)
+    input "Enter file name: ", file
+    if (len(file) == 0) then
+      exit loop
+    endif
+    if (leftoflast(file, ".bas") == 0) then
+      file += ".bas"
+    endif
+    try
+      if (exist(file)) then
+        print "File " + file + " already exists"
+      else
+        dim text
+        text << "REM SmallBASIC"
+        text << "REM created: " + date
+        tsave file, text
+        valid_file = true
+      endif
+    catch e
+      print "Error creating file: " e
+    end try
+  wend
+  color 7, 0
+  cls
+end
+
 sub do_setup()
   color 3, 0
   cls
@@ -177,13 +210,14 @@ end
 
 sub main
   local basList, dirList, path
-  local frm, bn_about, bn_online
+  local frm, bn_about, bn_online, bn_new
   local do_intro
 
   dim basList
   dim dirList
 
   bn_setup = mk_menu("_setup", "Setup", -1)
+  bn_new = mk_menu("_new", "New", -1)
   bn_about = mk_menu("_about", "About", -1)
   bn_online = mk_menu(onlineUrl, "Online", 0)
   bn_online.isExit = true
@@ -194,6 +228,7 @@ sub main
     if (osname != "SDL") then
      frm.inputs << bn_setup
     endif
+    frm.inputs << bn_new
     frm.inputs << bn_about
 
     if (welcome) then
@@ -202,7 +237,6 @@ sub main
 
     listFiles frm, path, basList, dirList
     frm.color = 10
-    frm.backgroundColor = 0
     rect 0, 0, xmax, lineSpacing COLOR 1 filled
     at 0, 0
     make_ui = form(frm)
@@ -249,6 +283,10 @@ sub main
       frm.close()
       do_setup()
       frm = make_ui(path, false)
+    elif frm.value == "_new" then
+      frm.close()
+      do_newfile()
+      frm = make_ui(path, false)
     elif frm.value == "_back" then
       frm.close()
       go_back