Commit Graph
20 Commits
Author SHA1 Message Date
Bojan Rajkovic 1bbb0f0880 Revert "Bug 2663: Regular Expression Bug Fixes"
This reverts commit dc6efdab29. This
patch completely regressed performance for regexes in the same class
as the regexes it fixed. Xamarin bug #6198 details the regressions,
and I've confirmed that reverting this commit fixes the 2 order of
magnitude performance drop (with the patch, the test takes almost 7
seconds, without it, it takes .07 seconds). The bug still needs to be
fixed, but this is not the right fix.
2012-10-17 12:35:57 -04:00
Rob Wilkens 60a463c6f3 Bug 2663: Regular Expression Bug Fixes
What this fixes:
IF you were checking a regex which contained something like "(A|AB)C" and then you
checked something like "ABC" against it, it would fail previously, because its
first trip thru the regex it would match "A" first and short circuit out of the
"or" (|)  then next try to match "C" but find "B" and fail.  In this case, it should
be obvious that it needs to, after it fails, go back and try "AB" rather than "A"
and that's where this patch comes in.

Brief summary of each change in order that "git diff --staged" is giving them to
me:

This first one summarizes the background of goal of project:
New Function: EmitJumpTest
For when we are evaluating Alternatives (or's) we now want to be able to go back
and try or paths we haven't already tried if and only if we fail.  This alternate to
EmitJump instead of jumping to target if we have a match immediately, will
on first attempt do the jump, but later if we have already tried this jump
combination, it will jump to ElseTarget, which is the equivalent of this test
failing on subsequent attempts with the same combination of 'or's passing.

RxCompiler:
EmitJumpTest isn't implemented for RxCompiler because i didn't have sample
code to test it on, so it falls back to a regular jump, nothing changes in
RxCompiler in other words other than having this required fucntion front.

arch.cs:
New OpCode added for JumpTest (see EmitJumpTest above)

compiler.cs:
EmitJumpTest added here for regular compiler, it now takes two arguments (two
items on stack) first was the standard where to jump to address, the second
argument is where to jump to in case where we have already tried this
combination)

interpreter.cs:

