Commit Graph
243 Commits
Author SHA1 Message Date
Marek Safar 482e63b5bd Few corcompare fixes 2011-09-05 19:02:32 +01:00
Jonathan Pryor 298a6c4ef9 [System,MOBILE] Add System.Text.RegularExpressions.RegexOptions.Compiled.
Add the RegexOptions.Compiled enumeration value to the MOBILE profile.

Fixes: http://bugzilla.xamarin.com/show_bug.cgi?id=149

MonoTouch and Mono for Android still use `PatternCompiler`, which is
interpreted. Thus RegexOptions.Compiled is ignored, and is present only for
compatibility with Windows Phone 7, which states [0]:

	Present only in Silverlight for Windows Phone, but not supported.

[0] http://msdn.microsoft.com/en-us/library/system.text.regularexpressions.regexoptions(VS.96).aspx
2011-08-09 21:19:09 -04:00
Sebastien Pouliot 4eedff1487 Fix parameter name mismatches between Moonlight and Silverlight 2011-03-10 14:33:31 -05:00
Zoltan Varga b99bbf419f Change some usages of ArrayList to List<T> to avoid calls to the slow ArrayList.ToArray(Type) method. 2011-01-06 13:17:01 +01:00
Marek Safar aad016fd87 Clean up few more warnings 2010-10-15 15:20:25 +01:00
Raja R Harinath cd51491631 Fix a few cases of mixed line-endings
This is a scripted conversion of mixed line-ending files to LF-only or CRLF-only
based on which patch is smaller.  I used a threshold of upto a quarter of the
lines to determine whether to keep the patch or not.
2010-07-26 02:20:13 +05:30
Raja R Harinath b293948fb7 EOL handling
This set of .gitattributes was automatically generated from the list of files
that GIT tried to normalize when I enabled automatic EOL conversion.

With this set of attributes, we prevent automated EOL conversion on files that
we know will cause trouble down the road.
2010-07-25 20:17:39 +05:30
Miguel de Icaza 183e538e52 2010-07-20 Miguel de Icaza <[email protected]>
* parser.cs (ParseEscape): Now parses with some context, whether
	we are parsing inside a character range which can not contain
	back-references or when we are parsing on a string context which
	can contain back references.

	This fixes bug #577346 which exposed a bug parsing this:

	new Regex("[\\177-\\377]")



svn path=/trunk/mcs/; revision=160626
2010-07-20 17:31:31 +00:00
Raja R Harinath 56c2a1dc07 Mitigate a possible source of unbounded memory growth
* interpreter.cs (Backtrack): Move mark_start back, and invalidate
discarded marks.

svn path=/trunk/mcs/; revision=159647
2010-06-29 07:20:12 +00:00
Raja R Harinath e587d2b7ea Make trace output resemble assembler listing
* compiler.cs (LinkRef.ToString) [TRACE_REGEX]: Add pretty-printer
in TRACE_REGEX mode.
(TraceRegexp): Indent the output.
(TraceRegexpLabel): New.  Prints out a line label.
(EmitCount): Don't trace.  All callers are traced.
(ResolveLink): Trace line labels.

svn path=/trunk/mcs/; revision=159646
2010-06-29 07:19:50 +00:00
Rodrigo Kumpera 9b460752ba 2010-06-21 Rodrigo Kumpera <[email protected]>
* compiler.cs: Use conditional compilation to enable
	tracing to avoid code bloat.

svn path=/trunk/mcs/; revision=159300
2010-06-21 22:01:57 +00:00
Rodrigo Kumpera 37ab7f11e3 2010-06-21 Rodrigo Kumpera <[email protected]>
* parser.cs: Handle repetition of position assertions.

	Fixes #610587.

svn path=/trunk/mcs/; revision=159287
2010-06-21 20:18:20 +00:00
Rodrigo Kumpera fc322e9315 2010-06-21 Rodrigo Kumpera <[email protected]>
* compiler.cs: Add new internal flag to switch on regexp
	* tracing.
	The code is a statc readonly variable so the JIT can eliminate
	all tracing code during normal runs.

