COMMON: INPUT #F; now supports up to 64 parameters

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2023-01-09 (12.26)
+	COMMON: INPUT #F; now supports up to 64 parameters
+
 2023-01-09 (12.26)
 	COMMON: fix printing chr(0) into a file or network interface
 

samples/distro-examples/tests/stream-files.bas

@@ -39,4 +39,29 @@ end
 dirwalk "./", "*.cpp" use walker(x)
 if (!has_main) then throw "dirwalk error"
 
+' allow reading and writing of chr(0)
+open "output.dat" for output as #F
+for x = 0 to 255
+  print #F, chr(x);
+next
+close #F
 
+open "output.dat" for input as #1
+for x = 0 to 255
+  d = input(1, 1)
+  if asc(d) != x then throw "Invalid file read " + d + " <> " + x
+next
+close #1
+
+' INPUT #F; now supports up to 64 parameters
+open "./output.dat" for output as #2
+print #2, "1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16"
+close #2
+open "./output.dat" for input as #2
+dim v[0 to 15]
+input #2; v[0], "|", v[1], "|", v[2], "|", v[3], "|", &
+          v[4], "|", v[5], "|", v[6], "|", v[7], "|", &
+          v[8], "|", v[9], "|", v[10],"|", v[11],"|", &
+          v[12],"|", v[13],"|", v[14],"|", v[15],"|"
+close #2
+if v != [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16] then throw "invalid input"

src/common/blib.c

@@ -704,7 +704,7 @@ void cmd_input(int input) {
 
   // get list of parameters
   par_t *ptable = NULL;
-  int pcount = par_getpartable(&ptable, ",;");
+  int pcount = par_getpartable(&ptable, ",;", input == PV_FILE ? MAX_PARAMS_FILE : MAX_PARAMS);
   if (pcount == 0) {
     rt_raise(ERR_INPUT_NO_VARS);
   }
@@ -813,7 +813,7 @@ void cmd_input(int input) {
             // (,)
             char *p;
             if (pcount == 1) {
-              p = (inp_p + strlen(inp_p));
+              p = (inp_p + (!inp_p ? 0 : strlen(inp_p)));
             } else {
               p = q_strstr(inp_p, ((next_is_const) ? v_getstr(ptable[cur_par_idx].var) : ","), "\"\"");
             }
@@ -830,7 +830,7 @@ void cmd_input(int input) {
               }
             } else {
               v_input2var(inp_p, par->var);
-              inp_p = (inp_p + strlen(inp_p));  // go to '\0'
+              inp_p = (inp_p + (!inp_p ? 0 : strlen(inp_p)));  // go to '\0'
               input_is_finished = 1;
             }
           }

src/common/pproc.h

@@ -32,6 +32,9 @@
 #define PV_STRING       3
 #define PV_NET          4
 
+#define MAX_PARAMS_FILE 64
+#define MAX_PARAMS 8
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -285,7 +288,7 @@ void par_skip(void);
  * @return on success the number of the parameters; otherwise -1
  * @see par_freepartable, par_massget
  */
-int par_getpartable(par_t **ptable_pp, const char *valid_sep);
+int par_getpartable(par_t **ptable_pp, const char *valid_sep, unsigned max_items);
 
 /**
  * @ingroup par

src/common/proc.c

@@ -15,8 +15,6 @@
 #include <limits.h>
 #include <dirent.h>
 
-#define MAX_PARAM 8
-
 /*
  * returns the last-modified time of the file
  *
@@ -900,15 +898,16 @@ void par_freepartable(par_t **ptable_pp, int pcount) {
  * YOU MUST FREE THAT TABLE BY USING par_freepartable()
  * IF THERE IS NO ERROR, CALL TO par_freepartable IS NOT NEEDED
  */
-int par_getpartable(par_t **ptable_pp, const char *valid_sep) {
+int par_getpartable(par_t **ptable_pp, const char *valid_sep, unsigned max_items) {
   bcip_t ofs;
   char vsep[8];
 
   // initialize
   var_t *par = NULL;
   byte last_sep = 0;
   int pcount = 0;
-  par_t *ptable = *ptable_pp = malloc(sizeof(par_t) * MAX_PARAM);
+
+  par_t *ptable = *ptable_pp = malloc(sizeof(par_t) * max_items);
 
   if (valid_sep) {
     strlcpy(vsep, valid_sep, sizeof(vsep));
@@ -954,9 +953,9 @@ int par_getpartable(par_t **ptable_pp, const char *valid_sep) {
       if (code_isvar()) {
         // push parameter
         ptable[pcount].var = code_getvarptr();
-        if (++pcount == MAX_PARAM) {
+        if (++pcount == max_items) {
           par_freepartable(ptable_pp, pcount);
-          err_parfmt(__FILE__);
+          err_parfmt(ERR_PARAM_TOO_MANY);
           return -1;
         }
         break;
@@ -974,9 +973,9 @@ int par_getpartable(par_t **ptable_pp, const char *valid_sep) {
         // push parameter
         ptable[pcount].var = par;
         ptable[pcount].flags = PAR_BYVAL;
-        if (++pcount == MAX_PARAM) {
+        if (++pcount == max_items) {
           par_freepartable(ptable_pp, pcount);
-          err_parfmt(__FILE__);
+          err_parfmt(ERR_PARAM_TOO_MANY);
           return -1;
         }
       } else {
@@ -1047,7 +1046,7 @@ int par_massget_type_check(char fmt, par_t *par) {
 int par_massget(const char *fmt, ...) {
   // get ptable
   par_t *ptable;
-  int pcount = par_getpartable(&ptable, NULL);
+  int pcount = par_getpartable(&ptable, NULL, MAX_PARAMS);
   if (pcount == -1) {
     free(ptable);
     return -1;

src/languages/messages.en.h

@@ -157,6 +157,7 @@
 #define ERR_ARRAY_RANGE         "Array: Index '%d' out of range. (Max = %d)"
 #define ERR_TYPE                "Type mismatch"
 #define ERR_PARAM               "Invalid parameter"
+#define ERR_PARAM_TOO_MANY      "Too many parameters"
 #define ERR_NO_ARGS             "Function takes no arguments"
 #define EVAL_VAR_IS_ARRAY       "Expr/RT: Variable is an array"
 #define EVAL_VAR_IS_NOT_ARRAY   "Expr/RT: Variable is NOT an array (Use DIM)"