namespace System.Text.RegularExpressions {
- class Interpreter : IMachine {
+ partial class Interpreter : BaseMachine {
private int ReadProgramCount (int ptr)
{
int ret = program [ptr + 1];
// IMachine implementation
- public Match Scan (Regex regex, string text, int start, int end) {
+ public override Match Scan (Regex regex, string text, int start, int end, bool substring_mode) {
+ this.regex_rtl = (regex.Options & RegexOptions.RightToLeft) != 0;
+
+ if (!initialized)
+ {
+ this.text_start = regex_rtl && substring_mode ? end : start;
+ this.text_end = regex_rtl ? substring_mode ? start : 0 : end;
+ this.initialized = true;
+ }
+ else
+ {
+ this.text_start = start;
+ this.text_end = end;
+ }
this.text = text;
- this.text_end = end;
- this.scan_ptr = start;
+ this.scan_ptr = text_start;
+ this.substring_mode = substring_mode;
if (Eval (Mode.Match, ref scan_ptr, program_start))
return GenerateMatch (regex);
int anch_offset = program[pc + 2];
bool anch_reverse = (flags & OpFlags.RightToLeft) != 0;
int anch_ptr = anch_reverse ? ptr - anch_offset : ptr + anch_offset;
- int anch_end = text_end - match_min + anch_offset; // maximum anchor position
+ int anch_end = (regex_rtl ? text_start : text_end) - match_min + anch_offset; // maximum anchor position
int anch_begin = 0;
// True
bool reverse = ((OpFlags)program[pc + 3] & OpFlags.RightToLeft) != 0;
- string substring = GetString (pc + 3);
if (qs == null) {
bool ignore = ((OpFlags)program[pc + 3] & OpFlags.IgnoreCase) != 0;
-
+ string substring = GetString (pc + 3);
qs = new QuickSearch (substring, ignore, reverse);
}
while ((anch_reverse && anch_ptr >= anch_begin)
{
anch_ptr = qs.Search (text, anch_ptr, anch_begin);
if (anch_ptr != -1)
- anch_ptr += substring.Length ;
+ anch_ptr += qs.Length ;
}
else
if (reverse) {
ptr -= len;
- if (ptr < 0)
+ if ((!regex_rtl && ptr < 0) || (regex_rtl && ptr < text_end))
goto Fail;
}
else
if (reverse) {
ptr -= len;
- if (ptr < 0)
+ if ((!regex_rtl && ptr < 0) || (regex_rtl && ptr < text_end))
goto Fail;
}
else if (ptr + len > text_end)
goto Fail;
pc += 2;
- for (int i = 0; i < len; ++ i) {
- if (ignore) {
+ if (ignore) {
+ for (int i = 0; i < len; ++ i) {
if (Char.ToLower (text[ptr + i]) != Char.ToLower (text[str + i]))
goto Fail;
}
- else {
+ } else {
+ for (int i = 0; i < len; ++ i) {
if (text[ptr + i] != text[str + i])
goto Fail;
}
while (true) {
int p = ptr + coff;
- if (c1 < 0 || (p >= 0 && p < text_end && (c1 == text[p] || c2 == text[p]))) {
+ if (c1 < 0 || (p >= 0 && ((regex_rtl && p >= text_end) || (!regex_rtl && p < text_end)) && (c1 == text[p] || c2 == text[p]))) {
deep = null;
if (Eval (Mode.Match, ref ptr, pc))
break;
while (true) {
int p = ptr + coff;
- if (c1 < 0 || (p >= 0 && p < text_end && (c1 == text[p] || c2 == text[p]))) {
+ if (c1 < 0 || (p >= 0 && ((regex_rtl && p >= text_end) || (!regex_rtl && p < text_end)) && (c1 == text[p] || c2 == text[p]))) {
deep = null;
if (Eval (Mode.Match, ref ptr, pc))
break;
if (!consumed) {
if ((flags & OpFlags.RightToLeft) != 0) {
- if (ptr <= 0)
+ if ((substring_mode && ptr <= (regex_rtl ? text_end : text_start)) || (!substring_mode && ptr <= 0))
return false;
c = text[-- ptr];
}
else {
- if (ptr >= text_end)
+ if ((!regex_rtl && ptr >= text_end) || (regex_rtl && ptr >= text_start))
return false;
c = text[ptr ++];
private bool IsPosition (Position pos, int ptr) {
switch (pos) {
case Position.Start: case Position.StartOfString:
- return ptr == 0;
+ return ptr == 0 || (substring_mode && ((!regex_rtl && ptr == text_start) || (regex_rtl && ptr == text_end)));
case Position.StartOfLine:
- return ptr == 0 || text[ptr - 1] == '\n';
+ return ptr == 0 || text[ptr - 1] == '\n' || (substring_mode && ((!regex_rtl && ptr == text_start) || (regex_rtl && ptr == text_end)));
case Position.StartOfScan:
return ptr == scan_ptr;
case Position.End:
- return ptr == text_end ||
- (ptr == text_end - 1 && text[ptr] == '\n');
+ return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start) ||
+ (((!regex_rtl && ptr == text_end - 1) || (regex_rtl && ptr == text_start - 1)) && text[ptr] == '\n');
case Position.EndOfLine:
- return ptr == text_end || text[ptr] == '\n';
+ return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start) || text[ptr] == '\n';
case Position.EndOfString:
- return ptr == text_end;
+ return (!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start);
case Position.Boundary:
- if (text_end == 0)
+ if ((!regex_rtl && text_end == 0) || (regex_rtl && text_start == 0))
return false;
if (ptr == 0)
return IsWordChar (text[ptr]);
- else if (ptr == text_end)
+ else if ((!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start))
return IsWordChar (text[ptr - 1]);
else
return IsWordChar (text[ptr]) != IsWordChar (text[ptr - 1]);
case Position.NonBoundary:
- if (text_end == 0)
+ if ((!regex_rtl && text_end == 0) || (regex_rtl && text_start == 0))
return false;
if (ptr == 0)
return !IsWordChar (text[ptr]);
- else if (ptr == text_end)
+ else if ((!regex_rtl && ptr == text_end) || (regex_rtl && ptr == text_start))
return !IsWordChar (text[ptr - 1]);
else
return IsWordChar (text[ptr]) == IsWordChar (text[ptr - 1]);
Debug.Assert (cp > mark_start, "Regex", "Attempt to backtrack forwards");
for (int i = 0; i < groups.Length; ++ i) {
int m = groups [i];
- while (cp <= m)
+ while (cp <= m) {
+ marks [m].Start = -1;
m = marks [m].Previous;
+ }
groups [i] = m;
}
+ mark_start = cp;
}
private void ResetGroups () {
int n_caps, first_mark_index;
Group g;
GetGroupInfo (0, out first_mark_index, out n_caps);
+
+ // Avoid fully populating the Match instance if not needed
+ if (!needs_groups_or_captures)
+ return new Match (regex, this, text, text_end, 0, marks [first_mark_index].Index, marks [first_mark_index].Length);
+
Match retval = new Match (regex, this, text, text_end, groups.Length,
marks [first_mark_index].Index, marks [first_mark_index].Length, n_caps);
PopulateGroup (retval, first_mark_index, n_caps);
private int match_min;//, match_max; // match width information
private QuickSearch qs; // fast substring matcher
+ private bool regex_rtl;
+ private int text_start;
+ private bool substring_mode;
+ private bool initialized;
+
// match state
private int scan_ptr; // start of scan
projects / mono.git / blobdiff