no newlines when only one thing in an initializer

coccinelle · Jul 14, 2022 · bcc39cf · bcc39cf · elfring · Jul 15, 2022
1 parent 02d51a7
commit bcc39cf
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/parsing_c/unparse_cocci.ml b/parsing_c/unparse_cocci.ml
@@ -1103,6 +1103,10 @@ and initialiser nlcomma i =
   | Ast.ArInitList(lb,initlist,rb) ->
       (match Ast.unwrap initlist with
 	[] -> mcode print_string lb; mcode print_string rb
+      | ([_] as lst) -> (* { 0 } is a common idiom *)
+	  mcode print_string lb; pr_space();
+	  initialiser_list nlcomma lst;
+	  pr_space(); mcode print_string rb
       |	lst ->
 	  mcode print_string lb; start_block();
 	  initialiser_list nlcomma lst;

diff --git a/tests/zeroline.c b/tests/zeroline.c
@@ -0,0 +1,6 @@
+int main () {
+  int x;
+  int y;
+  memset(&x,0,4);
+  memset(&y,0,4);
+}
diff --git a/tests/zeroline.cocci b/tests/zeroline.cocci
@@ -0,0 +1,17 @@
+@@
+type T;
+symbol x;
+@@
+- T x;
++ T x = { 0 };
+  ...
+- memset(&x, 0, ...);
+
+@@
+type T;
+symbol y;
+@@
+- T y;
++ T y = { 0,4 };
+  ...
+- memset(&y, 0, ...);
diff --git a/tests/zeroline.res b/tests/zeroline.res
@@ -0,0 +1,7 @@
+int main () {
+  int x = { 0 };
+  int y = {
+    0,
+    4
+  };
+}