ccode: Reformat function declaration and definition for better readability

https://bugzilla.gnome.org/show_bug.cgi?id=688447

diff --git a/ccode/valaccodefunction.vala b/ccode/valaccodefunction.vala
index 91addcd8a07bf7a76eb19f9d4196eba3e2e528ad..8ef10bb1afc8e87a858cb8ece78613a3f81cd90c 100644 (file)
--- a/ccode/valaccodefunction.vala
+++ b/ccode/valaccodefunction.vala
@@ -118,9 +118,14 @@ public class Vala.CCodeFunction : CCodeNode {
                        writer.write_string ("inline ");
                }
                writer.write_string (return_type);
-               writer.write_string (" ");
+               if (is_declaration) {
+                       writer.write_string (" ");
+               } else {
+                       writer.write_newline ();
+               }
                writer.write_string (name);
                writer.write_string (" (");
+               int param_pos_begin = (is_declaration ? return_type.char_count () + 1 : 0 ) + name.char_count () + 2;
                
                bool has_args = (CCodeModifiers.PRINTF in modifiers || CCodeModifiers.SCANF in modifiers);
                int i = 0;
@@ -129,6 +134,8 @@ public class Vala.CCodeFunction : CCodeNode {
                foreach (CCodeParameter param in parameters) {
                        if (i > 0) {
                                writer.write_string (", ");
+                               writer.write_newline ();
+                               writer.write_nspaces (param_pos_begin);
                        }
                        param.write (writer);
                        if (CCodeModifiers.FORMAT_ARG in param.modifiers) {
@@ -177,6 +184,7 @@ public class Vala.CCodeFunction : CCodeNode {
 
                        writer.write_string (";");
                } else {
+                       writer.write_newline ();
                        block.write (writer);
                        writer.write_newline ();
                }

diff --git a/ccode/valaccodewriter.vala b/ccode/valaccodewriter.vala
index 2e58a41b3dc40d72e583917363f7383100d422b9..0215e759019dfc746d94abdc5838dae5cb6a580b 100644 (file)
--- a/ccode/valaccodewriter.vala
+++ b/ccode/valaccodewriter.vala
@@ -174,6 +174,13 @@ public class Vala.CCodeWriter {
                _bol = false;
        }
        
+       /**
+        * Writes n spaces.
+        */
+       public void write_nspaces (uint n) {
+               stream.puts (string.nfill (n, ' '));
+       }
+
        /**
         * Writes the specified string.
         *