Cleanup generated empty blocks

diff --git a/vala/valablock.vala b/vala/valablock.vala
index 3e82d80144ebd8e155e868b577b51be63114af5e..028cfc76c422ec92eb02e810a29db7be003d57fd 100644 (file)
--- a/vala/valablock.vala
+++ b/vala/valablock.vala
@@ -195,6 +195,23 @@ public class Vala.Block : Symbol, Statement {
                stmt.prev = new_stmt;
        }
 
+       public void remove_statement (Statement stmt) {
+               var prev = stmt.prev;
+               var next = stmt.next;
+
+               if (prev != null) {
+                       prev.next = next;
+               } else {
+                       first_statement = next;
+               }
+
+               if (next != null) {
+                       next.prev = prev;
+               } else {
+                       last_statement = prev;
+               }
+       }
+
        public void replace_statement (Statement old_stmt, Statement new_stmt) {
                new_stmt.parent_node = this;
                new_stmt.prev = old_stmt.prev;

diff --git a/vala/valacodebuilder.vala b/vala/valacodebuilder.vala
index e2087c7fcad077f2a2af7cfd9339d6e3f210f5d8..51433956ba10aa89818a162e79d887f75f3089d8 100644 (file)
--- a/vala/valacodebuilder.vala
+++ b/vala/valacodebuilder.vala
@@ -46,6 +46,12 @@ public class Vala.CodeBuilder {
                m.body.add_statement (current_block);
        }
 
+       public void cleanup () {
+               if (current_block.first_statement == null) {
+                       insert_block.remove_statement (current_block);
+               }
+       }
+
        public void check (CodeTransformer transformer) {
                foreach (var node in decl_nodes) {
                        transformer.check (node);

diff --git a/vala/valacodetransformer.vala b/vala/valacodetransformer.vala
index 3e9f6ffae56046148a6094b7a7ddff5f2f230f2b..4b78a9470f964067045537fcbe635c15bae1c3d1 100644 (file)
--- a/vala/valacodetransformer.vala
+++ b/vala/valacodetransformer.vala
@@ -40,6 +40,8 @@ public class Vala.CodeTransformer : CodeVisitor {
        }
 
        public void pop_builder () {
+               b.cleanup ();
+
                b = builder_stack[builder_stack.size - 1];
                builder_stack.remove_at (builder_stack.size - 1);
        }