Extend arity of function arguments

Author: lucic71

libcc2rs/src/fn_ptr.rs

@@ -21,7 +21,7 @@ pub(crate) trait FnSig: Copy + 'static {
 
 macro_rules! impl_fn_sig {
     () => {
-        impl_fn_sig!(@gen A B C D E F G H I J K L M N O P);
+        impl_fn_sig!(@gen A B C D E F G H I J K L M N O P Q S T U V W X Y);
     };
     (@gen $($a:ident)*) => {
         impl<R: FnPtrArg $(, $a: FnPtrArg)*> FnSig for fn($($a,)*) -> R {
@@ -252,7 +252,7 @@ impl<T: FnSig> FnPtr<T> {
 // invokes, e.g. `fn_ptr.call(a0, a1)`.
 macro_rules! impl_fn_ptr_call {
     () => {
-        impl_fn_ptr_call!(@gen A B C D E F G H I J K L M N O P);
+        impl_fn_ptr_call!(@gen A B C D E F G H I J K L M N O P Q S T U V W X Y);
     };
     (@gen $($a:ident)*) => {
         impl<R: FnPtrArg $(, $a: FnPtrArg)*> FnPtr<fn($($a,)*) -> R> {

libcc2rs/src/fn_ptr_arg.rs

@@ -148,7 +148,7 @@ impl<T: ?Sized + 'static> FnPtrArg for *const T {
 
 macro_rules! impl_fn_ptr_arg_unsafe_fn {
     () => {
-        impl_fn_ptr_arg_unsafe_fn!(@gen A B C D E F G H I J K L M N O P);
+        impl_fn_ptr_arg_unsafe_fn!(@gen A B C D E F G H I J K L M N O P Q S T U V W X Y);
     };
     (@gen $($a:ident)*) => {
         impl<R: 'static $(, $a: 'static)*> FnPtrArg for Option<unsafe fn($($a,)*) -> R> {
@@ -224,7 +224,7 @@ pub(crate) trait FnPtrArgs: Sized + 'static {
 
 macro_rules! impl_fn_ptr_args {
     () => {
-        impl_fn_ptr_args!(@gen A B C D E F G H I J K L M N O P);
+        impl_fn_ptr_args!(@gen A B C D E F G H I J K L M N O P Q S T U V W X Y);
     };
     (@gen $($a:ident)*) => {
         impl_fn_ptr_args!(@arity $($a)*);

tests/unit/fn_ptr_arity.cpp

@@ -5,8 +5,23 @@ int foo(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9,
   return 22;
 }
 
+int wide(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8,
+         int a9, int a10, int a11, int a12, int a13, int a14, int a15,
+         int a16, int a17, int a18, int a19, int a20, int a21, int a22) {
+  return a1 + a22;
+}
+
 int main() {
   auto f = &foo;
   assert(f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14) == 22);
+
+  auto w = &wide;
+  assert(w(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+           20, 21, 22) == 23);
+
+  auto l = [](int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8,
+              int a9, int a10, int a11, int a12, int a13, int a14, int a15,
+              int a16, int a17, int a18) { return a1 * a18; };
+  assert(l(2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9) == 18);
   return 0;
 }