Compiler: removed limit of function parameters

Author: ivan-mogilko

Compiler/script/cc_compiledscript.cpp

@@ -152,9 +152,7 @@ int ccCompiledScript::remove_any_import (const char*namm, SymbolDef *oldSym) {
         oldSym->arrsize = sym.entries[sidx].arrsize;
         if (sym.entries[sidx].stype == SYM_FUNCTION) {
             // <= because of return type
-            for (int i = 0; i <= sym.entries[sidx].get_num_args(); i++) {
-                oldSym->funcparams[i] = sym.entries[sidx].funcparams[i];
-            }
+            oldSym->funcparams = sym.entries[sidx].funcparams;
         }
     }
 

Compiler/script/cc_symboldef.h

@@ -40,7 +40,7 @@ struct SymbolDef {
     int16_t  sscope;  // or num arguments for function
     int32_t  arrsize;
     // return value is at index 0, actual args begin with 1
-    FuncParamInfo funcparams[MAX_FUNCTION_PARAMETERS + 1];
+    std::vector<FuncParamInfo> funcparams;
 };
 
 #endif // __CC_SYMBOLDEF_H

Compiler/script/cc_symboltable.cpp

@@ -240,7 +240,6 @@ int symbolTable::add_ex(const char*nta,int typo,char sizee) {
 	entry.sscope = 0;
     entry.arrsize = 0;
     entry.extends = 0;
-	entry.funcparams = std::vector<FuncParamInfo>(MAX_FUNCTION_PARAMETERS + 1);
 	entries.push_back(entry);
 
     symbolTree.addEntry(nta, p_value);

Compiler/script/cc_symboltable.h

@@ -34,7 +34,7 @@ struct SymbolTableEntry
 	int16_t sscope; // or num arguments for function
 	int32_t arrsize;
 	int16_t extends; // inherits another class (classes) / owning class (member vars)
-    // functions only, save types of return value and all parameters
+    // functions only, save types of return value and all parameters;
     // return value is at index 0, actual args begin with 1
     std::vector<FuncParamInfo> funcparams;
 

Compiler/script/cs_parser.cpp

@@ -663,6 +663,10 @@ int float_to_int_raw(float toconv) {
 }
 
 int check_for_default_value(ccInternalList &targ, int funcsym, int numparams) {
+    const int arg_idx = numparams % 100;
+    assert(static_cast<uint32_t>(funcsym) < sym.entries.size());
+    assert(static_cast<uint32_t>(arg_idx) < sym.entries[funcsym].funcparams.size());
+
     if (sym.get_type(targ.peeknext()) == SYM_ASSIGN) {
         const char *vartype = sym.get_name(targ.script[targ.pos - 2]);
         // parameter has default value
@@ -711,9 +715,8 @@ int check_for_default_value(ccInternalList &targ, int funcsym, int numparams) {
             }
         }
 
-        sym.entries[funcsym].funcparams[numparams % 100].DefaultValue = defaultValue;
-        sym.entries[funcsym].funcparams[numparams % 100].HasDefaultValue = true;
-
+        sym.entries[funcsym].funcparams[arg_idx].DefaultValue = defaultValue;
+        sym.entries[funcsym].funcparams[arg_idx].HasDefaultValue = true;
     }
 
     return 0;
@@ -862,6 +865,7 @@ int process_function_declaration(ccInternalList &targ, ccCompiledScript*scrip,
 
   sym.entries[funcsym].stype = SYM_FUNCTION;
   sym.entries[funcsym].ssize = varsize;  // save return type size
+  sym.entries[funcsym].funcparams.resize(1);
   sym.entries[funcsym].funcparams[0].Type = vtwas;  // return type
 
   if (is_const)
@@ -932,30 +936,28 @@ int process_function_declaration(ccInternalList &targ, ccCompiledScript*scrip,
     }
     else if (next_type == SYM_VARTYPE) {
       // function parameter
-      if ((numparams % 100) >= MAX_FUNCTION_PARAMETERS) {
-        cc_error("too many parameters defined for function");
-        return -1;
-      }
       if (cursym == sym.normalVoidSym) {
         cc_error("'void' invalid type for function parameter");
         return -1;
       }
       int isPointerParam = 0;
       // save the parameter type (numparams starts from 1)
-      sym.entries[funcsym].funcparams[numparams % 100].Type = cursym;
-      sym.entries[funcsym].funcparams[numparams % 100].DefaultValue = 0;
-      sym.entries[funcsym].funcparams[numparams % 100].HasDefaultValue = false;
+      const int arg_idx = numparams % 100;
+      sym.entries[funcsym].funcparams.resize(arg_idx + 1);
+      sym.entries[funcsym].funcparams[arg_idx].Type = cursym;
+      sym.entries[funcsym].funcparams[arg_idx].DefaultValue = 0;
+      sym.entries[funcsym].funcparams[arg_idx].HasDefaultValue = false;
 
       if (next_is_const)
-        sym.entries[funcsym].funcparams[numparams % 100].Type |= STYPE_CONST;
+        sym.entries[funcsym].funcparams[arg_idx].Type |= STYPE_CONST;
 
       functype[strlen(functype)+1] = 0;
       functype[strlen(functype)] = (char)cursym;  // save variable type
       if (check_not_eof(targ))
         return -1;
       if (strcmp(sym.get_name(targ.peeknext()), "*") == 0) {
         // pointer
-        sym.entries[funcsym].funcparams[numparams % 100].Type |= STYPE_POINTER;
+        sym.entries[funcsym].funcparams[arg_idx].Type |= STYPE_POINTER;
         isPointerParam = 1;
         targ.getnext();
         if ((sym.entries[cursym].flags & SFLG_MANAGED) == 0) {
@@ -970,7 +972,7 @@ int process_function_declaration(ccInternalList &targ, ccCompiledScript*scrip,
       }
 
       if (sym.entries[cursym].flags & SFLG_AUTOPTR) {
-        sym.entries[funcsym].funcparams[numparams % 100].Type |= STYPE_POINTER;
+        sym.entries[funcsym].funcparams[arg_idx].Type |= STYPE_POINTER;
         isPointerParam = 1;
       }
 
@@ -1034,7 +1036,7 @@ int process_function_declaration(ccInternalList &targ, ccCompiledScript*scrip,
       }
       else if (dynArrayStatus > 0)
       {
-        sym.entries[funcsym].funcparams[(numparams - 1) % 100].Type |= STYPE_DYNARRAY;
+        sym.entries[funcsym].funcparams[arg_idx].Type |= STYPE_DYNARRAY;
         if (createdLocalVar)
         {
           sym.entries[cursym].flags |= SFLG_DYNAMICARRAY | SFLG_ARRAY;
@@ -2780,6 +2782,7 @@ int parse_sub_expr(int32_t *symlist, int listlen, ccCompiledScript*scrip) {
 
     if (num_supplied_args < func_args) {
       // not enough arguments -- see if we can supply default values
+      assert(static_cast<uint32_t>(func_args) < sym.entries[funcsym].funcparams.size());
       for (int ii = func_args; ii > num_supplied_args; ii--) {
 
         if (!sym.entries[funcsym].funcparams[ii].HasDefaultValue) {

Compiler/script/cs_parser_common.h

@@ -30,7 +30,6 @@
 #define NEST_DOSINGLE   9 // Single Do statement
 #define NEST_FOR        10 // For statement
 #define NEST_SWITCH     11 // Case block for a switch statement
-#define MAX_FUNCTION_PARAMETERS 15
 #define SYM_GLOBALVAR 1
 #define SYM_LOCALVAR  2
 #define SYM_OPERATOR  3