Commit Graph
90 Commits
Author SHA1 Message Date
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 1dc4bea327 Revert "processed with astyle" (SVN r159583)
svn path=/trunk/mcs/; revision=159587
2010-06-28 06:39:43 +00:00
C.J. Adams-Collier 56886b8c11 processed with astyle
svn path=/trunk/mcs/; revision=159583
2010-06-27 20:11:26 +00:00
Rodrigo Kumpera 8f2c8508de 2010-06-21 Rodrigo Kumpera <[email protected]>
* RegexBugs.cs: Regression test for #610587.

svn path=/trunk/mcs/; revision=159293
2010-06-21 20:36:17 +00:00
C.J. Adams-Collier 33142e1b47 first pass at adding RegexOption.Compiled to constructor in tests
svn path=/trunk/mcs/; revision=158888
2010-06-14 17:36:45 +00:00
Rodrigo Kumpera 3905873f3c 2010-02-03 Rodrigo Kumpera <[email protected]>
* SplitTests.cs: New tests for #566117.

svn path=/trunk/mcs/; revision=150787
2010-02-03 21:10:25 +00:00
Raja R Harinath ce41ff407f Check in up-to-date version of RegexTest.cs. Somehow the previous
checkin got an untested preliminary version

svn path=/trunk/mcs/; revision=141530
2009-09-08 15:12:38 +00:00
Jonathan Pobst cc73e26443 - Fix System tests build. (There were two tests named Split_InvalidCount.)
svn path=/trunk/mcs/; revision=141525
2009-09-08 14:26:08 +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 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 58b4f2fb60 * RegexTrial.cs (Execute): Prepare to handle dis-contiguous group numbers.
svn path=/trunk/mcs/; revision=140052
2009-08-17 12:28:23 +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 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
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 38444bef3b 2009-01-14 Zoltan Varga <[email protected]>
* RegexTrial.cs: Run all tests with the CIL Compiler too.

svn path=/trunk/mcs/; revision=123419
2009-01-14 21:36:01 +00:00
Zoltan Varga ebd4ba561f 2009-01-14 Zoltan Varga <[email protected]>
* RegexBugs.cs: Add a test for #466151.

svn path=/trunk/mcs/; revision=123418
2009-01-14 21:34:46 +00:00
Gert Driesen 5bf5128a72 * RegexBugs.cs: added test for bug #443841.
svn path=/trunk/mcs/; revision=118761
2008-11-13 20:20:00 +00:00
Gonzalo Paniagua Javier a9497316ff 2008-11-11 Gonzalo Paniagua Javier <[email protected]>
* RegexBugs.cs: test from bug 432172.


svn path=/trunk/mcs/; revision=118512
2008-11-11 16:42:18 +00:00
Gonzalo Paniagua Javier ab2d87302f 2008-10-30 Gonzalo Paniagua Javier <[email protected]>
* RegexBugs.cs: added test from bug #439947.


svn path=/trunk/mcs/; revision=117488
2008-10-30 16:04:57 +00:00
Zoltan Varga a1531dd064 2008-10-09 Zoltan Varga <[email protected]>
* RegexBugs.cs: Add test for #432172.

svn path=/trunk/mcs/; revision=115312
2008-10-09 08:00:46 +00:00
Zoltan Varga 6dad6b5f3b 2008-09-14 Zoltan Varga <[email protected]>
* RegexBugs.cs: Add a test for #426142.

svn path=/trunk/mcs/; revision=112946
2008-09-14 00:07:44 +00:00
Roei Erez ccca1e1079 Fix a bug only in TARGET_JVM that happens when a match contains empty group at the end.
svn path=/trunk/mcs/; revision=104994
2008-06-05 12:06:06 +00:00
Arina Itkes 357ee9ae90 New test for groups with same name. Fix for JvmReMachine.
svn path=/trunk/mcs/; revision=91864
2007-12-24 15:40:41 +00:00
Arina Itkes 074e54f3f8 Max value of m for a construct {n,m} is 2147483647.
svn path=/trunk/mcs/; revision=90629
2007-12-04 10:35:14 +00:00
Raja R Harinath 01dbfb50d5 Fix 324390
In System/System.Text.RegularExpressions:
	* BaseMachine.cs (LTRReplace): Don't use non-advancement of 'ptr'
	to deduce absence of matches -- a match can have length 0.
	(RTLReplace): Likewise.

In System/Test/System.Text.RegularExpressions:
	* RegexReplace.cs (tests): New test from #324390.

