vala r1101 - in trunk: . compiler

[juergbi svn gnome org]

Author: juergbi
Date: Tue Mar  4 20:33:15 2008
New Revision: 1101
URL: http://svn.gnome.org/viewvc/vala?rev=1101&view=rev

Log:
2008-03-04  Juerg Billeter  <j bitron ch>

	* compiler/valacompiler.vala: don't use GRegex to avoid
	  dependency on GLib 2.14


Modified:
   trunk/ChangeLog
   trunk/compiler/valacompiler.vala

Modified: trunk/compiler/valacompiler.vala
==============================================================================
--- trunk/compiler/valacompiler.vala	(original)
+++ trunk/compiler/valacompiler.vala	Tue Mar  4 20:33:15 2008
@@ -348,14 +348,8 @@
 		if (Path.DIR_SEPARATOR != '/') {
 			// don't use backslashes internally,
 			// to avoid problems in #include directives
-			try {
-				var regex = new Regex (Regex.escape_string (Path.DIR_SEPARATOR_S));
-				string new_rpath = regex.replace_literal (rpath, -1, 0, "/");
-				rpath = new_rpath;
-			} catch (RegexError e) {
-				// should never happen
-				assert_not_reached ();
-			}
+			string[] components = rpath.split ("\\");
+			rpath = string.joinv ("/", components);
 		}
 
 		return rpath;