Merge pull request #69 from chrisws/0_12_13

0 12 13

Author: chrisws

ChangeLog

@@ -1,3 +1,32 @@
+2018-08-08 (0.12.13)
+	ANDROID: remove hardcoded references to "/sdcard" path
+
+2018-07-15 (0.12.13)
+	ANDROID: migrate build from eclispe to android studio
+	ANDROID: fix issue #66
+
+2018-07-15 (0.12.13)
+	SDL: Added window.setSize function
+
+2018-07-07 (0.12.13)
+	SDL: Added solarized color schemes
+	F11 key in editor now toggles fullscreen
+
+2018-07-07 (0.12.13)
+	SDL: Implemented live edit mode
+
+2018-03-08 (0.12.13)
+	COMMON: Fix trailing spaces with LOCAL command when terminated with comma
+
+2018-03-08 (0.12.13)
+	COMMON: Fix TLOAD input error handling
+
+2018-02-03 (0.12.13)
+	COMMON: UNITPATH replaced with SBASICPATH which also works for modules
+
+2018-02-03 (0.12.13)
+	COMMON: modules refresh
+
 2018-02-03 (0.12.12)
 	COMMON: restore 6d array handling
 	COMMON: increase default stack size

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], [0.12.12])
+AC_INIT([smallbasic], [0.12.13])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -202,15 +202,14 @@ function buildSDL() {
    dnl preconfigured values for SDL build
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
 
    BUILD_SUBDIRS="src/common src/platform/sdl"
    AC_SUBST(BUILD_SUBDIRS)
-   (cd ide/android/assets && xxd -i main.bas > ../../../src/platform/sdl/main_bas.h)
+   (cd src/platform/android/app/src/main/assets && xxd -i main.bas > ../../../../../../../src/platform/sdl/main_bas.h)
    (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
@@ -221,7 +220,6 @@ function buildAndroid() {
 
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_ANDROID, 1, [Defined for Android build.])
-   AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
@@ -261,7 +259,6 @@ function buildConsole() {
          dnl preconfigured values for cygwin console build (depends on cygwin.dll)
          TARGET="Building Cygwin console version."
          AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-         AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
          AC_DEFINE(_CygWin, 1, [Building a minimal dev_null based command-line version.])
          AC_DEFINE(__CYGWIN__, 1, [as above])
          AC_DEFINE(INET_UNSUP, 1, [inet not supported.])
@@ -280,7 +277,6 @@ function buildConsole() {
       dnl preconfigured values for unix console build
       TARGET="Building Unix console version."
       AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-      AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
       PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread"
       BUILD_SUBDIRS="src/common src/platform/console"
       TEST_DIR="src/platform/console"
@@ -306,7 +302,6 @@ function buildWeb() {
    BUILD_SUBDIRS="src/common src/platform/web"
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [dont use the termios library.])
@@ -330,6 +325,7 @@ checkDebugMode
 checkProfiling
 checkForWindows
 
+CFLAGS="${CFLAGS} -std=gnu11"
 PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
 BUILD_DATE=`date +"%a, %d %b %Y"`
 AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date])

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.13) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 10 Feb 2018 09:45:25 +1000
+
 smallbasic (0.12.12) unstable; urgency=low
   * Various see web site
 

documentation/mkpage.bas

@@ -0,0 +1,86 @@
+#
+# generates a SmallBASIC program from an input template
+#
+# loosely based on https://jekyllrb.com/docs/variables/
+#
+# {% REM code %}
+# {{ variable-to-print }}
+#
+
+rem ----------(%----%)-------
+rem ^         ^     ^
+rem sIndex    p1    p2
+
+func is_code(c2, c4)
+  if (c2 == 0) then return false
+  return iff(c4 == 0 or c2 < c4, true, false)
+end
+
+func is_var(c2, c4)
+  if (c4 == 0) then return false
+  return iff(c2 == 0 or c4 < c2, true, false)
+end
+
+sub text_lines(s)
+  local lines, num_lines, i, semi, st
+
+  split s, chr(10), lines
+  num_lines = len(lines) - 1
+  for i = 0 to num_lines
+    semi = iff(i == num_lines, ";", "")
+    st = translate(lines[i], "\"", "\\\"")
+    st = translate(st, chr(13), "")
+    if (len(trim(st)) > 0) then
+      print "print (\"" + st + "\")" + semi
+    endif
+  next i
+end
+
+sub process(filename)
+  local s, sEnd, sIndex, c1, c2, c3, c4
+  local file, code
+
+  tload filename, s, 1
+  sEnd = len(s)
+  sIndex = 1
+
+  func get_pair(pair1, pair2)
+    local p1, p2
+    p1 = instr(sIndex, s, pair1)
+    p2 = 0
+    if (p1 > 0) then
+      p2 = instr(p1 + len(pair1), s, pair2)
+    endif
+    return [p1, p2]
+  end
+
+  while 1
+    [c1, c2] = get_pair("{%", "%}")
+    [c3, c4] = get_pair("{{", "}}")
+    if (is_code(c2, c4)) then
+      text_lines(mid(s, sIndex, c1 - sIndex))
+      code = trim(mid(s, c1 + 2, c2 - c1 - 2))
+      if (instr(code, "include ") == 1) then
+        process("_includes/" + rightof(code, "include "))
+      else
+        print code
+      endif
+      sIndex = c2 + 2
+    else if (is_var(c2, c4)) then
+      text_lines(mid(s, sIndex, c3 - sIndex))
+      print "print (" + mid(s, c3 + 2, c4 - c3 - 2) + ");"
+      sIndex = c4 + 2
+    else
+      exit loop
+    endif
+  wend
+
+  if (sIndex < sEnd) then
+    text_lines(mid(s, sIndex, sEnd))
+  endif
+end
+
+print "import site"
+print "if (exist(command)) then tload command, content, 1"
+process(trim(command))
+

documentation/mkref.bas

@@ -32,6 +32,8 @@ elif (len(args) == 2 && args(1) == "bas") then
   mk_bas(in_map)
 elif (len(args) == 2 && args(1) == "jekyll") then
   mk_jekyll(in_map)
+elif (len(args) == 2 && args(1) == "markdown") then
+  mk_markdown(in_map)
 elif (len(args) == 2 && args(1) == "test") then
   mk_test(in_map)
 else
@@ -76,6 +78,23 @@ func fix_comments_jekyll(comments, keyword)
   fix_comments_jekyll = comments
 end
 
+func fix_comments_pandoc(comments, keyword)
+  comments = translate(comments, "<code>", chr(10) + "~~~" + chr(10))
+  comments = translate(comments, "<?code>", chr(10) + "~~~" + chr(10))
+  comments = translate(comments, "</code>", chr(10) + "~~~" + chr(10))
+  comments = translate(comments, "<strong>", "**")
+  comments = translate(comments, "</strong", "**")
+  comments = translate(comments, "<cite>", "")
+  comments = translate(comments, "</cite", "")
+  comments = translate(comments, "<blockquote>", "> ")
+  comments = translate(comments, "</blockquote>", "")
+  comments = translate(comments, "</blockqoute>", "")
+  comments = translate(comments, "p. ", "")
+  comments = translate(comments, "bc. ", "> ")
+  comments = fix_comments(comments, keyword)
+  return comments
+end
+
 sub mk_bas(byref in_map)
   local i, row, group, keyword
   local in_map_len = len(in_map) - 1
@@ -166,7 +185,7 @@ end
 ' local test: $ bundle exec jekyll serve
 '
 sub mk_jekyll(byref in_map)
-  local i, row, group, type, keyword, syntax, brief, comments, buffer, fname
+  local i, row, group, type, keyword, syntax, brief, comments, buffer, filename
   local in_map_len = len(in_map) - 1
   local end_block = "<!-- end heading block -->"
   dim buffer
@@ -203,8 +222,136 @@ sub mk_jekyll(byref in_map)
       i++
       buffer << fix_comments_jekyll(in_map(i).comment_body_value, keyword)
     wend
-    fname = "2016-06-04-" + lower(group) + "-" + lower(keyword) + ".markdown"
-    tsave fname, buffer
+    filename = "2016-06-04-" + lower(group) + "-" + lower(keyword) + ".markdown"
+    tsave filename, buffer
+  next i
+end
+
+'
+' must contain at least 3 | chars
+'
+func is_table(s)
+  local z
+  z = instr(0, s, "|")
+  if (z!=1) then return false
+
+  z = instr(z, s, "|")
+  if (z==0) then return false
+
+  z = instr(z, s, "|")
+  if (z==0) then return false
+
+  return true
+end
+
+'
+' generate the table pattern
+'
+func table_markdown(s)
+  local result = ""
+  local s_len = len(s)
+  local i
+  for i = 1 to s_len
+    if (mid(s, i, 1) == "|") then
+      result += " "
+    else
+      result += "-"
+    endif
+  next i
+  return result
+end
+
+'
+' convert textile to markdown
+'
+func table_row(table_md, s)
+  local out = trim(leftoflast(rightof(s, "|"), "|"))
+  local j = instr(table_md, " ")
+  local x = instr(out, "|")
+  local n = max(1, j - x)
+  return translate(out, "|", space(n))
+end
+
+'
+' convert textile to markdown
+'
+func update_tables(byref in_str)
+  local in_table = false
+  local table_md = ""
+  local out = ""
+  local row, rows
+
+  split in_str, chr(10), rows
+  for row in rows
+    if (is_table(row)) then
+      if (!in_table) then
+        table_md = ltrim(table_markdown(row))
+        in_table = true
+        out += table_md
+        out += chr(10)
+      endif
+      out += table_row(table_md, row)
+    else
+      if (in_table) then
+        out += table_md
+        out += chr(10)
+        in_table = false
+      endif
+      out += row
+    endif
+    out += chr(10)
+  next row
+  return out
+end
+
+'
+' make post files for smallbasic.github.io
+'
+sub mk_markdown(byref in_map)
+  local i, row, group, type, keyword, syntax, brief, comments, buffer, filename
+  local in_map_len = len(in_map) - 1
+  local end_block = "<!-- end heading block -->"
+
+  sub append_buf(s)
+    buffer += s
+    buffer += chr(10)
+  end
+
+  for i = 0 to in_map_len
+    buffer=""
+    row = in_map(i).body_value
+    group = get_field(row, "group=", false)
+    type = get_field(row, "type=", false)
+    keyword = get_field(row, "keyword=", false)
+    syntax = get_field(row, "syntax=", false)
+    brief = get_field(row, "brief=", false)
+    append_buf("# " + keyword)
+    append_buf("")
+    append_buf("> " + syntax)
+    append_buf("")
+    append_buf(brief)
+    append_buf("")
+    pos = instr(row, end_block) + len(end_block)
+    if (pos < len(row)) then
+      append_buf(fix_comments_pandoc(mid(row, pos), keyword))
+    endif
+    comments = in_map(i).comment_body_value
+    if (comments != "NULL") then
+      append_buf(fix_comments_pandoc(comments, keyword))
+    endif
+    while (i + 1 < in_map_len && in_map(i).entity_id == in_map(i + 1).entity_id)
+      i++
+      append_buf(fix_comments_pandoc(in_map(i).comment_body_value, keyword))
+    wend
+
+    filename = in_map(i).entity_id + "-" + lower(group) + "-" + lower(keyword) + ".markdown"
+    filename = translate(filename, " ", "")
+    buffer = update_tables(buffer)
+
+    if (len(filename) > 200) then
+      filename = in_map(i).entity_id + ".markdown"
+    endif
+    tsave filename, buffer
   next i
 end