mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
View File

@@ -366,8 +366,6 @@ namespace Mono.CSharp
}
}
args.Append("/sdk:4.5");
args.Append (" -- ");
foreach (string source in fileNames)
args.AppendFormat("\"{0}\" ",source);
@@ -387,6 +385,12 @@ namespace Mono.CSharp
\s*
(?<message>.*)$";
static readonly Regex RelatedSymbolsRegex = new Regex(
@"
\(Location\ of\ the\ symbol\ related\ to\ previous\ (warning|error)\)
",
RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.IgnorePatternWhitespace);
private static CompilerError CreateErrorFromString(string error_string)
{
if (error_string.StartsWith ("BETA"))
@@ -399,11 +403,17 @@ namespace Mono.CSharp
Regex reg = new Regex (ErrorRegexPattern, RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.IgnorePatternWhitespace);
Match match=reg.Match(error_string);
if (!match.Success) {
// We had some sort of runtime crash
error.ErrorText = error_string;
error.IsWarning = false;
error.ErrorNumber = "";
return error;
match = RelatedSymbolsRegex.Match (error_string);
if (!match.Success) {
// We had some sort of runtime crash
error.ErrorText = error_string;
error.IsWarning = false;
error.ErrorNumber = "";
return error;
} else {
// This line is a continuation of previous warning of error
return null;
}
}
if (String.Empty != match.Result("${file}"))
error.FileName=match.Result("${file}");