Merge pull request #42 from chrisws/0_11_20

0 12 6

Author: chrisws

README.md

@@ -81,29 +81,6 @@ Useful adb commands for debugging:
 adb shell dumpsys cpuinfo
 adb shell top -m 10
 
-## Building the TIZEN port
-
-1. Download and install the Tizen IDE
-
-2. Add the following lines to .bashrc
-```
-TIZEN_SDK=${HOME}/tizen-sdk
-TIZEN_ROOTSTRAP=${TIZEN_SDK}/platforms/mobile-3.0/rootstraps/mobile-3.0-device.native
-export TIZEN_BIN=${TIZEN_SDK}/tools/arm-linux-gnueabi-gcc-4.5/bin
-export TIZEN_LIBS=${HOME}/tizen-lib
-export PATH=${PATH}:${TIZEN_BIN}:~/bin
-export CHOST=arm-linux-gnueabi
-export LDFLAGS="--sysroot=${TIZEN_ROOTSTRAP} -L${TIZEN_LIBS}/lib"
-export CPPFLAGS="--sysroot=${TIZEN_ROOTSTRAP} -fmessage-length=0 -fPIC\
-  -I${TIZEN_ROOTSTRAP}/usr/include -I${TIZEN_LIBS}/include"
-export CFLAGS=${CPPFLAGS}
-```
-3. Build the common components
-```
-./configure --enable-tizen
-```
-4. Build the project using Tizen IDE
-
 ### .indent.pro settings
 ```
  -brf -nbap -br -brs -cdb -cdw -ce -cli0 -fca -i2 -l110 -lc110 -lp

configure.ac

@@ -1,7 +1,7 @@
 dnl
 dnl Configure script for SmallBASIC
 dnl
-dnl Copyright(C) 2001-2015 Chris Warren-Smith.
+dnl Copyright(C) 2001-2016 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
@@ -34,11 +34,6 @@ AC_ARG_ENABLE(sdl,
   [ac_build_sdl="yes"],
   [ac_build_sdl="no"])
 
-AC_ARG_ENABLE(tizen,
-  AS_HELP_STRING([--enable-tizen],[build common library for Tizen(default=no)]),
-  [ac_build_tizen="yes"],
-  [ac_build_tizen="no"])
-
 AC_ARG_ENABLE(android,
   AS_HELP_STRING([--enable-android],[build common library for Android(default=no)]),
   [ac_build_android="yes"],
@@ -90,9 +85,6 @@ function checkPCRE() {
      have_pcre="no"
    esac
 
-   if test x$ac_build_tizen = xyes; then
-     have_pcre="no"
-   fi
    if test x$ac_build_android = xyes; then
      have_pcre="no"
    fi
@@ -103,6 +95,23 @@ function checkPCRE() {
    fi
 }
 
+function checkTermios() {
+   AC_CHECK_HEADERS([termios.h], [have_termios_h=yes; break;])
+
+   case "${host_os}" in
+     *mingw* | pw32* | cygwin*)
+     have_termios_h="no"
+   esac
+
+   if test x$ac_build_android = xyes; then
+     have_termios_h="no"
+   fi
+
+   if test "${have_termios_h}" = "yes" ; then
+     AC_DEFINE(USE_TERM_IO, 1, [use the termios library.])
+   fi
+}
+
 function defaultConditionals() {
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
 }
@@ -253,23 +262,6 @@ function buildSDL() {
    (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
-function buildTizen() {
-   TARGET="Building common library for Tizen."
-
-   defaultConditionals
-
-   AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(_TIZEN, 1, [Defined for Tizen build.])
-   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
-   AC_DEFINE(CPU_BIGENDIAN, 1, [Tizen uses big-endian])
-   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-
-   BUILD_SUBDIRS="src/platform/tizen/common"
-   AC_SUBST(BUILD_SUBDIRS)
-}
-
 function buildAndroid() {
    TARGET="Building for Android."
 
@@ -350,15 +342,14 @@ if test x$ac_build_fltk = xyes; then
    buildFLTK
 elif test x$ac_build_sdl = xyes; then
    buildSDL
-elif test x$ac_build_tizen = xyes; then
-   buildTizen
 elif test x$ac_build_android = xyes; then
    buildAndroid
 else
    buildConsole
 fi
 
 checkPCRE
+checkTermios
 checkDebugMode
 checkForWindows
 
@@ -378,7 +369,6 @@ src/common/Makefile
 src/platform/fltk/Makefile
 src/platform/sdl/Makefile
 src/platform/unix/Makefile
-src/platform/tizen/common/Makefile
 src/platform/android/Makefile
 ])
 AC_OUTPUT

documentation/build_kwp.cpp

@@ -96,9 +96,9 @@ bool isKeyword(const char *keyword) {
   }
 
   const char* constants[] = {
-    "SBVER", "PI", "XMAX", "YMAX", "TRUE", "FALSE", "CWD", "HOME", "COMMAND", ""
+    "SBVER", "PI", "XMAX", "YMAX", "TRUE", "FALSE", "CWD", "HOME", "COMMAND", "INCLUDE", ""
   };
-  for (int i = 0; !result && constants[i] != '\0'; i++) {
+  for (int i = 0; !result && constants[i][0] != '\0'; i++) {
     if (strcasecmp(constants[i], keyword) == 0) {
       result = true;
     }

documentation/sbasic_ref.csv

@@ -97,6 +97,7 @@ Graphics,command,RECT,622,"RECT [STEP] x,y [,|STEP x2,y2] [, color| COLOR color]
 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,constant,XMAX,1526,"XMAX","Holds the screen width 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."
@@ -109,15 +110,9 @@ Graphics,function,XPOS,635,"XPOS","Returns the current X position of the cursor
 Graphics,function,YPOS,636,"YPOS","Returns the current Y position of the cursor in ""characters""."
 Language,command,CALL,637,"CALL (fp)","Invoke a sub or func by address pointer."
 Language,command,THROW,1437,"THROW [info [, ...]]","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."
-Language,constant,COMMAND,1459,"COMMAND","SmallBASIC startup command line options."
-Language,constant,CWD,1456,"CWD","Current working directory"
 Language,constant,FALSE,1457,"FALSE","FALSE"
-Language,constant,HOME,1458,"HOME","User HOME folder"
-Language,constant,PI,1452,"PI","Holds PI"
-Language,constant,SBVER,1451,"SBVER","Version and build information"
 Language,constant,TRUE,1455,"TRUE","TRUE"
-Language,constant,XMAX,1453,"XMAX","Holds the screen width in pixels"
-Language,constant,YMAX,1454,"YMAX","Holds the screen height in pixels."
+Graphics,constant,YMAX,1527,"YMAX","Holds the screen height in pixels."
 Language,function,IFF,638,"IFF expr","Inline version of IF. eg, animal = ""cat"": fur = IFF( animal = ""cat"", ""yes"", ""no""): ? fur"
 Language,keyword,AS,1424,"AS #fileN","See: OPEN"
 Language,keyword,BG,1428,"SOUND frq, dur [, vol] [BG]","Play sound in the background. This prevent the program from blocking while the sound plays."
@@ -155,12 +150,14 @@ Language,operator,EQV,665,"a EQV b","Bitwise equivalence."
 Language,operator,IMP,666,"a IMP b","Used to perform a logical implication on two expressions."
 Language,operator,IN,667,"a IN b","Returns an index (1 Based) to the matching element when b is an array. Returns TRUE if the value is contained within b as a string."
 Language,operator,LIKE,668,"a LIKE b","Regular-expression operator. Compares the left part of the expression with the right side regex pattern."
+Language,operator,LSHIFT,1496,"result = LSHIFT number, amount","Performs an arithmetic left shift on a bit pattern."
 Language,operator,MDL,669,"MDL","Modulus."
 Language,operator,MOD,670,"a MOD b","Modulus. Equivalent syntax to the percent character, eg a % b"
 Language,operator,NAND,671,"a NAND b","Bitwise exclusive NOT AND."
 Language,operator,NOR,672,"a NOR b","Bitwise NOT OR."
 Language,operator,NOT,673,"a NOT b","Invert expression result. Equivalent syntax to the exclamation character, eg a ! b"
 Language,operator,OR,674,"a OR b","Logical OR. Right side is not evaluated if left side evaluates to True."
+Language,operator,RSHIFT,1497,"result = RSHIFT number, amount","Performs an arithmetic right shift on a bit pattern."
 Language,operator,XNOR,675,"a XNOR b","Bitwise exclusive NOT OR."
 Language,operator,XOR,676,"a XOR b","Bitwise exclusive OR. Equivalent syntax to: a ~ b"
 Language,statement,CONST,678,"CONST name = expr","Declare a variable who's value does not change during program execution."
@@ -298,6 +295,11 @@ System,command,RANDOMIZE,810,"RANDOMIZE [int]","Seeds the random number generato
 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."
+System,constant,COMMAND,1521,"COMMAND","SmallBASIC startup command line options."
+System,constant,CWD,1522,"CWD","Current working directory"
+System,constant,HOME,1525,"HOME","User HOME folder"
+System,constant,PI,1524,"PI","Holds PI"
+System,constant,SBVER,1523,"SBVER","Version and build information"
 System,function,ENV,815,"ENV expr","Returns the value of a specified entry in the current environment table. If the parameter is empty ("""") then returns an array of the environment variables (in var=value form)."
 System,function,FRE,606,"FRE (x)","Returns system information. eg, 0 = free memory, "
 System,function,PROGLINE,817,"PROGLINE","Returns the current program line number."
@@ -307,4 +309,5 @@ System,keyword,EXPORT,1440,"EXPORT thing","Export a SUB, FUNC or variable from a
 System,keyword,IMPORT,1441,"IMPORT","Import an exported UNIT variable, SUB or FUNC."
 System,keyword,UNIT,1446,"UNIT name","Declares the source module as a unit. Units are a set of procedures, functions and/or variables that can be used by another program or unit."
 System,statement,CHAIN,1439,"CHAIN source","Compile and run the given source. Source can be a file name, a line of code or an array of code. Use ENV to share variables with the parent process."
+System,statement,INCLUDE,1462,"INCLUDE source-file.bas","Inserts code in the named file when the program is compiled. "
 System,statement,OPTION,1442,"OPTION keyword","Used to pass parameters to the run-time environment."

src/common/brun.c

@@ -283,7 +283,7 @@ void exec_setup_predefined_variables() {
   setsysvar_int(SYSVAR_YMAX, os_graf_my - 1);
   setsysvar_int(SYSVAR_TRUE, 1);
   setsysvar_int(SYSVAR_FALSE, 0);
-  setsysvar_str(SYSVAR_PWD, dev_getcwd());
+  setsysvar_str(SYSVAR_CWD, dev_getcwd());
   setsysvar_str(SYSVAR_COMMAND, opt_command);
 
 #if defined(_UnixOS)
@@ -1178,7 +1178,7 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       find_unit(filename, fname);
     }
     if (access(fname, R_OK)) {
-      panic("File '%s' not found", filename);
+      panic("File '%s' not found", fname);
     }
     // look if it is already loaded
     if (search_task(fname) != -1) {
@@ -1765,6 +1765,10 @@ int sbasic_exec(const char *file) {
   if (opt_syntaxcheck) {         // this is a command-line flag to
     // syntax-check only
     exec_rq = 0;
+  } else if (ctask->bc_type == 2) {
+    // cannot run a unit
+    exec_rq = 0;
+    gsb_last_error = 1;
   } else if (opt_decomp && success) {
     sbasic_exec_prepare(file);  // load everything
     sbasic_dump_taskinfo(stdout);

src/common/device.h

@@ -26,6 +26,12 @@
 #if !defined(_device_h)
 #define _device_h
 
+#include "config.h"
+
+#if USE_TERM_IO
+#include <termios.h>
+#endif
+
 #include "common/sys.h"
 #include "common/var.h"
 

src/common/file.c

@@ -616,7 +616,7 @@ void dev_chdir(const char *dir) {
   if (chdir(dir) != 0) {
     err_file(errno);
   }
-  setsysvar_str(SYSVAR_PWD, dev_getcwd());
+  setsysvar_str(SYSVAR_CWD, dev_getcwd());
 }
 
 /**