svn path=/trunk/mcs/; revision=159286
2010-06-21 20:18:11 +00:00
Miguel de Icaza 1fb05e0b01 Disable per Zoltan's suggestion
svn path=/trunk/mcs/; revision=156259
2010-04-27 21:35:52 +00:00
Miguel de Icaza f47e5fe6a6 2010-03-20 Miguel de Icaza <[email protected]>
* Eliminate warnings in a bunch of places.

svn path=/trunk/mcs/; revision=153952
2010-03-20 23:09:06 +00:00
Miguel de Icaza 833a86518a 2010-03-20 Miguel de Icaza <[email protected]>
* RxInterpreter.cs: Removed warnings.

svn path=/trunk/mcs/; revision=153948
2010-03-20 22:56:32 +00:00
Rodrigo Kumpera 22fb8fe69c 2010-02-03 Rodrigo Kumpera <[email protected]>
* BaseMachine.cs (Split): Don't add empty strings if they don't
	* come from
	the first capture group. Fixes #566117.

svn path=/trunk/mcs/; revision=150786
2010-02-03 21:10:16 +00:00
Miguel de Icaza 5529d196f3 2010-01-12 Miguel de Icaza <[email protected]>
* Regex.cs: Re-enable the new regex compiler as the bug seems to
	be gone now.

svn path=/trunk/mcs/; revision=149403
2010-01-12 13:54:19 +00:00
Raja R Harinath 2d8031df3c regex: A few more null and bounds checks
* Regex.cs (Escape, Unescape): Add null checks.
(validate_options): Add ECMAScript option checks.
(Replace, Split): Add a few bounds checks.

svn path=/trunk/mcs/; revision=141459
2009-09-07 17:14:37 +00:00
Raja R Harinath e8d4a97211 Add some null checks and bounds checks.
* Regex.cs (default_startat): New.  Replaces the fragment
'RightToLeft ?  input.Length : 0' with a null-safe variant.
(Replace) <string variant>: Add null checks for argument strings.
(Split): Likewise.
(.ctor): Likewise.  Validate regex options partially.
(Match): Add null check on string arguments, and bounds checks for
offset and length arguments.

svn path=/trunk/mcs/; revision=141457
2009-09-07 16:25:50 +00:00
Raja R Harinath 66fee73c0a Final piece of explicit numeric group support
* parser.cs (gap): New.
(GetMapping): Return it.
(ResolveReferences): Collect explicit numeric groups which may not
match their indices.
(HandleExplicitNumericGroups): New.  Process the above list to
assign appropriate indices, and compute the correct value of 'gap'.

svn path=/trunk/mcs/; revision=140290
2009-08-19 20:43:01 +00:00
Raja R Harinath 6dac1251cd * syntax.cs (CapturingGroup.Index): Rename from Number to clarify semantics.
(CapturingGroup.CompareTo): New.
* parser.cs, syntax.cs: Update to changes.

svn path=/trunk/mcs/; revision=140289
2009-08-19 20:42:36 +00:00
Raja R Harinath f6656df299 Implement some more group number/index distinction
* Regex.cs (gap, Gap): New.
(Init, InitNewRegex): Update it.
(GroupNumberFromName): If the 'name' is beyond the gap, it is an
explicit numeric group -- use the name as the group number.
GetGroupIndex): Use a binary search to map a group number to its
index when we know that they don't match.
(GroupNumbers): Use group number, not group index, for explicit
numeric groups.
* Match.cs (.ctor): Use the newly introduce 'Regex.Gap'.

svn path=/trunk/mcs/; revision=140288
2009-08-19 20:42:13 +00:00
Raja R Harinath 61c45d91d6 Minor code re-organization
* Regex.cs (group_numbers): New.
(GetGroupNumbers): Move array initialization ...
(GroupNumbers): ... to new on-demand initializer.

svn path=/trunk/mcs/; revision=140287
2009-08-19 20:41:51 +00:00
Raja R Harinath 27c8bd541f Use IDictionaryEnumerator in a loop where both key and value are used
* Regex.cs (group_names): Rename from _groupNumbersToNameMap.
(GetGroupNamesArray): Use an IDictionaryEnumerator to walk the
mapping, since both the key and value are used in the loop.