svn path=/trunk/mcs/; revision=89176
2007-11-08 03:31:44 +00:00
Raja R Harinath b35097bc0b Support RegexOptions.RightToLeft in Replace().
In b/class/System/System.Text.RegularExpressions:
	* BaseMachine.cs (Replace): Use either LTRReplace or RTLReplace
	based on regex.
	(LTRReplace): Make internal and rename the MatchAppendEvaluator
	version of Replace to this.
	(RTLReplace): New.
	* Regex.cs (Replace): Use LTRReplace and RTLReplace from BaseMachine.
	* replace.cs (ReplacementEvaluator.Evaluate): Optimize simple case.
	Based on patch by Stephane Delcroix.

In b/class/System/Test/System.Text.RegularExpressions:
	* MatchTest.cs (Match_Backref): New.
	* RegexReplace.cs (direction, testcase.direction): New.
	(testcase..ctor): Allow specifying the direction of the replace.
	(ReplaceTests): Test replace in both directions.
	(EvaluatorTests): New test based on #321036.

svn path=/trunk/mcs/; revision=89034
2007-11-06 22:03:35 +00:00
Raja R Harinath baf4cdef81 In System.Text.RegularExpressions:
* replace.cs (Compile): Don't unescape string.

In Test/System.Text.RegularExpressions:
	* RegexReplace.cs (tests): New test from #317092.
	(ReplaceTests): Don't catch an AssertException.

svn path=/trunk/mcs/; revision=89021
2007-11-06 19:28:12 +00:00
Arina Itkes 24bdc004e1 Fix for expected result of 44 test
svn path=/trunk/mcs/; revision=88816
2007-11-04 11:22:13 +00:00
Gert Driesen 99c7c20a33 * RegexReplace.cs: Fixed line endings.
svn path=/trunk/mcs/; revision=88686
2007-11-01 21:19:14 +00:00
Gert Driesen 083af1ff31 * GroupTest.cs: Improved test for null argument check.
* MatchTest.cs: Improved tests for null argument checks. Added and
fixed replacement tests.
* RegexMatchTest.cs: Marked tests that do not pass on MS as NotDotNet.
Fixed expected result for trial 5.
* RegexResultTests.cs: Fixed Assert.
* Match.cs: Do not throw NotSupportedException on zero-length 
replacement argument.

svn path=/trunk/mcs/; revision=88685
2007-11-01 21:17:50 +00:00
Arina Itkes 963b4f5073 Updated changelog fog revision 88355
svn path=/trunk/mcs/; revision=88392
2007-10-29 16:12:39 +00:00
Arina Itkes 120ae48ce4 New tests for Regex:
- for Result method,
- for patterns with number of groups more than 10
- for patterns with ExpicitCapture options

svn path=/trunk/mcs/; revision=88355
2007-10-29 09:15:16 +00:00
Gert Driesen 159ff004eb * RegexBugs.cs: No longer derive from deprecated Assertion class.
Added test for bug #313642.
* MatchTest.cs: Code formatting.
* RegexTest.cs: Fixed compiler warnings. Code formatting. Spaces to
tabs.

svn path=/trunk/mcs/; revision=87864
2007-10-21 09:46:50 +00:00
Gert Driesen bea2c42267 * RegexReplace.cs: Fixed compiler warning.
svn path=/trunk/mcs/; revision=85913
2007-09-17 17:30:51 +00:00
Raja R Harinath 05c754d952 In System.Text.RegularExpressions:
Fix #80554
	* parser.cs (ResolveReferences): Don't throw an expression if a
	capture assertion reference cannot be resolved.
	(ParseGroupingConstruct): Provide fallback expression to a capture
	assertion.
	* syntax.cs (CaptureAssertion): If the bareword doesn't refer to
	the name of a capture group, fallback to treating it as a literal
	expression.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (bug80554_trials): New tests based on #80554.

svn path=/trunk/mcs/; revision=75885
2007-04-18 14:52:01 +00:00
Raja R Harinath e1bb85b9d7 * RegexTest.cs (PrimeRegex): New backtracking torture test using
a regex that recognizes composite numbers represented in unary.

svn path=/trunk/mcs/; revision=75388
2007-04-04 14:33:46 +00:00
Raja R Harinath 24bba3fcc8 In System.Text.RegularExpressions:
Fix #79472
	* parser.cs (Parser.GetMapping): Use the actual group numbers to
	build the mapping.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (GroupNumbers): New test based on #79472.

svn path=/trunk/mcs/; revision=70374
2007-01-02 17:52:33 +00:00
Raja R Harinath 083ccb79d8 In System.Text.RegularExpressions:
Fix #78278
	Remove 65535-limit on number of repetitions matched by a pattern.
	We still have a 65535 limit on the length of a pattern and the
	number of groups in a pattern.
	* compiler.cs (PatternCompiler.EmitCount): New.  Emits an int as
	two ushorts into the program stream.
	(EmitInfo, EmitRepeat, EmitFastRepeat): Use it to emit integers
	rather than shorts.
	* interpreter.cs (Intepreter.ReadProgramCount): Read an int
	emitted into the program stream.
	(Interpreter): Use it.  Update counts.
	(Interpreter.Eval) [OpCode.Repeat, OpCode.FastRepeat]: Likewise.
	* parser.cs (ParseGroup): Pass 0x7ffffff as the max value for '*'
	and '+' repetition patterns.
	* arch.cs (Info, Repeat, FastRepeat): Update description.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (Kill65535_1, Kill65535_2, No65535Limit): New tests
	based on #78278.

