Don't create constant Regex on demand and use static field where possible

diff --git a/ccode/valaccodewriter.vala b/ccode/valaccodewriter.vala
index b6a32384ee5f3a0d61fc969cd75ce2ed7df8c0d7..281ff6e435fcb349e864f855c83ed48ee8e8c369 100644 (file)
--- a/ccode/valaccodewriter.vala
+++ b/ccode/valaccodewriter.vala
@@ -48,6 +48,8 @@ public class Vala.CCodeWriter {
                get { return _bol; }
        }
 
+       static GLib.Regex fix_indent_regex;
+
        private string temp_filename;
        private bool file_exists;
 
@@ -220,7 +222,8 @@ public class Vala.CCodeWriter {
                        bool first = true;
 
                        // discard tabs at beginning of line
-                       var regex = new GLib.Regex ("^\t+");
+                       if (fix_indent_regex == null)
+                               fix_indent_regex = new GLib.Regex ("^\t+");;
 
                        foreach (unowned string line in text.split ("\n")) {
                                if (!first) {
@@ -229,7 +232,7 @@ public class Vala.CCodeWriter {
                                        first = false;
                                }
 
-                               var lineparts = regex.replace_literal (line, -1, 0, "").split ("*/");
+                               var lineparts = fix_indent_regex.replace_literal (line, -1, 0, "").split ("*/");
 
                                for (int i = 0; lineparts[i] != null; i++) {
                                        stream.puts (lineparts[i]);

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 99a9725ae676ab261f22f32eee8d70b6a992cfa0..8c0e68804d31e52c5a725450a92b56018ac77337 100644 (file)
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -28,6 +28,8 @@
  * Code visitor generating Vala API file for the public interface.
  */
 public class Vala.CodeWriter : CodeVisitor {
+       static GLib.Regex fix_indent_regex;
+
        private CodeContext context;
        
        FileStream stream;
@@ -1502,9 +1504,9 @@ public class Vala.CodeWriter : CodeVisitor {
        }
 
        private void write_comment (Comment comment) {
-               Regex fix_indent_regex;
                try {
-                       fix_indent_regex = new Regex ("\\n[\\t ]*");
+                       if (fix_indent_regex == null)
+                               fix_indent_regex = new Regex ("\\n[\\t ]*");
                } catch (Error e) {
                        assert_not_reached ();
                }

diff --git a/vala/valareport.vala b/vala/valareport.vala
index 67b3a80b62fbd86b1baa3170a59f0fe4e4b7f2e8..f977dce036fb6b351c8940f86d3c8f8e633b3011 100644 (file)
--- a/vala/valareport.vala
+++ b/vala/valareport.vala
@@ -100,6 +100,7 @@ public class Vala.Report : Object {
 
        public bool enable_warnings { get; set; default = true; }
 
+       static GLib.Regex val_regex;
 
        /**
         * Set all colors by string
@@ -109,9 +110,9 @@ public class Vala.Report : Object {
         * }}}
         */
        public bool set_colors (string str) {
-               Regex val_regex;
                try {
-                       val_regex = new Regex ("^\\s*[0-9]+(;[0-9]*)*\\s*$");
+                       if (val_regex == null)
+                               val_regex = new Regex ("^\\s*[0-9]+(;[0-9]*)*\\s*$");
                } catch (RegexError e) {
                        assert_not_reached ();
                }