Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -47,7 +47,7 @@ namespace System.Text.RegularExpressions {
[Serializable]
public partial class Regex : ISerializable {
#if !TARGET_JVM && !FULL_AOT_RUNTIME
#if !FULL_AOT_RUNTIME
[MonoTODO]
public static void CompileToAssembly (RegexCompilationInfo [] regexes, AssemblyName aname)
{
@ -306,7 +306,6 @@ namespace System.Text.RegularExpressions {
throw new ArgumentOutOfRangeException ("options");
}
#if !TARGET_JVM
private void Init ()
{
this.machineFactory = cache.Lookup (this.pattern, this.roptions);
@ -320,7 +319,6 @@ namespace System.Text.RegularExpressions {
this.group_names = this.machineFactory.NamesMapping;
}
}
#endif
private void InitNewRegex ()
{
@ -458,7 +456,7 @@ namespace System.Text.RegularExpressions {
throw new ArgumentNullException ("input");
if (startat < 0 || startat > input.Length)
throw new ArgumentOutOfRangeException ("startat");
return CreateMachine ().Scan (this, input, startat, input.Length);
return CreateMachine ().Scan (this, input, startat, input.Length, false);
}
public Match Match (string input, int beginning, int length)
@ -469,7 +467,7 @@ namespace System.Text.RegularExpressions {
throw new ArgumentOutOfRangeException ("beginning");
if (length < 0 || length > input.Length - beginning)
throw new ArgumentOutOfRangeException ("length");
return CreateMachine ().Scan (this, input, beginning, beginning + length);
return CreateMachine ().Scan (this, input, beginning, beginning + length, true);
}
public MatchCollection Matches (string input)