From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 1 Apr 2021 13:33:43 +0000 (+0200)
Subject: codegen: Improve handling of ellipsis parameter in get_ccode_name()
X-Git-Tag: 0.52.1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aed64231cf86c7346442ebffefdea7903ccad99;p=thirdparty%2Fvala.git

codegen: Improve handling of ellipsis parameter in get_ccode_name()
---

diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala
index f945540ab..052001aed 100644
--- a/codegen/valaccodeattribute.vala
+++ b/codegen/valaccodeattribute.vala
@@ -771,7 +771,18 @@ public class Vala.CCodeAttribute : AttributeCache {
 				}
 			} else if (sym is Signal) {
 				return Symbol.camel_case_to_lower_case (sym.name).replace ("_", "-");;
-			} else if (sym is LocalVariable || sym is Parameter) {
+			} else if (sym is LocalVariable) {
+				unowned string name = sym.name;
+				if (CCodeBaseModule.reserved_identifiers.contains (name)) {
+					return "_%s_".printf (name);
+				} else {
+					return name;
+				}
+			} else if (sym is Parameter) {
+				unowned Parameter param = (Parameter) sym;
+				if (param.ellipsis) {
+					return "...";
+				}
 				unowned string name = sym.name;
 				if (CCodeBaseModule.reserved_identifiers.contains (name)) {
 					return "_%s_".printf (name);