svn path=/trunk/mcs/; revision=140286
2009-08-19 20:41:26 +00:00
Raja R Harinath a21d173159 Introduce 'gap' concept into all the variants of regex
* arch.cs (IMachineFactory::Gap): New property.
* compiler.cs (InterpreterFactory): Update to changes.
* RxCompiler.cs (RxInterpreterFactory): Likewise.
* JvmReMachineFactory.cs: Likewise.
* parser.cs (GetMapping): Return the 'gap' index.  Move creation
of mapping dictionary ...
* Regex.cs (CreateMachineFactory): ... here.  Update to changes.

svn path=/trunk/mcs/; revision=140285
2009-08-19 20:41:03 +00:00
Raja R Harinath fb54e0e6c7 Distinguish between the internal index of a group and group number.
* Regex.cs (GetGroupIndex): New.
(GroupNameFromNumber): Use it.
* GroupCollection.cs (.ctor): Introduce 'gap' argument.  It is the
index of the first group whose group number differs from its index.
(Item.get): Likewise.

svn path=/trunk/mcs/; revision=140284
2009-08-19 20:40:39 +00:00
Raja R Harinath 4735fd50bc * parser.cs (GetMapping): Extend duplicate check for numeric groups too.
svn path=/trunk/mcs/; revision=140097
2009-08-17 19:26:40 +00:00
Raja R Harinath 51c4ad074a * parser.cs (ResolveReferences): Handle some cases of explicitly-named numeric groups.
svn path=/trunk/mcs/; revision=140096
2009-08-17 19:26:18 +00:00
Raja R Harinath 1c27a86429 * parser.cs (ResolveReferences): Rearrange slightly to prepare for future changes.
svn path=/trunk/mcs/; revision=140095
2009-08-17 19:25:50 +00:00
Raja R Harinath 3c675a0e62 * Regex.cs (GetGroupNumbers): List group numbers in ascending order.
(GetGroupNames): List names in order of group number.

svn path=/trunk/mcs/; revision=140051
2009-08-17 12:27:57 +00:00
Raja R Harinath 4d8fa96830 * syntax.cs (BackslashNumber.ResolveReference): Improve ECMAScript semantics.
svn path=/trunk/mcs/; revision=139731
2009-08-11 19:11:26 +00:00
Raja R Harinath 1163a482f7 regexp backreferences: Implement fallback to octal numbers, and ECMAScript semantics.
* syntax.cs (BackslashNumber.ResolveReference): Implement fallback
to octal numbers, and ECMAScript semantics.
* parser.cs (ResolveReferences): Use it.
* RegexMatchTests.cs (RegexTrial0054..60): New.

svn path=/trunk/mcs/; revision=139657
2009-08-10 16:25:10 +00:00
Raja R Harinath 54481772e9 Distinguish between the potentially ambiguous \nnn and the non-ambiguous \k<...> back-references
* syntax.cs (BackslashNumber): New class.
* parser.cs (ParseSpecial): Create it instead of 'Reference' if a
numeric backreference is seen.

svn path=/trunk/mcs/; revision=139656
2009-08-10 16:24:45 +00:00
Raja R Harinath 88c39f81b9 Regex.IsMatch("abcab", @"(?<ab>ab)c\1")
* System.Text.RegularExpressions/parser.cs (ResolveReferences):
Allow named groups to be referred-to by their group numbers too.
* RegexMatchTests.cs (RegexTrial0053): New.

svn path=/trunk/mcs/; revision=139655
2009-08-10 16:24:21 +00:00
Sebastien Pouliot 4f838e0e43 2009-04-23 Sebastien Pouliot <[email protected]>
* Regex.cs: Remove Compiler-related support for NET_2_1
	* RegexOptions.cs: Remove Compile from values available on NET_2_1


