From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 22 Dec 2021 08:16:52 +0000 (+0100)
Subject: Make more use of native GLib.Regex syntax
X-Git-Tag: 0.55.1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ef0ed8d2c37a813f9ad8b35c7a7e4a1d639e1c;p=thirdparty%2Fvala.git

Make more use of native GLib.Regex syntax
---

diff --git a/ccode/valaccodewriter.vala b/ccode/valaccodewriter.vala
index 21cc41720..11a3b0e31 100644
--- a/ccode/valaccodewriter.vala
+++ b/ccode/valaccodewriter.vala
@@ -48,8 +48,6 @@ public class Vala.CCodeWriter {
 		get { return _bol; }
 	}
 
-	static GLib.Regex fix_indent_regex;
-
 	private string temp_filename;
 	private bool file_exists;
 
@@ -246,8 +244,7 @@ public class Vala.CCodeWriter {
 			bool first = true;
 
 			// discard tabs at beginning of line
-			if (fix_indent_regex == null)
-				fix_indent_regex = new GLib.Regex ("^\t+");;
+			unowned Regex fix_indent_regex = /^\t+/;
 
 			foreach (unowned string line in text.split ("\n")) {
 				if (!first) {
diff --git a/libvaladoc/errorreporter.vala b/libvaladoc/errorreporter.vala
index 68b09a8ef..b6035e0fe 100644
--- a/libvaladoc/errorreporter.vala
+++ b/libvaladoc/errorreporter.vala
@@ -137,12 +137,7 @@ public class Valadoc.ErrorReporter : Object {
 	 * }}}
 	 */
 	public bool set_colors (string str) {
-		Regex val_regex;
-		try {
-			val_regex = new Regex ("^\\s*[0-9]+(;[0-9]*)*\\s*$");
-		} catch (RegexError e) {
-			assert_not_reached ();
-		}
+		unowned Regex val_regex = /^\\s*[0-9]+(;[0-9]*)*\\s*$/;
 
 		string error_color = null;
 		string warning_color = null;
diff --git a/vala/valareport.vala b/vala/valareport.vala
index 3d3a95fc8..9665c2d11 100644
--- a/vala/valareport.vala
+++ b/vala/valareport.vala
@@ -106,8 +106,6 @@ public class Vala.Report {
 
 	public bool enable_warnings { get; set; default = true; }
 
-	static GLib.Regex val_regex;
-
 	/**
 	 * Set all colors by string
 	 *
@@ -116,12 +114,7 @@ public class Vala.Report {
 	 * }}}
 	 */
 	public bool set_colors (string str, Report.Colored colored_output = Report.Colored.AUTO) {
-		try {
-			if (val_regex == null)
-				val_regex = new Regex ("^\\s*[0-9]+(;[0-9]*)*\\s*$");
-		} catch (RegexError e) {
-			assert_not_reached ();
-		}
+		unowned Regex val_regex = /^\\s*[0-9]+(;[0-9]*)*\\s*$/;
 
 		string error_color = null;
 		string warning_color = null;