Merge pull request #72 from chrisws/0_12_13

0 12 13

Author: chrisws

ChangeLog

@@ -1,3 +1,9 @@
+2018-08-08 (0.12.13)
+	SDL: fix incorrect file loading with ALT+1-9 command
+
+2018-08-08 (0.12.13)
+	COMMON: fix problem with SEQ command
+
 2018-08-08 (0.12.13)
 	ANDROID: remove hardcoded references to "/sdcard" path
 

configure.ac

@@ -284,6 +284,8 @@ function buildConsole() {
    fi
 
    AC_SUBST(BUILD_SUBDIRS)
+
+   (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
 function buildWeb() {

samples/distro-examples/tests/strings.bas

@@ -171,4 +171,8 @@ end
 cmd_str1("")
 cmd_str1(0)
 
+expect = [0,0.26179938779915,0.5235987755983,0.78539816339745,1.0471975511966,1.30899693899575,1.5707963267949,1.83259571459405,2.0943951023932,2.35619449019234,2.61799387799149,2.87979326579064,3.14159265358979,3.40339204138894,3.66519142918809,3.92699081698724,4.18879020478639,4.45058959258554,4.71238898038469,4.97418836818384,5.23598775598299,5.49778714378214,5.75958653158129,6.02138591938044,6.28318530717958]
+if expect != seq(0, 2*pi, 360/15+1) then throw "SEQ error"
 
+s="Hello\033There"
+if (27 != asc(mid(s, 6, 1))) then throw "err"

src/common/blib_func.c

@@ -2857,18 +2857,17 @@ void cmd_genfunc(long funcCode, var_t *r) {
     //
   case kwSEQ: {
     var_int_t count;
-    var_num_t xmin, xmax, dx;
-
+    var_num_t xmin, xmax;
     par_massget("FFI", &xmin, &xmax, &count);
-
     if (!prog_error) {
       // create the array
       if (count > 1) {
         v_toarray1(r, count);
-        dx = (xmax - xmin) / (count - 1);
+        var_num_t dx = (xmax - xmin) / (count - 1);
+        var_num_t x = xmin;
 
         // add the entries
-        for (int i = 0, x = xmin; i < count; i++, x += dx) {
+        for (int i = 0; i < count; i++, x += dx) {
           var_t *elem_p = v_elem(r, i);
           elem_p->type = V_NUM;
           elem_p->v.n = x;

src/common/fs_serial.c

@@ -77,7 +77,6 @@ uint32_t serial_length(dev_file_t *f) {
 }
 
 #elif defined(_Win32)
-typedef int FileHand;
 
 int serial_open(dev_file_t *f) {
   DCB dcb;
@@ -114,32 +113,32 @@ int serial_open(dev_file_t *f) {
     return 0;
   }
 
-  f->handle = (FileHand) hCom;
+  f->handle = (intptr_t)hCom;
   return 1;
 }
 
 int serial_close(dev_file_t *f) {
-  CloseHandle((HANDLE) f->handle);
+  CloseHandle((HANDLE) (intptr_t)f->handle);
   f->handle = -1;
   return 1;
 }
 
 int serial_write(dev_file_t *f, byte *data, uint32_t size) {
   DWORD bytes;
-  f->last_error = !WriteFile((HANDLE) f->handle, data, size, &bytes, NULL);
+  f->last_error = !WriteFile((HANDLE)(intptr_t)f->handle, data, size, &bytes, NULL);
   return bytes;
 }
 
 int serial_read(dev_file_t *f, byte *data, uint32_t size) {
   DWORD bytes;
-  f->last_error = !ReadFile((HANDLE) f->handle, data, size, &bytes, NULL);
+  f->last_error = !ReadFile((HANDLE)(intptr_t)f->handle, data, size, &bytes, NULL);
   return bytes;
 }
 
 uint32_t serial_length(dev_file_t *f) {
   COMSTAT cs;
   DWORD de = CE_BREAK;
-  ClearCommError((HANDLE) f->handle, &de, &cs);
+  ClearCommError((HANDLE)(intptr_t)f->handle, &de, &cs);
   return cs.cbInQue;
 }
 

src/common/scan.c

@@ -3884,6 +3884,26 @@ char *comp_load(const char *file_name) {
   return buf;
 }
 
+const char *format_numeric_text(const char *str, char **output) {
+  const char *result = str;
+  int value = 0;
+  int digits = 0;
+
+  while (isdigit(*str)) {
+    value = (value << 3) + (*str - '0');
+    digits++;
+    str++;
+  }
+
+  if (digits == 3 && value > V_JOIN_LINE && value < 256) {
+    **output = value;
+    (*output)++;
+    result = str;
+  }
+
+  return result;
+}
+
 /**
  * format source-code text
  *
@@ -3895,24 +3915,21 @@ char *comp_load(const char *file_name) {
  * returns a newly created string
  */
 char *comp_format_text(const char *source) {
-  const char *p;
-  char *ps;
   int quotes = 0;
-  char *new_text;
-  int sl, last_ch = 0, i;
-  char *last_nonsp_ptr;
+  int last_ch = 0;
   int adj_line_num = 0;
   int multi_line_string = 0;
   int curley_brace = 0;
   int square_brace = 0;
+  int sl = strlen(source);
+  char *new_text = malloc(sl + 2);
+  char *ps = new_text;
+  char *last_nonsp_ptr = new_text;
+  const char *p = source;
 
-  sl = strlen(source);
-  new_text = malloc(sl + 2);
   memset(new_text, 0, sl + 2);
-
   comp_line = 0;
-  p = source;
-  last_nonsp_ptr = ps = new_text;
+
   while (*p) {
     if (!quotes) {
       switch (*p) {
@@ -3934,7 +3951,7 @@ char *comp_format_text(const char *source) {
           ps++;
           p++;
         } else {
-          for (i = 0; i <= adj_line_num; i++) {
+          for (int i = 0; i <= adj_line_num; i++) {
             // at least one nl
             *ps++ = '\n';
           }
@@ -4095,6 +4112,9 @@ char *comp_format_text(const char *source) {
         }
         // new line auto-ends the quoted string
         quotes = !quotes;
+      } else if (*p == '\\') {
+        p = format_numeric_text(p + 1, &ps);
+        continue;
       }
       *ps++ = *p++;
     }

src/platform/console/main.cpp

@@ -10,6 +10,7 @@
 #include "config.h"
 #include <getopt.h>
 #include "common/sbapp.h"
+#include "ui/kwp.h"
 
 // decompile handling
 extern "C" {
@@ -22,7 +23,6 @@ extern "C" {
 void console_init();
 
 static struct option OPTIONS[] = {
-  {"help",           no_argument,       NULL, 'h'},
   {"verbose",        no_argument,       NULL, 'v'},
   {"keywords",       no_argument,       NULL, 'k'},
   {"no-file-perm",   no_argument,       NULL, 'f'},
@@ -32,6 +32,7 @@ static struct option OPTIONS[] = {
   {"option",         optional_argument, NULL, 'o'},
   {"cmd",            optional_argument, NULL, 'c'},
   {"stdin",          optional_argument, NULL, '-'},
+  {"help",           optional_argument, NULL, 'h'},
   {0, 0, 0, 0}
 };
 
@@ -56,6 +57,35 @@ void show_brief_help() {
   fprintf(stdout, "SmallBASIC version %s - use -h for help\n",  SB_STR_VER);
 }
 
+void command_help(const char *selection) {
+  bool found = false;
+  const char *pattern = "%s\033[50D\033[14C%s\n";
+  for (int i = 0; i < keyword_help_len; i++) {
+    if (selection[0] == '?' || strcasecmp(selection, keyword_help[i].package) == 0) {
+      fprintf(stdout, pattern, keyword_help[i].keyword, keyword_help[i].help);
+      found = true;
+    }
+  }
+  if (!found) {
+    int len = strlen(selection);
+    for (int i = 0; i < keyword_help_len; i++) {
+      if (strncasecmp(selection, keyword_help[i].keyword, len) == 0) {
+        fprintf(stdout, pattern, keyword_help[i].keyword, keyword_help[i].help);
+        found = true;
+      }
+    }
+  }
+  if (!found) {
+    const char *last_package = NULL;
+    for (int i = 0; i < keyword_help_len; i++) {
+      if (last_package == NULL || strcmp(last_package, keyword_help[i].package) != 0) {
+        fprintf(stdout, "%s\n", keyword_help[i].package);
+        last_package = keyword_help[i].package;
+      }
+    }
+  }
+}
+
 /*
  * handles the command "sbasic -pkw"
  */
@@ -205,7 +235,7 @@ bool process_options(int argc, char *argv[], char **runFile, bool *tmpFile) {
   bool result = true;
   while (result) {
     int option_index = 0;
-    int c = getopt_long(argc, argv, "hvkfxm::s::o:c:", OPTIONS, &option_index);
+    int c = getopt_long(argc, argv, "vkfxm::s::o:c:h::", OPTIONS, &option_index);
     if (c == -1 && !option_index) {
       // no more options
       for (int i = 1; i < argc; i++) {
@@ -225,7 +255,13 @@ bool process_options(int argc, char *argv[], char **runFile, bool *tmpFile) {
     }
     switch (c) {
     case 'h':
-      show_help();
+      if (optarg) {
+        command_help(optarg);
+      } else if (argv[optind] != NULL && argv[optind][0] != '-') {
+        command_help(argv[optind]);
+      } else {
+        show_help();
+      }
       result = false;
       break;
     case 'v':

src/platform/sdl/editor.cpp

@@ -151,43 +151,6 @@ void exportBuffer(AnsiWidget *out, const char *text, String &dest, String &token
   out->setStatus(buffer);
 }
 
-void publish(System *system, const char *text, const char *fileName, const char *description) {
-  String gist = saveGist(text, fileName, description);
-  if (gist.empty()) {
-    system->alert("Publish", "Failed to save gist file.");
-  } else {
-    String command;
-    var_t result;
-
-    command.append("curl -X POST -d @")
-      .append(gist)
-      .append("  https://api.github.com/gists")
-      .append(" --header \"Content-Type:application/json\"");
-    v_init(&result);
-    if (!dev_run(command, &result, 1)) {
-      system->alert("Publish", "Failed to invoke curl.");
-    } else {
-      const char *str = v_str(&result);
-      const char *field = "html_url";
-      const char *url = strstr(str, field);
-      String html;
-
-      if (url != NULL) {
-        const char *q1 = strchr(url + strlen(field) + 2, '\"');
-        const char *q2 = q1 == NULL ? NULL : strchr(q1 + 1, '\"');
-        if (q1 != NULL && q2 != NULL) {
-          html.append(q1 + 1, q2 - q1 - 1);
-        }
-      }
-      if (html.empty()) {
-        system->alert("Publish", "Failed to publish gist.");
-      } else {
-        system->browseFile(html);
-      }
-    }
-  }
-}
-
 void System::editSource(String loadPath) {
   logEntered();
 
@@ -209,7 +172,7 @@ void System::editSource(String loadPath) {
   String recentFile;
   StatusMessage statusMessage(editWidget);
   enum InputMode {
-    kInit, kExportAddr, kExportToken, kCommand, kPublish
+    kInit, kExportAddr, kExportToken, kCommand
   } inputMode = kInit;
 
   _modifiedTime = getModifiedTime();
@@ -298,7 +261,7 @@ void System::editSource(String loadPath) {
         case SB_KEY_ESCAPE:
           widget = editWidget;
           helpWidget->hide();
-          debugStop();
+          ((Runtime *)this)->debugStop();
           break;
         case SB_KEY_CTRL('s'):
           saveFile(editWidget, loadPath);
@@ -345,15 +308,15 @@ void System::editSource(String loadPath) {
           widget = helpWidget;
           helpWidget->createMessage();
           helpWidget->show();
-          debugStart(editWidget, loadPath.c_str());
+          ((Runtime *)this)->debugStart(editWidget, loadPath.c_str());
           statusMessage._row = editWidget->getRow();
           statusMessage._col = editWidget->getCol();
           break;
         case SB_KEY_F(6):
-          debugStep(editWidget, helpWidget, false);
+          ((Runtime *)this)->debugStep(editWidget, helpWidget, false);
           break;
         case SB_KEY_F(7):
-          debugStep(editWidget, helpWidget, true);
+          ((Runtime *)this)->debugStep(editWidget, helpWidget, true);
           break;
         case SB_KEY_F(8):
           ((Runtime *)this)->exportRun(loadPath);
@@ -369,11 +332,6 @@ void System::editSource(String loadPath) {
           helpWidget->show();
           inputMode = kCommand;
           break;
-        case SB_KEY_F(11):
-          if (((Runtime *)this)->toggleFullscreen()) {
-            _output->setStatus("Press F11 to exit full screen.");
-          }
-          break;
         case SB_KEY_CTRL('h'):
           _output->setStatus("Keystroke help. Esc=Close");
           widget = helpWidget;
@@ -454,7 +412,8 @@ void System::editSource(String loadPath) {
           if (getRecentFile(recentFile, event.key - SB_KEY_ALT('1'))) {
             if (loadSource(recentFile.c_str())) {
               editWidget->reload(_programSrc);
-              statusMessage.setFilename(loadPath);
+              statusMessage.setFilename(recentFile);
+              statusMessage.update(editWidget, _output, true);
               setLoadPath(recentFile);
               setWindowTitle(statusMessage._fileName);
               loadPath = recentFile;
@@ -501,15 +460,6 @@ void System::editSource(String loadPath) {
               widget = editWidget;
               helpWidget->hide();
               break;
-            case kPublish:
-              _output->setStatus("Sending gist...");
-              _output->redraw();
-              publish(this, editWidget->getText(), statusMessage._fileName, helpWidget->getText());
-              inputMode = kInit;
-              widget = editWidget;
-              helpWidget->hide();
-              statusMessage._dirty = !widget->isDirty();
-              break;
             default:
               break;
             }