Allow PNut v51 on method pointers

Author: totalspectrum

frontends/common.c

@@ -1029,22 +1029,26 @@ ERROR_UNKNOWN_SYMBOL(AST *ast)
 }
 
 AST *
-GenericFunctionPtr(int numresults)
+GenericFunctionPtr(AST *result_type)
 {
     AST *fptr = NULL;
-    AST *exprlist = NULL;
 
-    if (numresults == 0) {
-        exprlist = ast_type_void;
-    } else if (numresults == 1) {
-        exprlist = NULL;
-    } else {
-        while (numresults > 0) {
-            exprlist = NewAST(AST_TUPLE_TYPE, NULL, exprlist);
-            --numresults;
+    if (result_type && result_type->kind == AST_INTEGER) {
+        int numresults = result_type->d.ival;
+        AST *exprlist;
+        if (numresults == 0) {
+            exprlist = ast_type_void;
+        } else if (numresults == 1) {
+            exprlist = NULL;
+        } else {
+            while (numresults > 0) {
+                exprlist = NewAST(AST_TUPLE_TYPE, NULL, exprlist);
+                --numresults;
+            }
         }
+        result_type = exprlist;
     }
-    fptr = NewAST(AST_FUNCTYPE, exprlist, NULL);
+    fptr = NewAST(AST_FUNCTYPE, result_type, NULL);
     fptr = NewAST(AST_PTRTYPE, fptr, NULL);
     return fptr;
 }
@@ -1086,7 +1090,7 @@ Init()
     ast_type_string = NewAST(AST_PTRTYPE, NewAST(AST_MODIFIER_CONST, ast_type_byte, NULL), NULL);
 
     // a generic function returning a single (unknown) value
-    ast_type_generic_funcptr = GenericFunctionPtr(1);
+    ast_type_generic_funcptr = GenericFunctionPtr(AstInteger(1));
 
     // a generic function for Spin2 SEND type functionality
     ast_type_sendptr = NewAST(AST_MODIFIER_SEND_ARGS,
@@ -1097,7 +1101,7 @@ Init()
                                                    ast_type_long, NULL)),
                                      NULL),
                               NULL);
-    ast_type_recvptr = GenericFunctionPtr(1);
+    ast_type_recvptr = GenericFunctionPtr(AstInteger(1));
 
     initSpinLexer(gl_p2);
 

frontends/spin/spin.y

@@ -197,16 +197,11 @@ AST *ExpandCEscapes(AST *str) {
     return elist;
 }
 
-// in common.c
-extern AST *GenericFunctionPtr(int numresults);
-
 static AST *
 MakeFunccall(AST *func, AST *params, AST *numresults)
 {
-    if (numresults && numresults->kind == AST_INTEGER) {
-        int paramcount;
-        paramcount = numresults->d.ival;
-        func = NewAST(AST_CAST, GenericFunctionPtr(paramcount), func);
+    if (numresults) {
+        func = NewAST(AST_CAST, GenericFunctionPtr(numresults), func);
     }
     return NewAST(AST_FUNCCALL, func, params);
 }
@@ -2310,6 +2305,11 @@ opt_numrets:
     { $$ = NULL; }
   | ':' SP_NUM
     { $$ = $2; }
+  | ':' SP_TYPENAME
+    {
+        AST *typ = $2;
+        $$ = typ;
+    }
 ;
 
 funccall:

spinc.h

@@ -1,6 +1,6 @@
 /*
  * Spin to C/C++ converter
- * Copyright 2011-2024 Total Spectrum Software Inc.
+ * Copyright 2011-2025 Total Spectrum Software Inc.
  * main header file
  */
 
@@ -72,4 +72,7 @@ AST *BuildDebugList(AST *exprlist, AST *dbgmask);
 // convert AST debug list into printf
 AST *CreatePrintfDebug(AST *exprlist, AST *dbgmask);
 
+// in common.c
+AST *GenericFunctionPtr(AST *result_type);
+
 #endif