Fix comma being dropped from macro varargs argument

usiems · usiems · commit ba227370de7b · 2024-06-28T14:20:52.000+02:00
This prevented QT6_DECL_NEW_OVERLOAD_TAIL from being expanded correctly
diff --git a/generator/parser/rpp/pp-macro-expander.h b/generator/parser/rpp/pp-macro-expander.h
@@ -404,8 +404,8 @@ class pp_macro_expander
   {
     InputIterator arg_end = skip_argument (_first, _last);
 
-    while (_macro->is.variadics && _first != arg_end && arg_end != _last && *arg_end == ','
-        && (_actuals.size () + 1) == _macro->formals.size ())
+    while (_macro->is.variadics && arg_end != _last && *arg_end == ','
+        && _actuals.size () == _macro->formals.size ())
       {
         arg_end = skip_argument (++arg_end, _last);
       }

Original file line number	Diff line number	Diff line change
`@@ -404,8 +404,8 @@ class pp_macro_expander`
`404`	`404`	`{`
`405`	`405`	`InputIterator arg_end = skip_argument (_first, _last);`
`406`	`406`
`407`		`- while (_macro->is.variadics && _first != arg_end && arg_end != _last && *arg_end == ','`
`408`		`- && (_actuals.size () + 1) == _macro->formals.size ())`
	`407`	`+ while (_macro->is.variadics && arg_end != _last && *arg_end == ','`
	`408`	`+ && _actuals.size () == _macro->formals.size ())`
`409`	`409`	`{`
`410`	`410`	`arg_end = skip_argument (++arg_end, _last);`
`411`	`411`	`}`