[vala/0.46] codegen: Use loop index instead of get_ccode_pos() for ellipsis parameter
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.46] codegen: Use loop index instead of get_ccode_pos() for ellipsis parameter
- Date: Tue, 19 May 2020 16:29:46 +0000 (UTC)
commit d14769c92ad4037ec7d95ff524899e9350252cc3
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Mon May 18 09:31:41 2020 +0200
codegen: Use loop index instead of get_ccode_pos() for ellipsis parameter
Otherwise this will cause an index clash resulting in loosing the first
variable list parameter.
Regression of b1cb7036bee1f21e98e93ac34b31a95eeed32815
Fixes https://gitlab.gnome.org/GNOME/vala/issues/995
codegen/valaccodemethodcallmodule.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 216012594..2b7cefb4a 100644
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -482,7 +482,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
}
}
- arg_pos = get_param_pos (param != null ? get_ccode_pos (param) : i, ellipsis);
+ arg_pos = get_param_pos (param != null && !ellipsis ? get_ccode_pos (param) : i,
ellipsis);
carg_map.set (arg_pos, cexpr);
if (arg is NamedArgument && ellipsis) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]