diff options
Diffstat (limited to 'mcs/class/System')
-rw-r--r-- | mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Microsoft.CSharp/ChangeLog | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs index 9756bacab9d..2e788893d57 100644 --- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs +++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs @@ -261,7 +261,7 @@ namespace Mono.CSharp return null; CompilerError error=new CompilerError(); - Regex reg = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\):\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)", + Regex reg = new Regex (@"^(\s*(?<file>.*)\((?<line>\d*)(,(?<column>\d*))?\)(:)?\s+)*(?<level>\w+)\s*(?<number>.*):\s(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture); Match match=reg.Match(error_string); if (!match.Success) return null; diff --git a/mcs/class/System/Microsoft.CSharp/ChangeLog b/mcs/class/System/Microsoft.CSharp/ChangeLog index d4991a889aa..18a93c1b31a 100644 --- a/mcs/class/System/Microsoft.CSharp/ChangeLog +++ b/mcs/class/System/Microsoft.CSharp/ChangeLog @@ -1,3 +1,8 @@ +2005-08-20 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * CSharpCodeCompiler.cs: made the colon optional so that both mcs and + gmcs work. + 2005-08-08 Gonzalo Paniagua Javier <gonzalo@ximian.com> * CSharpCodeCompiler.cs: added missing colon after the line,column |