JumpTestEntry - What we keep track of to know if we've been here before, for
now i presumed just 'pc' (program counter') and 'ptr' (pointer - where we are)
were enough to tell us if we've been to this particular spot before.

Eval has been moved into Eval_Real

Eval if it gets called with parameters indicating we've already been here
(i.e we're being called recursively) just passes the call directly to eval_real
as-was.

Otherwise eval will loop on eval_real while we fail and haven't tried every
possible path through all the or's. (Note: The special case of where we're
running a 'test' (i.e. checking !(a|b|c) rather than just matching (a|b|c)),
and if we're running a test, we turn off JumpTestTracking while it's in its
recursive section.  The reason for this is because while we can rightly check
all the options of (a|ab|abc)  first for a then try again with ab then try again
with abc, we cannot do the same for a not (i.e. !(something or something else)
is really (not something AND not somtehing else), and it is not (not something
or not something else))

JumpTestList tracks our current run's JumpTest calls...
TriedCombo's tracks all the combos (all the JumpTestList results) that we've
already tried.

All calls to anything which calls Eval were modified to call eval passing
the optional new parameters that we now need, and remember if we call
eval with those parameters having a value, it will just forward the call
to Eval_Real.

This included modifying TryMatch because it calls Eval.

OpCode.JumpTest handler was added, what it does is first check if we need
to ByPass to jump to 'else' right away, which again happens when we're in
a test recursive call (Checking not, for example).
Next, it will create and populate a new JumpTestEntry with the current values.
It then calls CheckComboMatch() which sees if we match a combo already on file.
If we don't have a Match we jump to the first label (at pc+1) which is the
regular jump call.  If we have a match, though, it will jump to the else label
which is now at (pc+2).

CheckComboMatch had to be broken up into two functions because it was going
too deep in terms of nesting.  What it does by now should be somewhat understood
it will see if we have a match between our current run and previous runs, and
if we have a match, it returns true.  If we don't have a match, it returns
false.  I have some doubts about whether this function is 100% correct, there
may remain a bug or two, but it does pass all the "System" unit tests which
includes all the regular expression tests, plus it works for all the tests
in the bug report, so i have little reason to mess with it.

syntax.cs:
Here's where i modified so that when evaluating alternatives ("or"s or "|"s)
we instead call EmitJumpTest rather than just a regular EmitJump.

RegExBugs.cs:
This is the unit test (a bunch in one) which fails on mono without this patch
but succeeds with it
commit 48027ac2bdd9b60d18985ec2537eb188607f8164 1 parent 91c4180d55

This patch was originally submitted under another branch which had a bunch of
unrelated commits in it.  I'm hoping if i did this right, these changes stand
alone.
2012-06-18 07:38:57 -04: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 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 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 c6ea88f745 Treat fixed repetitions of simple regexes as simple too.
* syntax.cs (Expression.IsComplex): Make abstract.
(Group.IsComplex, Alternation.IsComplex): Move ...
(CompositeExpression.IsComplex): ... here.
(Group.GetAnchorInfo): Reduce allocations.  Avoid creating another
ArrayList, and use a StringBuilder to build up the string.
(Repetition.GetAnchorInfo): Use a StringBuilder to build up the string.
(ExpressionAssertion.IsComplex): Override.

svn path=/trunk/mcs/; revision=59583
2006-04-18 09:59:13 +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 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
Miguel de Icaza 19e3d1f3fc 2005-01-08 Miguel de Icaza <[email protected]>
* syntax.cs: Applied patch from [email protected] to fix bug
	#71077.

	* parser.cs: Turns out that \digit sequences are octal sequences
	(no leading zero is needed);  And the three octal digit rule
	applies to the leading zero as well.

	This fixes the Unescape method.

2005-01-08  Miguel de Icaza  <[email protected]>

	* RegexBugs.cs: Add new test.



svn path=/trunk/mcs/; revision=38517
2005-01-08 06:21:04 +00:00
Duncan Mak 24f5ef2c44 Add MIT license to System.dll
svn path=/trunk/mcs/; revision=30054
2004-06-21 18:02:11 +00:00
Gonzalo Paniagua Javier 4d8d5cc311 2004-06-01 Gonzalo Paniagua Javier <[email protected]>
* syntax.cs: re-applied my patch from 2004-05-27 plus a fix which is
	emitting a Category.All if both a category and its negated value are
	present.

svn path=/trunk/mcs/; revision=28609
2004-06-01 05:43:48 +00:00
Gonzalo Paniagua Javier 6e3884f14f 2004-06-01 Gonzalo Paniagua Javier <[email protected]>
* syntax.cs: reverting my previous patch. It causes bigger problems.

svn path=/trunk/mcs/; revision=28604
2004-06-01 01:01:23 +00:00
Gonzalo Paniagua Javier fef90f0a49 2004-05-27 Gonzalo Paniagua Javier <[email protected]>
* category.cs: added LastValue field to mark the end of enum Category.
	* syntax.cs: in CharacterClass, use Category.LastValue to get the size
	of the array needed. Use a BitArray instead of bool[].
	In AddCategory(), don't set the opposite category as false. Fixes
	bug #59150. All tests pass.

svn path=/trunk/mcs/; revision=28218
2004-05-27 03:40:44 +00:00
Gonzalo Paniagua Javier 3917ace10c 2004-04-19 Gonzalo Paniagua Javier <[email protected]>
* System.Text.RegularExpressions/arch.cs:
	* System.Text.RegularExpressions/compiler.cs:
	* System.Text.RegularExpressions/interpreter.cs:
	* System.Text.RegularExpressions/parser.cs:
	* System.Text.RegularExpressions/syntax.cs:
	* Test/System.Text.RegularExpressions/PerlTrials.cs:
	Patch by Eric Durand Tremblay.
	1) Capture inner group when named.
	2) Resolved parse error caused by not capturing inner group
	3) Resolved incorrect capture group
	4) Now, not capturing anything when unnamed ( correct behavior)

svn path=/trunk/mcs/; revision=25691
2004-04-19 17:07:46 +00:00
Gonzalo Paniagua Javier 2e689c7335 2004-04-19 Gonzalo Paniagua Javier <[email protected]>
* arch.cs:
	* compiler.cs:
	* interpreter.cs:
	* parser.cs:
	* syntax.cs: converted to unix line endings.

svn path=/trunk/mcs/; revision=25688
2004-04-19 16:54:36 +00:00
Gonzalo Paniagua Javier 3015c8a6b3 2004-03-17 Francois Beauchemin <[email protected]>
* syntax.cs, interpreter.cs, quicksearch.cs, regex.cs, compiler.cs :
 		Revised support for RigthToLeft.
 		quicksearch has now an reverse option.
 		This fixes bug #54537

  	* regex.cs, compiler.cs :
 	 	Some code to support CILCompiler.
 	* regex.cs :
 		Added some undocumented of MS.

svn path=/trunk/mcs/; revision=24249
2004-03-17 20:21:43 +00:00
Miguel de Icaza fc5d02f8bc 2004-02-01 Miguel de Icaza <[email protected]>
* syntax.cs, interval.cs: Applied patch from Marco Cravairo
	through Francois Beauchemin who reviewed on the mailing list.
	This fixes bug #45976

svn path=/trunk/mcs/; revision=22684
2004-02-02 03:02:08 +00:00
Dan Lewis ad375c8180 Regex classes, initial revision.
svn path=/trunk/mcs/; revision=2205
2002-01-31 08:00:16 +00:00