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

diff --git a/ccode/valaccodefunction.vala b/ccode/valaccodefunction.vala
index 43bfb6cbb6fcde187fc5ef2fe923bad8833ab7eb..cd3e385d0f3ebaa853488075c1c2805813492056 100644 (file)
--- 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 08aea1dbcc73e5ea303583f5108710a03b13bc99..1378662c51cad689021519dd4c1f98110ac4ad22 100644 (file)
--- 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 086056f677b5f4e7c633c57cf8342ecfb0519b9e..75c5a99d756a43fad49f9be4c34014b3be2d001f 100644 (file)
--- 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 9404f470c49238f7dc2dbfa6a06e434aa7cc7923..9f1c2e1864cfd9e3f3a2ee58d701a4d41cd9a507 100644 (file)
--- 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 195592ff73eb798fd3f696758ee3f95e1fc8fb3c..ce127f59a6ad51ac81436afbd72518ecdd33019c 100644 (file)
--- 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 d4313d1632ef9fc54ad36980b4f50c72ee72ad07..a9073e31aaa632721f333804302cd4d62dd0aaf5 100644 (file)
--- 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) {