svn path=/trunk/mcs/; revision=60401
2006-05-08 13:44:23 +00:00
Raja R Harinath a0072aeec0 In System.Text.RegularExpressions:
2006-04-17  Florian Gross  <[email protected]>
	    Raja R Harinath  <[email protected]>

	* syntax.cs (CharacterClass.Compile): Emit categories after the
	character intervals so that the evaluator can pick up the
	'IgnoreCase' flag.

In Test/System.Text.RegularExpressions:
2006-04-17  Florian Gross  <[email protected]>

	* RegexBugs.cs (CharClassWithIgnoreCase): Ensure that character
	classes don't interfere with RegexOptions.IgnoreCase.

Started looking at some of Florian's patches, which I realized now that
he hadn't applied.

svn path=/trunk/mcs/; revision=59538
2006-04-17 14:05:46 +00:00
Raja R Harinath d96a4c42b2 In System.Text.RegularExpressions:
Fix #78007
	* interpreter.cs (Interpreter.Eval) [Anchor, Position.StartOfString]:
	Don't reset 'ptr' to 0 during forward scan.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (Bug78007): New test from #78007.

svn path=/trunk/mcs/; revision=59177
2006-04-07 13:44:55 +00:00
Raja R Harinath 4d94dda2bf In System.Text.RegularExpressions:
Fix #76345
	* interpreter.cs (Interpreter.FastEval) [FastRepeat]: If the first
	tail operation has a 'negate' flag, avoid the "match next char"
	optimization.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (Bug76345): New test from #76345.

svn path=/trunk/mcs/; revision=59174
2006-04-07 12:01:44 +00:00
Raja R Harinath aeacac9505 In System.Text.RegularExpressions:
Fix #69269
	* arch.cs (OpCode.NotCategory): New.  Stands for matching a
	character _not_ from the given category.
	* debug.cs (DisassembleBlock): Handle it.
	* compiler.cs (ICompiler.EmitNotCategory): New.
	(Compiler.EmitNotCategory): New.  Emit OpCode.NotCategory.
	* syntax.cs (CharacterClass.Compile): Don't conflate negation of
	the character class and negation of the category.  Use
	EmitNotCategory.
	* interpreter.cs (Interpreter.Eval): Pass OpCode.NotCategory to
	EvalChar.
	(Interpreter.EvalChar): Handle it.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (Bug69269): New test from #69269.

svn path=/trunk/mcs/; revision=59173
2006-04-07 10:00:23 +00:00
Raja R Harinath 91300ea498 Fix #77487
* System.Text.RegularExpressions/interpreter.cs (Eval) [Until, FastUntil]:
Set 'deep' to null when evaluating the tail.  Ensure that backtracks don't
confuse the recursion vs. iteration detector.
* Test/System.Text.RegularExpressions/RegexBugs.cs (Bug77487):
New test based on #77487.

svn path=/trunk/mcs/; revision=59114
2006-04-06 14:29:06 +00:00
Raja R Harinath 345512578e * RegexTrial.cs (Execute): Run NUnit assertion here.
* PerlTests.cs: Simplify.

svn path=/trunk/mcs/; revision=59112
2006-04-06 13:03:29 +00:00
Raja R Harinath 5718114083 In System.Text.RegularExpressions:
* parser.cs (Parser.ParseCharacterClass): Handle some more errors.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (HangingHyphens1): New testcase for exceptions in character ranges.

svn path=/trunk/mcs/; revision=58806
2006-03-30 16:37:29 +00:00
Raja R Harinath 0117c762c6 In System.Text.RegularExpressions:
* parser.cs (Parser.ParseCharacterClass): Don't automatically
	assume there's a range when we see '-'.  Ensure that we have seen
	at least one other character, and that we aren't already parsing a
	range.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (HangingHyphens): New tests from #77626, and
	related bugs found by inspection.

svn path=/trunk/mcs/; revision=58776
2006-03-30 12:29:51 +00:00
Raja R Harinath 41c152eba7 In System.Text.RegularExpressions:
Fix #77626
	* parser.cs (Parser.ParseCharacterClass): Set 'last' when we find
	that a '-' doesn't signify a range.

In Test/System.Text.RegularExpressions:
	* RegexBugs.cs (HangingHyphens): New test from #77626.

svn path=/trunk/mcs/; revision=58774
2006-03-30 10:18:44 +00:00