Fixed varargs variables & struct members

Author: totalspectrum

Changelog.txt

@@ -1,6 +1,7 @@
 Version 7.4.4
 - Added some missing libc.a files (thanks to Ada)
-- Improved module constant overrides
+- Fixed parameter checking for varargs function variables
+- Slightly improved module constant overrides; significant issues remain
 
 Version 7.4.3
 - Remove some unused debug strings when debugging is not enabled

Test/Expect/cexec05.txt

@@ -0,0 +1,3 @@
+hello, world
+number: 1
+tuple: 2, here

Test/cexec05.c

@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <propeller.h>
+#undef printf /* in case it was defined to __builtin_printf */
+
+typedef struct sx1268_handle_s {
+    void (*debug_print)(const char *const fmt, ...);
+} handle;
+
+handle foo;
+
+void myexit(int n)
+{
+    putchar(0xff);
+    putchar(0x0);
+    putchar(n);
+    waitcnt(getcnt() + 40000000);
+#ifdef __OUTPUT_BYTECODE__
+    _cogstop(_cogid());
+#else
+    __asm {
+        cogid n
+        cogstop n
+    }
+#endif    
+}
+
+void main() {
+    foo.debug_print = (void *)printf;
+    foo.debug_print("hello, world\n");
+    foo.debug_print("number: %d\n", 1);
+    foo.debug_print("tuple: %d, %s\n", 2, "here");
+    myexit(0);
+}

functions.c

@@ -2025,15 +2025,19 @@ ExpandArguments(AST *sendptr, AST *args)
  * count number of (actual) parameters passed to a function
  * (e.g. 64 bit parameters count as two parameters)
  */
-int
-CountParameters(AST *list)
+static int
+CountParameters(AST *list, int *is_varargs)
 {
     AST *param;
     int n = 0;
     while (list) {
         param = list->left;
         list = list->right;
-        n += NumExprItemsOnStack(param);
+        if (param && param->kind == AST_VARARGS) {
+            *is_varargs = 1;
+        } else {
+            n += NumExprItemsOnStack(param);
+        }
     }
     return n;
 }
@@ -2103,7 +2107,7 @@ CheckFunctionCalls(AST *ast)
                     }
                 }
                 if (ftype) {
-                    expectArgs = CountParameters(ftype->right);
+                    expectArgs = CountParameters(ftype->right, &is_varargs);
                 } else {
                     expectArgs = 0;
                     is_varargs = 1;

version.h

@@ -7,7 +7,7 @@
 #define VERSION_MAJOR 7
 #define VERSION_MINOR 4
 #define VERSION_REV   4
-#define BETA "-beta"
+//#define BETA "-beta"
 
 #define VERSIONSTR version_string