svn path=/trunk/mcs/; revision=132491
2009-04-23 17:34:25 +00:00
Zoltan Varga 34df9a2168 2009-03-04 Zoltan Varga <[email protected]>
* RxInterpreter.cs (ResetGroups): Avoid allocating larger than needed
	arrays.

svn path=/trunk/mcs/; revision=128509
2009-03-04 00:49:06 +00:00
Gonzalo Paniagua Javier 407a62a4cc unused var
svn path=/trunk/mcs/; revision=128508
2009-03-03 23:54:30 +00:00
Jonathan Pryor 247cfd34f0 * System.Text.RegularExpressions/Regex.cs (Replace): Check that input &
evaluator are not null, as documented in MSDN (and the variance found 
	  while testing DbLinq).
	* Test/System.Text.RegularExpressions/RegexReplace.cs: Add null 
	  argument checks for Regex.Replace().

svn path=/trunk/mcs/; revision=128241
2009-02-27 21:40:17 +00:00
Zoltan Varga 09047c897a 2009-02-27 Zoltan Varga <[email protected]>
* BaseMachine.cs (LTRReplace): Initialize the StringBuilder with an
	appropriate initial length.

svn path=/trunk/mcs/; revision=128158
2009-02-26 23:24:42 +00:00
Zoltan Varga dabd23ce6e 2009-02-24 Zoltan Varga <[email protected]>
* CILCompiler.cs: Partially inline calls to Char.ToLower () to speed
	up ignorecase matching.

svn path=/trunk/mcs/; revision=127898
2009-02-24 20:34:33 +00:00
Jb Evain 85e8848db2 2009-02-16 Jb Evain <[email protected]>
* Regex.cs: on the NET_2_1 profile, always use the old engine for now.


svn path=/trunk/mcs/; revision=127039
2009-02-16 15:28:14 +00:00
Zoltan Varga 69d48eba16 2009-02-14 Zoltan Varga <[email protected]>
* Regex.cs: Add a MONO_NEW_RX variable to enable the new regex
	engine.

svn path=/trunk/mcs/; revision=126923
2009-02-14 14:36:27 +00:00
Zoltan Varga f908a8a6c3 2009-02-04 Zoltan Varga <[email protected]>
* Regex.cs: Disable the new regex engine for now.

svn path=/trunk/mcs/; revision=125637
2009-02-04 02:18:48 +00:00
Zoltan Varga 824710f744 2009-01-14 Zoltan Varga <[email protected]>
* CILCompiler.cs: Avoid throwing exceptions for a few more unhandled opcodes.
	Implement the reverse/ignorecase versions of Reference. Fix the reverse
	version of Bitmap. Error out if a Jump opcode jumps outside the current
	pc range. This works around #466151.

svn path=/trunk/mcs/; revision=123417
2009-01-14 21:33:40 +00:00
Jb Evain dccb5600df 2009-01-12 Jb Evain <[email protected]>
* RxInterpreter.cs: set trace_rx to false for NET_2_1.
	* Regex.cs: set old_rx to false for NET_2_1.


svn path=/trunk/mcs/; revision=123110
2009-01-12 19:14:55 +00:00
Zoltan Varga 5c44702768 2009-01-07 Zoltan Varga <[email protected]>
* RxInterpreter.cs: Add support for constant strings in anchors. Fixes
	#464135.

svn path=/trunk/mcs/; revision=122700
2009-01-07 19:48:15 +00:00
Gonzalo Paniagua Javier 295e584514 2008-11-18 Gonzalo Paniagua Javier <[email protected]>
* cache.cs: avoid infinite loop.


svn path=/trunk/mcs/; revision=119193
2008-11-18 17:46:59 +00:00
Gonzalo Paniagua Javier a5ceae5e8f typo
svn path=/trunk/mcs/; revision=118938
2008-11-15 18:03:36 +00:00
Gonzalo Paniagua Javier e75ce1dcee 2008-11-14 Gonzalo Paniagua Javier <[email protected]>
* cache.cs:
	* Regex.cs: honor CacheSize value.


svn path=/trunk/mcs/; revision=118878
2008-11-14 18:51:42 +00:00