[Monodevelop-patches-list] r1416 - in trunk/MonoDevelop/src/Tools/SharpCoco: . src

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-04-08 22:50:26 -0400 (Thu, 08 Apr 2004)
New Revision: 1416

Added:
   trunk/MonoDevelop/src/Tools/SharpCoco/ChangeLog
Modified:
   trunk/MonoDevelop/src/Tools/SharpCoco/src/DFA.cs
Log:
2004-04-08  John Luke  <jluke at cfl.rr.com>

       * src/DFA.cs: use Path.Combine not + "\\Scanner.frame";



Added: trunk/MonoDevelop/src/Tools/SharpCoco/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Tools/SharpCoco/ChangeLog	2004-04-09 00:40:19 UTC (rev 1415)
+++ trunk/MonoDevelop/src/Tools/SharpCoco/ChangeLog	2004-04-09 02:50:26 UTC (rev 1416)
@@ -0,0 +1,4 @@
+2004-04-08  John Luke  <jluke at cfl.rr.com>
+
+	* src/DFA.cs: use Path.Combine not + "\\Scanner.frame";
+

Modified: trunk/MonoDevelop/src/Tools/SharpCoco/src/DFA.cs
===================================================================
--- trunk/MonoDevelop/src/Tools/SharpCoco/src/DFA.cs	2004-04-09 00:40:19 UTC (rev 1415)
+++ trunk/MonoDevelop/src/Tools/SharpCoco/src/DFA.cs	2004-04-09 02:50:26 UTC (rev 1416)
@@ -792,10 +792,10 @@
 		int i, j;
 		int[] startTab = new int[CharClass.charSetSize];
 		string dir = System.Environment.CurrentDirectory;
-		string fr = dir + "\\Scanner.frame";
+		string fr = Path.Combine (dir, "Scanner.frame");
 		if (!File.Exists(fr)) {
 			string frameDir = Environment.GetEnvironmentVariable("crframes");
-			if (frameDir != null) fr = frameDir.Trim() + "\\Scanner.frame";
+			if (frameDir != null) fr = Path.Combine (frameDir.Trim(), "Scanner.frame");
 			if (!File.Exists(fr)) Errors.Exception("-- Cannot find Scanner.frame");
 		}
 		try {