Commit Graph
255 Commits
Author SHA1 Message Date
Zoltan Varga 03aee949f1 Merge pull request #1200 from akoeplinger/remove-jvm
[Cleanup] Remove TARGET_JVM
2014-08-28 19:17:43 -04:00
Alexander Köplinger 48e112d652 [Cleanup] Removed TARGET_JVM
It was once part of a special Java target profile, but this is no longer used today.
2014-08-08 03:28:34 +02:00
Alexander Köplinger a8b2f07578 [Cleanup] Removed .jvm.cs files that are no longer used
They were once part of a special Java target profile, but this is no longer used today.
2014-08-07 23:01:51 +02:00
Martin Potter 1af8016a5c Regex fixes for substring parsing. 2014-08-04 14:42:35 -07:00
Martin Baulig 4db812ca7e Add missing .NET 4.5 APIs
* System.Text.RegularExpressions.Regex.InfiniteMatchTimeout
* System.Net.HttpStatusCode.UpgradeRequired
* Add System.Reflection.TypeAttributes.WindowsRuntime
* System.Runtime.GCLatencyMode.SustainedLowLatency
* System.UriComponents.NormalizedHost
2013-09-02 21:52:13 +02:00
Rolf Bjarne Kvinge 142b670dae [System] Don't use System.Reflection.Emit if we're in a FullAOT runtime. 2013-05-30 23:48:48 +02:00
Martin Baulig dc4eae8d17 Add System.Text.RegularExpressions.Regex timeout APIs. 2013-03-12 17:23:00 -04:00
Rodrigo Kumpera d7b4a3e5a4 Disable the regex compiler under Full AOT. 2012-11-06 18:18:17 -05:00
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
Marek Safar 5d659d3500 Fixes a warning 2012-06-19 10:54:29 +01: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
Miguel de Icaza f48ceb9860 [System] Removal of the NET_2_0 in the source code
Modulo the GUID in the assembly and the GUID embedded in some
field initializers that use the assembly GUID for their name, the
assemblies are idential before and after the patch.
2012-06-02 13:16:40 -04:00
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