tools: ynl-gen: clean up stray new lines at the end of reply-less requests
authorJakub Kicinski <kuba@kernel.org>
Mon, 5 Jun 2023 19:01:05 +0000 (12:01 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 6 Jun 2023 19:31:31 +0000 (12:31 -0700)
Do not print empty lines before closing brackets.

Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/net/ynl/ynl-gen-c.py

index 4c12c6f8968e0f66f86ec608f90233221263d362..1e64c5c2a0877cca3849c55dc5e0bb497b73fab5 100755 (executable)
@@ -944,9 +944,10 @@ class CodeWriter:
     def _is_cond(cls, line):
         return line.startswith('if') or line.startswith('while') or line.startswith('for')
 
-    def p(self, line, add_ind=0):
+    def p(self, line, add_ind=0, eat_nl=False):
         if self._nl:
-            self._out.write('\n')
+            if not eat_nl:
+                self._out.write('\n')
             self._nl = False
         ind = self._ind
         if line[-1] == ':':
@@ -971,7 +972,7 @@ class CodeWriter:
         if line and line[0] not in {';', ','}:
             line = ' ' + line
         self._ind -= 1
-        self.p('}' + line)
+        self.p('}' + line, eat_nl=True)
 
     def write_doc_line(self, doc, indent=True):
         words = doc.split()