Merge pull request #201 from chrisws/12_27

12 27

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2023-08-27 (12.27)
+	COMMON: Fix parameter number error when calling a unit sub/func
+	COMMON: Show a runtime error if a module calls exit()
+
 2023-06-18 (12.27)
 	COMMON: Fix redim regression
 	PLUGINS: Added mechanism for cleaning up resources when the associated map falls out of scope

src/common/sberr.c

@@ -14,7 +14,31 @@
 #include <string.h>
 #include <errno.h>
 
-void err_title_msg(const char *seg, const char *file, int line) {
+void err_title_msg(int compileError, int parameterError) {
+  const char *seg;
+  const char *file;
+  int line;
+
+  if (compileError) {
+    file = comp_bc_sec;
+    line = comp_line;
+    seg = WORD_COMP;
+  } else {
+    file = prog_file;
+    line = prog_line;
+    seg = WORD_RTE;
+    if (ctask->parent > 0 && parameterError) {
+      task_t *parent = taskinfo(ctask->parent);
+      line = parent->line;
+      file = parent->file;
+    }
+  }
+
+  const char *slash = strrchr(file, '/');
+  if (slash) {
+    file = slash + 1;
+  }
+
   gsb_last_line = line;
   gsb_last_error = prog_error;
   strlcpy(gsb_last_file, file, sizeof(gsb_last_file));
@@ -80,7 +104,7 @@ void sc_raise(const char *format, ...) {
     va_end(args);
 
     if (comp_bc_sec) {
-      err_title_msg(WORD_COMP, comp_bc_sec, comp_line);
+      err_title_msg(1, 0);
     }
     if (size) {
       va_start(args, format);
@@ -102,7 +126,7 @@ void rt_raise(const char *format, ...) {
     unsigned size = vsnprintf(NULL, 0, format, args);
     va_end(args);
 
-    err_title_msg(WORD_RTE, prog_file, prog_line);
+    err_title_msg(0, strcmp(format, ERR_PARAM_NUM) == 0);
     if (size) {
       va_start(args, format);
       va_err_detail_msg(format, args, size);
@@ -161,7 +185,7 @@ void err_syntax(int keyword, const char *fmt) {
       fmt_p++;
     }
 
-    err_title_msg(WORD_RTE, prog_file, prog_line);
+    err_title_msg(0, 0);
     err_detail_msg(ERR_SYNTAX);
     err_stack_msg();
     log_printf("Expected:");
@@ -355,6 +379,10 @@ void err_network() {
   rt_raise(ERR_NETWORK);
 }
 
+void err_abnormal_exit() {
+  rt_raise(ERR_ABNORMAL_EXIT);
+}
+
 /**
  * the DONE message
  */
@@ -458,7 +486,7 @@ void err_throw_str(const char *err) {
     }
 
     if (!caught) {
-      err_title_msg(WORD_RTE, prog_file, prog_line);
+      err_title_msg(0, 0);
       err_detail_msg(err);
       err_stack_msg();
       trace_done = 1;
@@ -477,7 +505,7 @@ void err_throw_str(const char *err) {
   if (!caught) {
     prog_error = errRuntime;
     if (!trace_done) {
-      err_title_msg(WORD_RTE, prog_file, prog_line);
+      err_title_msg(0, 0);
       err_detail_msg(err);
       err_stack_msg();
     }

src/common/sberr.h

@@ -79,6 +79,7 @@ void err_array();
 void err_form_input();
 void err_memory();
 void err_network();
+void err_abnormal_exit();
 void err_throw(const char *fmt, ...);
 int  err_handle_error(const char *err, var_p_t var);
 void inf_done(void);

src/languages/messages.en.h

@@ -231,3 +231,4 @@
 #define ERR_DIRWALK_MISSING_USE "DIRWALK: missing USE statement"
 #define ERR_DIRWALK_CANT_OPEN   "DIRWALK: can't open %s"
 #define ERR_LINE_LENGTH         "Line length limit exceeded at text: '%s'"
+#define ERR_ABNORMAL_EXIT       "Abnormal exit"

src/platform/console/main.cpp

@@ -375,7 +375,7 @@ uint32_t get_modified_time(const char *file) {
 bool wait_for_file(const char *file, uint32_t modifiedTime) {
   bool result = false;
   fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
-  fprintf(stdout, "Fix the error [in %s] to continue, or press enter to exit...\n", file);
+  fprintf(stdout, "Fix the error in [%s] to continue, or press enter to exit...\n", file);
   while (!result && modifiedTime == get_modified_time(file)) {
     char c = 0;
     read(0, &c, 1);
@@ -390,14 +390,20 @@ bool wait_for_file(const char *file, uint32_t modifiedTime) {
 #else
 bool wait_for_file(const char *file, uint32_t modifiedTime) {
   bool result = false;
-  fprintf(stdout, "Fix the error [in %s] to continue...\n", file);
+  fprintf(stdout, "Fix the error in [%s] to continue...\n", file);
   while (!result && modifiedTime == get_modified_time(file)) {
     usleep(500 * 1000);
   }
   return result;
 }
 #endif
 
+static void exit_handler(void) {
+  if (count_tasks()) {
+    err_abnormal_exit();
+  }
+}
+
 //
 // program entry point
 //
@@ -416,6 +422,7 @@ int main(int argc, char *argv[]) {
   os_graphics = 1;
 
   console_init();
+  atexit(exit_handler);
 
   char *file = nullptr;
   bool tmpFile = false;