Add missing CodeContext.pop() calls

Release previously pushed CodeContext instances from static list.

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 3be65377b08b5b49c1b45fc94c55719bb33aadcd..e7f7db4ee159ee646cf3a411f94251d9d9bc5fe2 100644 (file)
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -188,17 +188,20 @@ class Vala.Compiler {
 
        private int quit () {
                if (context.report.get_errors () == 0 && context.report.get_warnings () == 0) {
+                       CodeContext.pop ();
                        return 0;
                }
                if (context.report.get_errors () == 0 && (!fatal_warnings || context.report.get_warnings () == 0)) {
                        if (!quiet_mode) {
                                stdout.printf ("Compilation succeeded - %d warning(s)\n", context.report.get_warnings ());
                        }
+                       CodeContext.pop ();
                        return 0;
                } else {
                        if (!quiet_mode) {
                                stdout.printf ("Compilation failed: %d error(s), %d warning(s)\n", context.report.get_errors (), context.report.get_warnings ());
                        }
+                       CodeContext.pop ();
                        return 1;
                }
        }

diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index ed6dced103cf762c30477cb96449afcbcf61c67d..e2175ac4ab08b89d9353dd9266ea51ab7a160809 100644 (file)
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -1007,6 +1007,8 @@ public class Valadoc.TreeBuilder : Vala.CodeVisitor {
 
                context.accept(this);
 
+               Vala.CodeContext.pop ();
+
                return (reporter.errors == 0)? tree : null;
        }
 }

diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index ef0b372006f6772be916b77728e88f4f40aeb48a..d983181976611fa41fb55238218571cd864f9423 100644 (file)
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -62,11 +62,13 @@ class Vala.VAPIGen {
                        if (!quiet_mode) {
                                stdout.printf ("Generation succeeded - %d warning(s)\n", context.report.get_warnings ());
                        }
+                       CodeContext.pop ();
                        return 0;
                } else {
                        if (!quiet_mode) {
                                stdout.printf ("Generation failed: %d error(s), %d warning(s)\n", context.report.get_errors (), context.report.get_warnings ());
                        }
+                       CodeContext.pop ();
                        return 1;
                }
        }