From f83e10800dfd8954920983d95bc0797388517c68 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 1 Apr 2021 15:33:43 +0200 Subject: [PATCH] codegen: Improve handling of ellipsis parameter in get_ccode_name() --- codegen/valaccodeattribute.vala | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala index b65eb64b4..6e9c3e74c 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); -- 2.47.2