From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 8 Nov 2016 11:09:25 +0000 (+0100)
Subject: Transform CCodeParameter's "format_arg" into CCodeNode's "modifiers"
X-Git-Tag: 0.35.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8629814fad411c2d0bd9f801cda8864f324ab271;p=thirdparty%2Fvala.git

Transform CCodeParameter's "format_arg" into CCodeNode's "modifiers"
---

diff --git a/ccode/valaccodefunction.vala b/ccode/valaccodefunction.vala
index 43bfb6cbb..cd3e385d0 100644
--- a/ccode/valaccodefunction.vala
+++ b/ccode/valaccodefunction.vala
@@ -125,7 +125,7 @@ public class Vala.CCodeFunction : CCodeNode {
 				writer.write_string (", ");
 			}
 			param.write (writer);
-			if (param.format_arg) {
+			if (CCodeModifiers.FORMAT_ARG in param.modifiers) {
 				format_arg_index = i;
 			}
 			i++;
diff --git a/ccode/valaccodefunctiondeclarator.vala b/ccode/valaccodefunctiondeclarator.vala
index 08aea1dbc..1378662c5 100644
--- a/ccode/valaccodefunctiondeclarator.vala
+++ b/ccode/valaccodefunctiondeclarator.vala
@@ -62,7 +62,7 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator {
 				writer.write_string (", ");
 			}
 			param.write (writer);
-			if (param.format_arg) {
+			if (CCodeModifiers.FORMAT_ARG in param.modifiers) {
 				format_arg_index = i;
 			}
 			i++;
diff --git a/ccode/valaccodemodifiers.vala b/ccode/valaccodemodifiers.vala
index 086056f67..75c5a99d7 100644
--- a/ccode/valaccodemodifiers.vala
+++ b/ccode/valaccodemodifiers.vala
@@ -38,5 +38,6 @@ public enum Vala.CCodeModifiers {
 	CONST = 1 << 8,
 	UNUSED = 1 << 9,
 	CONSTRUCTOR = 1 << 10,
-	DESTRUCTOR = 1 << 11
+	DESTRUCTOR = 1 << 11,
+	FORMAT_ARG = 1 << 12
 }
diff --git a/ccode/valaccodeparameter.vala b/ccode/valaccodeparameter.vala
index 9404f470c..9f1c2e186 100644
--- a/ccode/valaccodeparameter.vala
+++ b/ccode/valaccodeparameter.vala
@@ -42,8 +42,6 @@ public class Vala.CCodeParameter : CCodeNode {
 	 */
 	public bool ellipsis { get; set; }
 
-	public bool format_arg { get; set; }
-
 	public CCodeParameter (string n, string type) {
 		name = n;
 		type_name = type;
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 195592ff7..ce127f59a 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -879,7 +879,9 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
 			}
 
 			cparam = new CCodeParameter (get_variable_cname (param.name), ctypename);
-			cparam.format_arg = param.format_arg;
+			if (param.format_arg) {
+				cparam.modifiers = CCodeModifiers.FORMAT_ARG;
+			}
 		} else if (ellipses_to_valist) {
 			cparam = new CCodeParameter ("_vala_va_list", "va_list");
 		} else {
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index d4313d163..a9073e31a 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -38,7 +38,9 @@ public class Vala.GTypeModule : GErrorModule {
 		}
 
 		var cparam = new CCodeParameter (get_variable_cname (param.name), ctypename);
-		cparam.format_arg = param.format_arg;
+		if (param.format_arg) {
+			cparam.modifiers = CCodeModifiers.FORMAT_ARG;
+		}
 
 		cparam_map.set (get_param_pos (get_ccode_pos (param)), cparam);
 		if (carg_map != null) {